summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/tesseract/TesseractUI.java11
-rw-r--r--src/tesseract/menuitems/ChainLinkMenuItem.java7
-rw-r--r--src/tesseract/menuitems/EllipsoidMenuItem.java5
-rw-r--r--src/tesseract/menuitems/IcosahedronMenuItem.java6
-rw-r--r--src/tesseract/menuitems/ParticleEmitterMenuItem.java4
-rw-r--r--src/tesseract/menuitems/PlanarPolygonMenuItem.java7
-rw-r--r--src/tesseract/menuitems/SurfBoardMenuItem.java12
-rw-r--r--src/tesseract/menuitems/TesseractMenuItem.java8
-rw-r--r--src/tesseract/newmenu/NewChainLinkMenuItem.java6
-rw-r--r--src/tesseract/newmenu/NewEllipsoidMenuItem.java3
-rw-r--r--src/tesseract/newmenu/NewIcosahedronMenuItem.java3
-rw-r--r--src/tesseract/newmenu/NewParticleEmitterMenuItem.java3
-rw-r--r--src/tesseract/newmenu/NewParticleMenuItem.java5
-rw-r--r--src/tesseract/newmenu/NewPlanarPolygonMenuItem.java2
-rw-r--r--src/tesseract/newmenu/NewSurfBoardMenuItem.java51
-rw-r--r--src/tesseract/newmenu/NewToroidMenuItem.java4
-rw-r--r--src/tesseract/objects/Particle.java1
17 files changed, 67 insertions, 71 deletions
diff --git a/src/tesseract/TesseractUI.java b/src/tesseract/TesseractUI.java
index 1ad6cbb..bf5bc59 100644
--- a/src/tesseract/TesseractUI.java
+++ b/src/tesseract/TesseractUI.java
@@ -34,20 +34,13 @@ import tesseract.forces.Force;
import tesseract.forces.Gravity;
import tesseract.forces.LinearOrigin;
import tesseract.forces.QuadradicOrigin;
-import tesseract.menuitems.ChainLinkMenuItem;
-import tesseract.menuitems.DonutMenuItem;
-import tesseract.menuitems.EllipsoidMenuItem;
-import tesseract.menuitems.IcosahedronMenuItem;
-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.NewSurfBoardMenuItem;
import tesseract.newmenu.NewToroidMenuItem;
import tesseract.objects.Box;
import tesseract.objects.ChainLink2;
@@ -142,7 +135,7 @@ public class TesseractUI extends JFrame {
new NewIcosahedronMenuItem(myWorld),
new NewChainLinkMenuItem(myWorld),
new NewToroidMenuItem(myWorld),
- new SurfBoardMenuItem(myWorld)
+ new NewSurfBoardMenuItem(myWorld)
};
createMenu();
setupCanvas();
diff --git a/src/tesseract/menuitems/ChainLinkMenuItem.java b/src/tesseract/menuitems/ChainLinkMenuItem.java
index 5e5e4fd..ca32af7 100644
--- a/src/tesseract/menuitems/ChainLinkMenuItem.java
+++ b/src/tesseract/menuitems/ChainLinkMenuItem.java
@@ -1,22 +1,15 @@
package tesseract.menuitems;
-import java.awt.Color;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.JButton;
import javax.swing.JCheckBox;
-import javax.swing.JColorChooser;
import javax.swing.JFrame;
-import javax.swing.JOptionPane;
-import javax.vecmath.Color3f;
import javax.vecmath.Vector3f;
import tesseract.World;
-import tesseract.objects.ChainLink;
import tesseract.objects.ChainLink2;
-import tesseract.objects.Icosahedron;
-import tesseract.objects.PlanarPolygon;
/**
* Icosahedron Menu Item.
diff --git a/src/tesseract/menuitems/EllipsoidMenuItem.java b/src/tesseract/menuitems/EllipsoidMenuItem.java
index f680d84..02d7eb2 100644
--- a/src/tesseract/menuitems/EllipsoidMenuItem.java
+++ b/src/tesseract/menuitems/EllipsoidMenuItem.java
@@ -1,20 +1,15 @@
package tesseract.menuitems;
-import java.awt.Color;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.JButton;
import javax.swing.JCheckBox;
-import javax.swing.JColorChooser;
import javax.swing.JFrame;
-import javax.swing.JOptionPane;
-import javax.vecmath.Color3f;
import javax.vecmath.Vector3f;
import tesseract.World;
import tesseract.objects.Ellipsoid;
-import tesseract.objects.PlanarPolygon;
/**
* Ellipsoid Menu Item.
diff --git a/src/tesseract/menuitems/IcosahedronMenuItem.java b/src/tesseract/menuitems/IcosahedronMenuItem.java
index 309a9b2..550f954 100644
--- a/src/tesseract/menuitems/IcosahedronMenuItem.java
+++ b/src/tesseract/menuitems/IcosahedronMenuItem.java
@@ -1,21 +1,15 @@
package tesseract.menuitems;
-import java.awt.Color;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.JButton;
import javax.swing.JCheckBox;
-import javax.swing.JColorChooser;
import javax.swing.JFrame;
-import javax.swing.JOptionPane;
-import javax.vecmath.Color3f;
import javax.vecmath.Vector3f;
import tesseract.World;
-import tesseract.objects.Ellipsoid;
import tesseract.objects.Icosahedron;
-import tesseract.objects.PlanarPolygon;
/**
* Icosahedron Menu Item.
diff --git a/src/tesseract/menuitems/ParticleEmitterMenuItem.java b/src/tesseract/menuitems/ParticleEmitterMenuItem.java
index f2d7fa5..f8456d2 100644
--- a/src/tesseract/menuitems/ParticleEmitterMenuItem.java
+++ b/src/tesseract/menuitems/ParticleEmitterMenuItem.java
@@ -1,19 +1,15 @@
package tesseract.menuitems;
-import java.awt.Color;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.JButton;
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.Ellipsoid;
-import tesseract.objects.PlanarPolygon;
import tesseract.objects.emitters.ParticleEmitter;
/**
diff --git a/src/tesseract/menuitems/PlanarPolygonMenuItem.java b/src/tesseract/menuitems/PlanarPolygonMenuItem.java
index cafdcc8..5c1f583 100644
--- a/src/tesseract/menuitems/PlanarPolygonMenuItem.java
+++ b/src/tesseract/menuitems/PlanarPolygonMenuItem.java
@@ -1,21 +1,14 @@
package tesseract.menuitems;
-import java.awt.Color;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.JButton;
import javax.swing.JCheckBox;
-import javax.swing.JCheckBoxMenuItem;
-import javax.swing.JColorChooser;
import javax.swing.JFrame;
-import javax.swing.JOptionPane;
-import javax.swing.JRadioButton;
-import javax.vecmath.Color3f;
import javax.vecmath.Vector3f;
import tesseract.World;
-import tesseract.objects.Ellipsoid;
import tesseract.objects.PlanarPolygon;
/**
diff --git a/src/tesseract/menuitems/SurfBoardMenuItem.java b/src/tesseract/menuitems/SurfBoardMenuItem.java
index 34d5d1f..c96fb3e 100644
--- a/src/tesseract/menuitems/SurfBoardMenuItem.java
+++ b/src/tesseract/menuitems/SurfBoardMenuItem.java
@@ -1,30 +1,24 @@
package tesseract.menuitems;
-import java.awt.Color;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.media.j3d.Appearance;
import javax.media.j3d.ColoringAttributes;
import javax.media.j3d.Material;
-import javax.swing.JButton;
import javax.swing.JCheckBox;
-import javax.swing.JColorChooser;
import javax.swing.JFrame;
-import javax.swing.JOptionPane;
-import javax.vecmath.Color3f;
-import javax.vecmath.Vector3f;
-
-import com.sun.j3d.utils.geometry.Sphere;
import tesseract.World;
import tesseract.objects.Ellipsoid;
-import tesseract.objects.PlanarPolygon;
+
+import com.sun.j3d.utils.geometry.Sphere;
/**
* Ellipsoid Menu Item.
*
* @author Steve Bradshaw
+ * @deprecated by Phillip Cardon
*/
public class SurfBoardMenuItem extends TesseractMenuItem {
diff --git a/src/tesseract/menuitems/TesseractMenuItem.java b/src/tesseract/menuitems/TesseractMenuItem.java
index b1d3d8c..97daa0c 100644
--- a/src/tesseract/menuitems/TesseractMenuItem.java
+++ b/src/tesseract/menuitems/TesseractMenuItem.java
@@ -1,12 +1,9 @@
package tesseract.menuitems;
-import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Dimension;
-import java.awt.FlowLayout;
import java.awt.GridLayout;
import java.awt.Toolkit;
-import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.JButton;
@@ -21,8 +18,9 @@ import tesseract.World;
/**
* Abstract class for menu items.
- *
+ * USE MENU ITEM IN tesseract.newmenu CLASS.
* @author Jesse Morgan, Steve Bradshaw
+ * @deprecated by Phillip Cardon
*/
public abstract class TesseractMenuItem
extends JMenuItem implements ActionListener {
@@ -40,7 +38,7 @@ public abstract class TesseractMenuItem
/**
* A Default position.
*/
- private static final Vector3f DEFAULT_POSITION = new Vector3f(0,0,0);
+ private static final Vector3f DEFAULT_POSITION = new Vector3f(0, 0, 0);
/**
* The reference to the world.
diff --git a/src/tesseract/newmenu/NewChainLinkMenuItem.java b/src/tesseract/newmenu/NewChainLinkMenuItem.java
index 65e7395..1011822 100644
--- a/src/tesseract/newmenu/NewChainLinkMenuItem.java
+++ b/src/tesseract/newmenu/NewChainLinkMenuItem.java
@@ -5,16 +5,14 @@ import java.awt.event.ActionListener;
import java.util.Set;
import javax.swing.JButton;
-import javax.swing.JCheckBox;
import javax.swing.JFrame;
import javax.vecmath.Vector3f;
import tesseract.World;
import tesseract.objects.ChainLink2;
-import tesseract.objects.Icosahedron;
/**
- * NewIcosahedronMenutItem
+ * NewChainLinkMenuItem
*
* Defines a menu item to add an ChainLink to the world.
* Code recycled from TesseractMenuItem by Steve Bradshaw and Jessie Morgan
@@ -34,7 +32,7 @@ public class NewChainLinkMenuItem extends MenuItem {
* @param theWorld to add objects to.
*/
public NewChainLinkMenuItem(final World theWorld) {
- super(theWorld, "ChainLink(NEW)");
+ super(theWorld, "Chain Link");
buildParams();
}
diff --git a/src/tesseract/newmenu/NewEllipsoidMenuItem.java b/src/tesseract/newmenu/NewEllipsoidMenuItem.java
index ae5885a..2261c73 100644
--- a/src/tesseract/newmenu/NewEllipsoidMenuItem.java
+++ b/src/tesseract/newmenu/NewEllipsoidMenuItem.java
@@ -5,7 +5,6 @@ import java.awt.event.ActionListener;
import java.util.Set;
import javax.swing.JButton;
-import javax.swing.JCheckBox;
import javax.swing.JFrame;
import javax.vecmath.Vector3f;
@@ -37,7 +36,7 @@ public class NewEllipsoidMenuItem extends MenuItem {
* @param theWorld to add objects to.
*/
public NewEllipsoidMenuItem(final World theWorld) {
- super(theWorld, "Ellipsoid(NEW)");
+ super(theWorld, "Ellipsoid");
buildParams();
}
diff --git a/src/tesseract/newmenu/NewIcosahedronMenuItem.java b/src/tesseract/newmenu/NewIcosahedronMenuItem.java
index 8a96ee0..e2c8e76 100644
--- a/src/tesseract/newmenu/NewIcosahedronMenuItem.java
+++ b/src/tesseract/newmenu/NewIcosahedronMenuItem.java
@@ -5,7 +5,6 @@ import java.awt.event.ActionListener;
import java.util.Set;
import javax.swing.JButton;
-import javax.swing.JCheckBox;
import javax.swing.JFrame;
import javax.vecmath.Vector3f;
@@ -33,7 +32,7 @@ public class NewIcosahedronMenuItem extends MenuItem {
* @param theWorld to add objects to.
*/
public NewIcosahedronMenuItem(final World theWorld) {
- super(theWorld, "Icosahedron(NEW)");
+ super(theWorld, "Icosahedron");
buildParams();
diff --git a/src/tesseract/newmenu/NewParticleEmitterMenuItem.java b/src/tesseract/newmenu/NewParticleEmitterMenuItem.java
index 9f67ba8..dc0b1fc 100644
--- a/src/tesseract/newmenu/NewParticleEmitterMenuItem.java
+++ b/src/tesseract/newmenu/NewParticleEmitterMenuItem.java
@@ -6,7 +6,6 @@ import java.awt.event.ActionListener;
import java.util.Set;
import javax.swing.JButton;
-import javax.swing.JCheckBox;
import javax.swing.JColorChooser;
import javax.swing.JFrame;
import javax.vecmath.Color3f;
@@ -41,7 +40,7 @@ public class NewParticleEmitterMenuItem extends MenuItem {
* @param theWorld to add objects to.
*/
public NewParticleEmitterMenuItem(final World theWorld) {
- super(theWorld, "Particle Emitter(NEW)");
+ super(theWorld, "Particle Emitter");
buildParams();
diff --git a/src/tesseract/newmenu/NewParticleMenuItem.java b/src/tesseract/newmenu/NewParticleMenuItem.java
index 36bf502..4b87852 100644
--- a/src/tesseract/newmenu/NewParticleMenuItem.java
+++ b/src/tesseract/newmenu/NewParticleMenuItem.java
@@ -6,16 +6,13 @@ import java.awt.event.ActionListener;
import java.util.Set;
import javax.swing.JButton;
-import javax.swing.JCheckBox;
import javax.swing.JColorChooser;
import javax.swing.JFrame;
import javax.vecmath.Color3f;
import javax.vecmath.Vector3f;
import tesseract.World;
-import tesseract.objects.Icosahedron;
import tesseract.objects.Particle;
-import tesseract.objects.emitters.ParticleEmitter;
/**
* NewIcosahedronMenutItem
@@ -42,7 +39,7 @@ public class NewParticleMenuItem extends MenuItem {
* @param theWorld to add objects to.
*/
public NewParticleMenuItem(final World theWorld) {
- super(theWorld, "Particle(NEW)");
+ super(theWorld, "Particle");
this.makePanel();
diff --git a/src/tesseract/newmenu/NewPlanarPolygonMenuItem.java b/src/tesseract/newmenu/NewPlanarPolygonMenuItem.java
index 95a4b92..c2ea659 100644
--- a/src/tesseract/newmenu/NewPlanarPolygonMenuItem.java
+++ b/src/tesseract/newmenu/NewPlanarPolygonMenuItem.java
@@ -33,7 +33,7 @@ public class NewPlanarPolygonMenuItem extends MenuItem {
* @param theWorld to add objects to.
*/
public NewPlanarPolygonMenuItem(final World theWorld) {
- super(theWorld, "Planar Polygon(NEW)");
+ super(theWorld, "Planar Polygon");
buildParams();
diff --git a/src/tesseract/newmenu/NewSurfBoardMenuItem.java b/src/tesseract/newmenu/NewSurfBoardMenuItem.java
new file mode 100644
index 0000000..4346012
--- /dev/null
+++ b/src/tesseract/newmenu/NewSurfBoardMenuItem.java
@@ -0,0 +1,51 @@
+package tesseract.newmenu;
+
+import java.awt.event.ActionEvent;
+
+import javax.media.j3d.Appearance;
+import javax.media.j3d.ColoringAttributes;
+import javax.media.j3d.Material;
+
+import tesseract.World;
+import tesseract.objects.Ellipsoid;
+
+import com.sun.j3d.utils.geometry.Sphere;
+
+/**
+ * SurfBoard Menu Item.
+ *
+ * @author Steve Bradshaw
+ * @author Phillip cardon
+ */
+public class NewSurfBoardMenuItem extends MenuItem {
+
+ /**
+ * Serial ID.
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Constructor for the menu item.
+ *
+ * @param theWorld The world into which we add.
+ */
+ public NewSurfBoardMenuItem(final World theWorld) {
+ super(theWorld, "Surf Board");
+ }
+
+ /**
+ * Action handler.
+ *
+ * @param arg0 Unused event info.
+ */
+ public void actionPerformed(final ActionEvent arg0) {
+ Appearance eApp = new Appearance();
+ Material eggMat = new Material();
+ eggMat.setDiffuseColor(0f, .5f, 1f);
+ eApp.setMaterial(eggMat);
+ eApp.setColoringAttributes(new ColoringAttributes(
+ 0f, 1f, 1f, ColoringAttributes.ALLOW_COLOR_WRITE));
+ myWorld.addObject(new Ellipsoid(getPosition(), 1, 0.05f,
+ new Sphere().getPrimitiveFlags(), 40, eApp, 0.2f, 4.0f));
+ }
+}
diff --git a/src/tesseract/newmenu/NewToroidMenuItem.java b/src/tesseract/newmenu/NewToroidMenuItem.java
index 7bfde78..59f07e8 100644
--- a/src/tesseract/newmenu/NewToroidMenuItem.java
+++ b/src/tesseract/newmenu/NewToroidMenuItem.java
@@ -5,12 +5,10 @@ import java.awt.event.ActionListener;
import java.util.Set;
import javax.swing.JButton;
-import javax.swing.JCheckBox;
import javax.swing.JFrame;
import javax.vecmath.Vector3f;
import tesseract.World;
-import tesseract.objects.Icosahedron;
import tesseract.objects.Toroid;
/**
@@ -34,7 +32,7 @@ public class NewToroidMenuItem extends MenuItem {
* @param theWorld to add objects to.
*/
public NewToroidMenuItem(final World theWorld) {
- super(theWorld, "Toroid(NEW)");
+ super(theWorld, "Toroid");
buildParams();
diff --git a/src/tesseract/objects/Particle.java b/src/tesseract/objects/Particle.java
index b8bbd08..0edba3d 100644
--- a/src/tesseract/objects/Particle.java
+++ b/src/tesseract/objects/Particle.java
@@ -4,7 +4,6 @@ import java.awt.Color;
import javax.media.j3d.Appearance;
import javax.media.j3d.ColoringAttributes;
-import javax.media.j3d.Node;
import javax.media.j3d.TransformGroup;
import javax.vecmath.Color3f;
import javax.vecmath.Vector3f;
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-15 21:43:29 +0000