diff options
| author | Steve <steveb9@u.washington.edu> | 2011-02-11 05:57:56 +0000 |
|---|---|---|
| committer | Steve <steveb9@u.washington.edu> | 2011-02-11 05:57:56 +0000 |
| commit | 3b2aa407ba194f4a44536ac141fe5fbd2a67ad7c (patch) | |
| tree | f3f511b57a8b257d2294f75f5db42a6153ee15fd /src | |
| parent | aa567c12b883be0872bff04d03f8b6c21f8f2e5a (diff) | |
added iso to menu
Diffstat (limited to 'src')
| -rw-r--r-- | src/tesseract/TesseractUI.java | 4 | ||||
| -rw-r--r-- | src/tesseract/menuitems/IcosahedronMenuItem.java | 51 | ||||
| -rw-r--r-- | src/tesseract/objects/Ellipsoid.java | 2 | ||||
| -rw-r--r-- | src/tesseract/tests/EggTest.java | 2 |
4 files changed, 56 insertions, 3 deletions
diff --git a/src/tesseract/TesseractUI.java b/src/tesseract/TesseractUI.java index 99fe0a4..8eadcc7 100644 --- a/src/tesseract/TesseractUI.java +++ b/src/tesseract/TesseractUI.java @@ -25,6 +25,7 @@ import javax.vecmath.Point3d; import javax.vecmath.Vector3f; import tesseract.menuitems.EllipsoidMenuItem; +import tesseract.menuitems.IcosahedronMenuItem; import tesseract.menuitems.ParticleEmitterMenuItem; import tesseract.menuitems.ParticleMenuItem; import tesseract.menuitems.PlanarPolygonMenuItem; @@ -103,7 +104,8 @@ public class TesseractUI extends JFrame { new ParticleEmitterMenuItem(myWorld), new ParticleMenuItem(myWorld), new PlanarPolygonMenuItem(myWorld), - new EllipsoidMenuItem(myWorld) + new EllipsoidMenuItem(myWorld), + new IcosahedronMenuItem(myWorld) }; createMenu(); diff --git a/src/tesseract/menuitems/IcosahedronMenuItem.java b/src/tesseract/menuitems/IcosahedronMenuItem.java new file mode 100644 index 0000000..554e42b --- /dev/null +++ b/src/tesseract/menuitems/IcosahedronMenuItem.java @@ -0,0 +1,51 @@ +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.objects.Icosahedron;
+import tesseract.objects.PlanarPolygon;
+
+/**
+ * Planar Polygon Menu Item.
+ *
+ * @author Steve Bradshaw
+ */
+public class IcosahedronMenuItem extends TesseractMenuItem {
+
+ /**
+ * Serial ID.
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Constructor for the menu item.
+ *
+ * @param theWorld The world into which we add.
+ */
+ public IcosahedronMenuItem(final World theWorld) {
+ super(theWorld, "Icosahedron");
+ }
+
+ /**
+ * Action handler.
+ *
+ * @param arg0 Unused event info.
+ */
+ public void actionPerformed(final ActionEvent arg0) {
+ //Color c = JColorChooser.showDialog(null, "Planar Polygon Color", Color.RED);
+ Vector3f pos =
+ parseVector(JOptionPane.showInputDialog("Enter the position"));
+ float radius =
+ Float.parseFloat(JOptionPane.showInputDialog("Enter the radius"));
+
+ myWorld.addObject(new Icosahedron(pos, radius));
+ }
+}
+
diff --git a/src/tesseract/objects/Ellipsoid.java b/src/tesseract/objects/Ellipsoid.java index 90b3633..f7c9175 100644 --- a/src/tesseract/objects/Ellipsoid.java +++ b/src/tesseract/objects/Ellipsoid.java @@ -1,5 +1,5 @@ /*
- * Class Ellipsoid
+ * Class Ellipsoid
* TCSS 491 Computational Worlds
* Steve Bradshaw
*/
diff --git a/src/tesseract/tests/EggTest.java b/src/tesseract/tests/EggTest.java index 6aebccf..5c91f02 100644 --- a/src/tesseract/tests/EggTest.java +++ b/src/tesseract/tests/EggTest.java @@ -60,7 +60,7 @@ public class EggTest { icc3D = new Transform3D();
iccTG = new TransformGroup();
iccTG.setCapability(TransformGroup.ALLOW_TRANSFORM_WRITE);
- iccTG.addChild(createPlanar());
+ iccTG.addChild(createEllipsoid());
scene.addChild(iccTG);
scene.compile();
|