diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/tesseract/menuitems/EllipsoidMenuItem.java | 22 | ||||
| -rw-r--r-- | src/tesseract/menuitems/PlanarPolygonMenuItem.java | 7 | ||||
| -rw-r--r-- | src/tesseract/menuitems/TesseractMenuItem.java | 24 |
3 files changed, 44 insertions, 9 deletions
diff --git a/src/tesseract/menuitems/EllipsoidMenuItem.java b/src/tesseract/menuitems/EllipsoidMenuItem.java index fdab256..6aefa3e 100644 --- a/src/tesseract/menuitems/EllipsoidMenuItem.java +++ b/src/tesseract/menuitems/EllipsoidMenuItem.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,16 +42,29 @@ public class EllipsoidMenuItem extends TesseractMenuItem { * @param arg0 Unused event info.
*/
public void actionPerformed(final ActionEvent arg0) {
- //Color c = JColorChooser.showDialog(null, "Ellipsoid", Color.RED);
+ 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 Ellipsoid(getDefaultPosition(), getDefaultRadius()));
+ params.dispose();
+ }
+ }
+ });
- Vector3f pos =
+ /*Vector3f pos =
parseVector(JOptionPane.showInputDialog("Enter the position"));
float radius =
Float.parseFloat(JOptionPane.showInputDialog("Enter the radius"));
- myWorld.addObject(new Ellipsoid(pos, radius));
+ myWorld.addObject(new Ellipsoid(pos, radius));*/
}
}
diff --git a/src/tesseract/menuitems/PlanarPolygonMenuItem.java b/src/tesseract/menuitems/PlanarPolygonMenuItem.java index 8e37748..31b6e3e 100644 --- a/src/tesseract/menuitems/PlanarPolygonMenuItem.java +++ b/src/tesseract/menuitems/PlanarPolygonMenuItem.java @@ -29,11 +29,6 @@ public class PlanarPolygonMenuItem extends TesseractMenuItem { private static final long serialVersionUID = 1L;
/**
- * A Default radius.
- */
- private static final float DEFAULT_RADIUS = 0.1f;
-
- /**
* Constructor for the menu item.
*
* @param theWorld The world into which we add.
@@ -57,7 +52,7 @@ public class PlanarPolygonMenuItem extends TesseractMenuItem { defaultButton.addActionListener(new ActionListener() {
public void actionPerformed(final ActionEvent e) {
if (defaultButton.isSelected()) {
- myWorld.addObject(new PlanarPolygon(new Vector3f(0,0,0), DEFAULT_RADIUS));
+ myWorld.addObject(new PlanarPolygon(getDefaultPosition(), getDefaultRadius()));
params.dispose();
}
}
diff --git a/src/tesseract/menuitems/TesseractMenuItem.java b/src/tesseract/menuitems/TesseractMenuItem.java index 929c057..2301a46 100644 --- a/src/tesseract/menuitems/TesseractMenuItem.java +++ b/src/tesseract/menuitems/TesseractMenuItem.java @@ -26,6 +26,16 @@ public abstract class TesseractMenuItem private static final long serialVersionUID = 1839955501629795920L; /** + * A Default radius. + */ + private static final float DEFAULT_RADIUS = 0.1f; + + /** + * A Default position. + */ + private static final Vector3f DEFAULT_POSITION = new Vector3f(0,0,0); + + /** * The reference to the world. */ protected World myWorld; @@ -92,4 +102,18 @@ public abstract class TesseractMenuItem protected JFrame getParamFrame() { return my_param_frame; } + + /** + * @return the defaultRadius + */ + public static float getDefaultRadius() { + return DEFAULT_RADIUS; + } + + /** + * @return the defaultPosition + */ + public static Vector3f getDefaultPosition() { + return DEFAULT_POSITION; + } } |