From 76c99edd385869378798523873057840ba72c94e Mon Sep 17 00:00:00 2001 From: Jesse Morgan Date: Fri, 11 Feb 2011 03:48:01 +0000 Subject: Fixed my accidental commenting. --- src/tesseract/TesseractUI.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/tesseract/TesseractUI.java') 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)); -- cgit v1.2.3