diff options
| author | Jesse Morgan <jesse@jesterpm.net> | 2011-02-18 03:41:00 +0000 |
|---|---|---|
| committer | Jesse Morgan <jesse@jesterpm.net> | 2011-02-18 03:41:00 +0000 |
| commit | 893a4bf81d9db58ffd68782389625b2a893fcf90 (patch) | |
| tree | ffffe3bb3b0f94781b3474f3a952d1efdcc3e7ce /src/tesseract/TesseractUI.java | |
| parent | 1c0e514296bd1ae062961ae129d65e5d96d9c323 (diff) | |
Air Drag merged.
Diffstat (limited to 'src/tesseract/TesseractUI.java')
| -rw-r--r-- | src/tesseract/TesseractUI.java | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/tesseract/TesseractUI.java b/src/tesseract/TesseractUI.java index 882f6a8..9fd91b9 100644 --- a/src/tesseract/TesseractUI.java +++ b/src/tesseract/TesseractUI.java @@ -27,6 +27,7 @@ import javax.vecmath.Point3d; import javax.vecmath.Point3f; import javax.vecmath.Vector3f; +import tesseract.forces.AirDrag; import tesseract.forces.CircularXY; import tesseract.forces.CircularXZ; import tesseract.forces.Force; @@ -40,8 +41,8 @@ import tesseract.menuitems.IcosahedronMenuItem; import tesseract.menuitems.ParticleEmitterMenuItem; import tesseract.menuitems.ParticleMenuItem; import tesseract.menuitems.PlanarPolygonMenuItem; +import tesseract.objects.Box; import tesseract.objects.ChainLink2; -import tesseract.objects.Circle; import tesseract.objects.PhysicalObject; import com.sun.j3d.utils.picking.PickCanvas; @@ -147,10 +148,16 @@ public class TesseractUI extends JFrame { // TODO: REMOVE TEST CODE // Lookie! Linked chainlinks! - myWorld.addObject(new ChainLink2(new Vector3f(0.15f, 0, 0), 1)); + //myWorld.addObject(new ChainLink2(new Vector3f(0.15f, 0, 0), 1)); ChainLink2 o = new ChainLink2(new Vector3f(), 1); o.setRotation(); - myWorld.addObject(o); + + myWorld.addForce(new AirDrag()); + + myWorld.addObject(new Box(0.18f, 0.1f, 0.25f, new Vector3f(0.1f, -0.10f, 0))); + myWorld.addObject(new Box(0.18f, 0.25f, 0.1f, new Vector3f(-0.1f, 0, 0))); + + //myWorld.addObject(o); } /** |