diff options
Diffstat (limited to 'src/tesseract')
| -rw-r--r-- | src/tesseract/TesseractUI.java | 10 | ||||
| -rw-r--r-- | src/tesseract/forces/AirDrag.java | 6 | ||||
| -rw-r--r-- | src/tesseract/objects/PhysicalObject.java | 4 |
3 files changed, 14 insertions, 6 deletions
diff --git a/src/tesseract/TesseractUI.java b/src/tesseract/TesseractUI.java index fed3939..4922e52 100644 --- a/src/tesseract/TesseractUI.java +++ b/src/tesseract/TesseractUI.java @@ -45,6 +45,7 @@ import tesseract.menuitems.SurfBoardMenuItem; import tesseract.objects.Box; import tesseract.objects.ChainLink2; import tesseract.objects.PhysicalObject; +import tesseract.objects.Sphere; import com.sun.j3d.utils.picking.PickCanvas; import com.sun.j3d.utils.picking.PickResult; @@ -154,10 +155,13 @@ public class TesseractUI extends JFrame { ChainLink2 o = new ChainLink2(new Vector3f(), 1); o.setRotation(); - myWorld.addForce(new AirDrag()); + //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))); + //World.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))); + PhysicalObject s = new Sphere(.05f, new Vector3f()); + s.setAngularVelocity(new Vector3f(0, 0, -1)); + myWorld.addObject(s); //myWorld.addObject(o); } diff --git a/src/tesseract/forces/AirDrag.java b/src/tesseract/forces/AirDrag.java index c27ec7e..356de7a 100644 --- a/src/tesseract/forces/AirDrag.java +++ b/src/tesseract/forces/AirDrag.java @@ -74,9 +74,9 @@ public class AirDrag extends Force { float surfaceArea = areaOfHull(hull); - float force = 0.5f * v.length() * COEFFICIENT * surfaceArea; + float force = 0.5f * v.lengthSquared() * COEFFICIENT * surfaceArea; - System.out.println(v.length()); + System.out.println(v.lengthSquared()); System.out.println(force); v.normalize(); @@ -84,7 +84,7 @@ public class AirDrag extends Force { System.out.println(v); - return v; + return new Vector3f(); } diff --git a/src/tesseract/objects/PhysicalObject.java b/src/tesseract/objects/PhysicalObject.java index e2f31c8..c743e8e 100644 --- a/src/tesseract/objects/PhysicalObject.java +++ b/src/tesseract/objects/PhysicalObject.java @@ -142,5 +142,9 @@ public class PhysicalObject extends CollidableObject { public float getInverseMass() { return this.inverseMass; + } + + public void setAngularVelocity(final Vector3f velocity) { + this.angularVelocity = velocity; }
}
\ No newline at end of file |