summaryrefslogtreecommitdiff
path: root/src/tesseract/objects
diff options
context:
space:
mode:
Diffstat (limited to 'src/tesseract/objects')
-rw-r--r--src/tesseract/objects/Ellipsoid.java7
-rw-r--r--src/tesseract/objects/PlanarPolygon.java6
2 files changed, 8 insertions, 5 deletions
diff --git a/src/tesseract/objects/Ellipsoid.java b/src/tesseract/objects/Ellipsoid.java
index ac8a552..c3199ab 100644
--- a/src/tesseract/objects/Ellipsoid.java
+++ b/src/tesseract/objects/Ellipsoid.java
@@ -110,10 +110,9 @@ public class Ellipsoid extends PhysicalObject {
private TransformGroup createDefaultEllipsoid(final float radius, final float a,
final float b, final float c) {
- Sphere sphere = new Sphere(radius,
- new Sphere().getPrimitiveFlags()
- | Sphere.ENABLE_GEOMETRY_PICKING,
- DEFAULT_DIVISIONS);
+ Sphere sphere = new Sphere(radius, new Sphere().getPrimitiveFlags(), DEFAULT_DIVISIONS);
+ // | Sphere.ENABLE_GEOMETRY_PICKING,
+ // DEFAULT_DIVISIONS);
Transform3D tmp = new Transform3D();
tmp.set(new Matrix3f(a, 0.0f, 0.0f, 0.0f, b, 0.0f, 0.0f, 0.0f, c));
TransformGroup tg = new TransformGroup(tmp);
diff --git a/src/tesseract/objects/PlanarPolygon.java b/src/tesseract/objects/PlanarPolygon.java
index edc56b2..0abda1b 100644
--- a/src/tesseract/objects/PlanarPolygon.java
+++ b/src/tesseract/objects/PlanarPolygon.java
@@ -19,6 +19,7 @@ import javax.media.j3d.Texture2D;
import javax.media.j3d.Transform3D;
import javax.media.j3d.TriangleFanArray;
import javax.vecmath.Matrix3f;
+import javax.vecmath.Matrix4f;
import javax.vecmath.Point3f;
import javax.vecmath.TexCoord2f;
import javax.vecmath.Vector3f;
@@ -46,6 +47,10 @@ public class PlanarPolygon extends PhysicalObject {
private static final float DEFAULT_MASS = Float.POSITIVE_INFINITY;
//private static final float DEFAULT_MASS = 6;
+ public Vector3f normal;
+ // Right-hand side of the plane equation: Ax + By + Cz = D
+ public float intercept;
+
/**
* Number of divisions in the sphere.
*/
@@ -69,7 +74,6 @@ public class PlanarPolygon extends PhysicalObject {
setShape(createShape(radius, divisions));
}
-
/**
* Create a new Ellipsoid.
*