diff options
| author | Jesse Morgan <jesse@jesterpm.net> | 2011-02-11 03:48:01 +0000 |
|---|---|---|
| committer | Jesse Morgan <jesse@jesterpm.net> | 2011-02-11 03:48:01 +0000 |
| commit | 76c99edd385869378798523873057840ba72c94e (patch) | |
| tree | ff1095c2896ba1b415fcda59b7f3f6bb43af4bd6 /src | |
| parent | 14dcf5b2488c4429e50f76e6cef339cac2653430 (diff) | |
Fixed my accidental commenting.
Diffstat (limited to 'src')
| -rw-r--r-- | src/tesseract/TesseractUI.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/tesseract/TesseractUI.java b/src/tesseract/TesseractUI.java index de7dba3..99fe0a4 100644 --- a/src/tesseract/TesseractUI.java +++ b/src/tesseract/TesseractUI.java @@ -24,9 +24,10 @@ import javax.swing.Timer; import javax.vecmath.Point3d; import javax.vecmath.Vector3f; +import tesseract.menuitems.EllipsoidMenuItem; import tesseract.menuitems.ParticleEmitterMenuItem; import tesseract.menuitems.ParticleMenuItem; -import tesseract.objects.Particle; +import tesseract.menuitems.PlanarPolygonMenuItem; import com.sun.j3d.utils.universe.SimpleUniverse; @@ -101,8 +102,8 @@ public class TesseractUI extends JFrame { myObjectMenuItems = new JMenuItem[] { new ParticleEmitterMenuItem(myWorld), new ParticleMenuItem(myWorld), - //new PlanarPolygonMenuItem(myWorld), - //new EllipsoidMenuItem(myWorld) + new PlanarPolygonMenuItem(myWorld), + new EllipsoidMenuItem(myWorld) }; createMenu(); @@ -117,7 +118,7 @@ public class TesseractUI extends JFrame { // THIS IS WHERE OBJECTS ARE FORCED INTO EXISTANCE // TODO: REMOVE TEST CODE - myWorld.addObject(new Particle(new Vector3f(0, 0, 0), null)); + //myWorld.addObject(new Particle(new Vector3f(0, 0, 0), null)); //myWorld.addForce(new Gravity()); //myWorld.addObject(new ParticleEmitter(new Vector3f(0, 0.49f, 0), 0.5f, null)); //myWorld.addObject(new PlanarPolygon(new Vector3f(0, 0.49f, 0), 0.25f)); |