Added default params checkbox to emmitter and iso

3 files changed, 43 insertions, 6 deletions

diff --git a/src/tesseract/menuitems/IcosahedronMenuItem.java b/src/tesseract/menuitems/IcosahedronMenuItem.java
index e834f0e..dc80bf3 100644
--- a/src/tesseract/menuitems/IcosahedronMenuItem.java
+++ b/src/tesseract/menuitems/IcosahedronMenuItem.java
@@ -2,8 +2,11 @@ package tesseract.menuitems;
 

 import java.awt.Color;

 import java.awt.event.ActionEvent;

+import java.awt.event.ActionListener;

 

+import javax.swing.JCheckBox;

 import javax.swing.JColorChooser;

+import javax.swing.JFrame;

 import javax.swing.JOptionPane;

 import javax.vecmath.Color3f;

 import javax.vecmath.Vector3f;

@@ -39,13 +42,26 @@ public class IcosahedronMenuItem extends TesseractMenuItem {
 	 * @param arg0 Unused event info.

 	 */

 	public void actionPerformed(final ActionEvent arg0) {

-		//Color c = JColorChooser.showDialog(null, "Planar Polygon Color", Color.RED);

-		Vector3f pos = 

+		createParameterMenu();

+		

+		//If the default button is checked, the frame will close.

+		final JCheckBox defaultButton = getDefaultButton();

+		final JFrame params = getParamFrame();

+

+		defaultButton.addActionListener(new ActionListener() {

+			public void actionPerformed(final ActionEvent e) {

+				if (defaultButton.isSelected()) {

+					myWorld.addObject(new Icosahedron(getDefaultPosition(), 1, getDefaultRadius()));

+					params.dispose();

+				}

+			}

+		});

+		/*Vector3f pos = 

 			parseVector(JOptionPane.showInputDialog("Enter the position"));

 		float radius = 

 			Float.parseFloat(JOptionPane.showInputDialog("Enter the radius"));

 		

-		myWorld.addObject(new Icosahedron(pos, radius));

+		myWorld.addObject(new Icosahedron(pos, radius));*/

 	}

 }

 

diff --git a/src/tesseract/menuitems/ParticleEmitterMenuItem.java b/src/tesseract/menuitems/ParticleEmitterMenuItem.java
index 48ad88d..b4016cc 100644
--- a/src/tesseract/menuitems/ParticleEmitterMenuItem.java
+++ b/src/tesseract/menuitems/ParticleEmitterMenuItem.java
@@ -1,11 +1,17 @@
 package tesseract.menuitems;
 
+import java.awt.Color;
 import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
+import javax.swing.JCheckBox;
+import javax.swing.JFrame;
 import javax.swing.JOptionPane;
+import javax.vecmath.Color3f;
 import javax.vecmath.Vector3f;
 
 import tesseract.World;
+import tesseract.objects.PlanarPolygon;
 import tesseract.objects.emitters.ParticleEmitter;
 
 /**
@@ -35,14 +41,30 @@ public class ParticleEmitterMenuItem extends TesseractMenuItem {
 	 * @param arg0 Unused event info.
 	 */
 	public void actionPerformed(final ActionEvent arg0) {
-		Vector3f pos = 
+		createParameterMenu();
+		
+		//If the default button is checked, the frame will close.
+		final JCheckBox defaultButton = getDefaultButton();
+		final JFrame params = getParamFrame();
+
+		defaultButton.addActionListener(new ActionListener() {
+			public void actionPerformed(final ActionEvent e) {
+				if (defaultButton.isSelected()) {
+					myWorld.addObject(new ParticleEmitter(getDefaultPosition(),
+							.5f, new Color3f(1f,0f,0f)));
+					params.dispose();
+				}
+			}
+		});
+		
+		/*Vector3f pos = 
 			parseVector(JOptionPane.showInputDialog("Enter the position"));
 		
 		float freq = Float.parseFloat(
 					JOptionPane.showInputDialog(
 							"Emission Frequency (seconds)", "1"));
 		
-		myWorld.addObject(new ParticleEmitter(pos, freq, null));
+		myWorld.addObject(new ParticleEmitter(pos, freq, null));*/
 	}
 
 }
diff --git a/src/tesseract/menuitems/TesseractMenuItem.java b/src/tesseract/menuitems/TesseractMenuItem.java
index 2301a46..cd3bf03 100644
--- a/src/tesseract/menuitems/TesseractMenuItem.java
+++ b/src/tesseract/menuitems/TesseractMenuItem.java
@@ -7,7 +7,6 @@ import java.awt.event.ActionListener;
 import javax.swing.JCheckBox;
 import javax.swing.JFrame;
 import javax.swing.JMenuItem;
-import javax.swing.JRadioButton;
 import javax.vecmath.Vector3f;
 
 import tesseract.World;