diff options
| author | Steve <steveb9@u.washington.edu> | 2011-02-12 08:09:38 +0000 |
|---|---|---|
| committer | Steve <steveb9@u.washington.edu> | 2011-02-12 08:09:38 +0000 |
| commit | d1df88907d55240e79ee8597f6032a4c0de6b957 (patch) | |
| tree | be36bc4395e2c6b407ae5da43bd4080d5b41e9d0 /src/tesseract/menuitems | |
| parent | e258cf11dc077ee2addb748636481c3ad8a27c72 (diff) | |
Added a gravity submenu (doesn't turn off yet)
Added empty ChainLinkMenuItem class
set the planar Poly to pos infinte mass for testing
Particles fall through but others don't, if particles are big enough they collide though
Diffstat (limited to 'src/tesseract/menuitems')
5 files changed, 8 insertions, 10 deletions
diff --git a/src/tesseract/menuitems/ChainLinkMenuItem.java b/src/tesseract/menuitems/ChainLinkMenuItem.java new file mode 100644 index 0000000..4f99645 --- /dev/null +++ b/src/tesseract/menuitems/ChainLinkMenuItem.java @@ -0,0 +1,5 @@ +package tesseract.menuitems;
+
+public class ChainLinkMenuItem {
+
+}
diff --git a/src/tesseract/menuitems/GravityMenuItem.java b/src/tesseract/menuitems/GravityMenuItem.java index 62ee26e..8106d6e 100644 --- a/src/tesseract/menuitems/GravityMenuItem.java +++ b/src/tesseract/menuitems/GravityMenuItem.java @@ -1,16 +1,9 @@ package tesseract.menuitems;
-import java.awt.Color;
import java.awt.event.ActionEvent;
-import javax.swing.JColorChooser;
-import javax.swing.JOptionPane;
-import javax.vecmath.Color3f;
-import javax.vecmath.Vector3f;
-
import tesseract.World;
import tesseract.forces.Gravity;
-import tesseract.objects.PlanarPolygon;
/**
* Gravity Menu Item.
diff --git a/src/tesseract/menuitems/IcosahedronMenuItem.java b/src/tesseract/menuitems/IcosahedronMenuItem.java index dc80bf3..b2cdc33 100644 --- a/src/tesseract/menuitems/IcosahedronMenuItem.java +++ b/src/tesseract/menuitems/IcosahedronMenuItem.java @@ -51,7 +51,7 @@ public class IcosahedronMenuItem extends TesseractMenuItem { defaultButton.addActionListener(new ActionListener() {
public void actionPerformed(final ActionEvent e) {
if (defaultButton.isSelected()) {
- myWorld.addObject(new Icosahedron(getDefaultPosition(), 1, getDefaultRadius()));
+ myWorld.addObject(new Icosahedron(getDefaultPosition(), 10, getDefaultRadius()));
params.dispose();
}
}
diff --git a/src/tesseract/menuitems/ParticleEmitterMenuItem.java b/src/tesseract/menuitems/ParticleEmitterMenuItem.java index b4016cc..1c69def 100644 --- a/src/tesseract/menuitems/ParticleEmitterMenuItem.java +++ b/src/tesseract/menuitems/ParticleEmitterMenuItem.java @@ -50,7 +50,7 @@ public class ParticleEmitterMenuItem extends TesseractMenuItem { defaultButton.addActionListener(new ActionListener() { public void actionPerformed(final ActionEvent e) { if (defaultButton.isSelected()) { - myWorld.addObject(new ParticleEmitter(getDefaultPosition(), + myWorld.addObject(new ParticleEmitter(new Vector3f(0f,.49f, 0f), .5f, new Color3f(1f,0f,0f))); params.dispose(); } diff --git a/src/tesseract/menuitems/PlanarPolygonMenuItem.java b/src/tesseract/menuitems/PlanarPolygonMenuItem.java index 31b6e3e..a41dabb 100644 --- a/src/tesseract/menuitems/PlanarPolygonMenuItem.java +++ b/src/tesseract/menuitems/PlanarPolygonMenuItem.java @@ -52,7 +52,7 @@ public class PlanarPolygonMenuItem extends TesseractMenuItem { defaultButton.addActionListener(new ActionListener() {
public void actionPerformed(final ActionEvent e) {
if (defaultButton.isSelected()) {
- myWorld.addObject(new PlanarPolygon(getDefaultPosition(), getDefaultRadius()));
+ myWorld.addObject(new PlanarPolygon(new Vector3f(0f,-.3f, 0f), getDefaultRadius()));
params.dispose();
}
}
|