From 3847c5b66c2c1a186af5af422ff4e03759c2ffe9 Mon Sep 17 00:00:00 2001 From: Steve Date: Fri, 11 Feb 2011 02:18:07 +0000 Subject: Added menu for ellipsoid and planpolygon changed ui slightly to display the new menu items added lava jpeg for planar texture --- src/tesseract/TesseractUI.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src/tesseract/TesseractUI.java') diff --git a/src/tesseract/TesseractUI.java b/src/tesseract/TesseractUI.java index 4519585..a13f537 100644 --- a/src/tesseract/TesseractUI.java +++ b/src/tesseract/TesseractUI.java @@ -24,9 +24,12 @@ import javax.vecmath.Point3d; import javax.vecmath.Vector3f; import tesseract.forces.Gravity; +import tesseract.menuitems.EllipsoidMenuItem; import tesseract.menuitems.ParticleEmitterMenuItem; import tesseract.menuitems.ParticleMenuItem; +import tesseract.menuitems.PlanarPolygonMenuItem; import tesseract.objects.Particle; +import tesseract.objects.PlanarPolygon; import tesseract.objects.emitters.ParticleEmitter; import com.sun.j3d.utils.universe.SimpleUniverse; @@ -96,7 +99,9 @@ public class TesseractUI extends JFrame { myObjectMenuItems = new JMenuItem[] { new ParticleEmitterMenuItem(myWorld), - new ParticleMenuItem(myWorld) + new ParticleMenuItem(myWorld), + new PlanarPolygonMenuItem(myWorld), + new EllipsoidMenuItem(myWorld) }; createMenu(); @@ -111,9 +116,10 @@ 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.addForce(new Gravity()); - myWorld.addObject(new ParticleEmitter(new Vector3f(0, 0.49f, 0), 0.5f, 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