diff options
| author | Steve <steveb9@u.washington.edu> | 2011-02-14 23:53:48 +0000 |
|---|---|---|
| committer | Steve <steveb9@u.washington.edu> | 2011-02-14 23:53:48 +0000 |
| commit | 2999ffdf1c3f182f1532b35981fe9f2093147594 (patch) | |
| tree | ba1dff0d43e13ff0b1636b7aaefd99dddda3c943 /src/tesseract | |
| parent | 348d4550023dd3960f7d845a685d0370841c6203 (diff) | |
Added Tangential force in XY plane
Diffstat (limited to 'src/tesseract')
| -rw-r--r-- | src/tesseract/TesseractUI.java | 30 | ||||
| -rw-r--r-- | src/tesseract/forces/CircularXY.java | 27 | ||||
| -rw-r--r-- | src/tesseract/forces/CircularXZ.java (renamed from src/tesseract/forces/Circular.java) | 4 |
3 files changed, 54 insertions, 7 deletions
diff --git a/src/tesseract/TesseractUI.java b/src/tesseract/TesseractUI.java index 15f9f3c..b2b010e 100644 --- a/src/tesseract/TesseractUI.java +++ b/src/tesseract/TesseractUI.java @@ -24,7 +24,8 @@ import javax.swing.Timer; import javax.vecmath.Point3d; import javax.vecmath.Vector3f; -import tesseract.forces.Circular; +import tesseract.forces.CircularXY; +import tesseract.forces.CircularXZ; import tesseract.forces.Force; import tesseract.forces.Gravity; import tesseract.menuitems.ChainLinkMenuItem; @@ -191,13 +192,13 @@ public class TesseractUI extends JFrame { }); forcesMenu.add(gravity); - final JMenuItem circular = new JCheckBoxMenuItem("Tangential force in the XZ plane", false); - circular.addActionListener(new ActionListener() { + final JMenuItem circularXZ = new JCheckBoxMenuItem("Tangential force in the XZ plane", false); + circularXZ.addActionListener(new ActionListener() { private Force me; // Constructor { - me = new Circular(.5f); + me = new CircularXZ(.5f); } public void actionPerformed(ActionEvent e) { @@ -208,7 +209,26 @@ public class TesseractUI extends JFrame { } } }); - forcesMenu.add(circular); + forcesMenu.add(circularXZ); + + final JMenuItem circularXY = new JCheckBoxMenuItem("Tangential force in the XY plane", false); + circularXY.addActionListener(new ActionListener() { + private Force me; + + // Constructor + { + me = new CircularXY(.5f); + } + + public void actionPerformed(ActionEvent e) { + if (((JCheckBoxMenuItem) e.getSource()).isSelected()) { + myWorld.addForce(me); + } else { + myWorld.removeForce(me); + } + } + }); + forcesMenu.add(circularXY); menuBar.add(forcesMenu); diff --git a/src/tesseract/forces/CircularXY.java b/src/tesseract/forces/CircularXY.java new file mode 100644 index 0000000..cef632d --- /dev/null +++ b/src/tesseract/forces/CircularXY.java @@ -0,0 +1,27 @@ +package tesseract.forces;
+
+import javax.vecmath.Vector3f;
+
+import tesseract.objects.PhysicalObject;
+
+@SuppressWarnings("restriction")
+public class CircularXY extends Force {
+ private float strength;
+
+ public CircularXY(float strength) {
+ this.strength = strength;
+ }
+
+ public Vector3f calculateForce(final PhysicalObject obj) {
+ Vector3f force = new Vector3f(-obj.getPosition().y, 0, obj.getPosition().x);
+ if (force.length() > 0) {
+ force.normalize();
+ force.scale(strength);
+ }
+ return force;
+ }
+
+ public String toString() {
+ return "Tangential force in the XY plane";
+ }
+}
diff --git a/src/tesseract/forces/Circular.java b/src/tesseract/forces/CircularXZ.java index 746064a..3601676 100644 --- a/src/tesseract/forces/Circular.java +++ b/src/tesseract/forces/CircularXZ.java @@ -5,10 +5,10 @@ import javax.vecmath.Vector3f; import tesseract.objects.PhysicalObject;
@SuppressWarnings("restriction")
-public class Circular extends Force {
+public class CircularXZ extends Force {
private float strength;
- public Circular(float strength) {
+ public CircularXZ(float strength) {
this.strength = strength;
}
|