summaryrefslogtreecommitdiff
path: root/src/tesseract/TesseractUI.java
diff options
context:
space:
mode:
authorPhillip <pacardon@u.washington.edu>2011-02-21 00:08:11 +0000
committerPhillip <pacardon@u.washington.edu>2011-02-21 00:08:11 +0000
commit88510c4f90193b59c366901536c933b3176c20c2 (patch)
tree3e068b35c9ebdb667671c45cc47d587a43d8ff21 /src/tesseract/TesseractUI.java
parent3c7f3b099198d4ea36d498c349cad80f2a6937de (diff)
Added lots of NewMenuItem Classes. Changed Default Shape from JCheckBox to JButton.
Added new Constructor to PlanarPolygon. Changed the sequence of events building JPanel/Frame in MenuItem.
Diffstat (limited to 'src/tesseract/TesseractUI.java')
-rw-r--r--src/tesseract/TesseractUI.java23
1 files changed, 14 insertions, 9 deletions
diff --git a/src/tesseract/TesseractUI.java b/src/tesseract/TesseractUI.java
index 79bb8e6..1ad6cbb 100644
--- a/src/tesseract/TesseractUI.java
+++ b/src/tesseract/TesseractUI.java
@@ -42,7 +42,13 @@ import tesseract.menuitems.ParticleEmitterMenuItem;
import tesseract.menuitems.ParticleMenuItem;
import tesseract.menuitems.PlanarPolygonMenuItem;
import tesseract.menuitems.SurfBoardMenuItem;
+import tesseract.newmenu.NewChainLinkMenuItem;
+import tesseract.newmenu.NewEllipsoidMenuItem;
import tesseract.newmenu.NewIcosahedronMenuItem;
+import tesseract.newmenu.NewParticleEmitterMenuItem;
+import tesseract.newmenu.NewParticleMenuItem;
+import tesseract.newmenu.NewPlanarPolygonMenuItem;
+import tesseract.newmenu.NewToroidMenuItem;
import tesseract.objects.Box;
import tesseract.objects.ChainLink2;
import tesseract.objects.PhysicalObject;
@@ -129,15 +135,14 @@ public class TesseractUI extends JFrame {
myCurrentObject = null;
myObjectMenuItems = new JMenuItem[] {
- new ParticleEmitterMenuItem(myWorld),
- new ParticleMenuItem(myWorld),
- new PlanarPolygonMenuItem(myWorld),
- new EllipsoidMenuItem(myWorld),
- new IcosahedronMenuItem(myWorld),
- new ChainLinkMenuItem(myWorld),
- new DonutMenuItem(myWorld),
- new SurfBoardMenuItem(myWorld),
- new NewIcosahedronMenuItem(myWorld)
+ new NewParticleEmitterMenuItem(myWorld),
+ new NewParticleMenuItem(myWorld),
+ new NewPlanarPolygonMenuItem(myWorld),
+ new NewEllipsoidMenuItem(myWorld),
+ new NewIcosahedronMenuItem(myWorld),
+ new NewChainLinkMenuItem(myWorld),
+ new NewToroidMenuItem(myWorld),
+ new SurfBoardMenuItem(myWorld)
};
createMenu();
setupCanvas();