Enabled geometry picking on shapes.

2 files changed, 5 insertions, 1 deletions

diff --git a/src/tesseract/objects/Ellipsoid.java b/src/tesseract/objects/Ellipsoid.java
index 31ded22..90b3633 100644
--- a/src/tesseract/objects/Ellipsoid.java
+++ b/src/tesseract/objects/Ellipsoid.java
@@ -74,7 +74,9 @@ public class Ellipsoid extends ForceableObject {
 	 */

 	private void createDefaultEllipsoid(final float radius) {

 		

-		Sphere sphere = new Sphere(radius, new Sphere().getPrimitiveFlags(),

+		Sphere sphere = new Sphere(radius,

+				new Sphere().getPrimitiveFlags()

+				| Sphere.ENABLE_GEOMETRY_PICKING,

 				DEFAULT_DIVISIONS);

 		Transform3D tmp = new Transform3D();

 		tmp.set(new Matrix3f(1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.5f));

diff --git a/src/tesseract/objects/PlanarPolygon.java b/src/tesseract/objects/PlanarPolygon.java
index 2f75c16..b914fa2 100644
--- a/src/tesseract/objects/PlanarPolygon.java
+++ b/src/tesseract/objects/PlanarPolygon.java
@@ -7,6 +7,7 @@
 package tesseract.objects;

 

 import javax.media.j3d.Appearance;

+import javax.media.j3d.Geometry;

 import javax.media.j3d.Group;

 import javax.media.j3d.ImageComponent2D;

 import javax.media.j3d.Node;

@@ -129,6 +130,7 @@ public class PlanarPolygon extends ForceableObject {
 		appearance.setTexture(texture);

 		PolygonAttributes polyAttr = new PolygonAttributes(PolygonAttributes.POLYGON_FILL, PolygonAttributes.CULL_NONE, 0);

 		appearance.setPolygonAttributes(polyAttr);		

+		geometry.setCapability(Geometry.ALLOW_INTERSECT);

 		Shape3D polygon =  new Shape3D(geometry, appearance);

 		getTransformGroup().addChild(polygon);

 		//return getTransformGroup();