summaryrefslogtreecommitdiff
path: root/src/tesseract/objects/Particle.java
diff options
context:
space:
mode:
authorJesse Morgan <jesse@jesterpm.net>2011-02-11 18:53:32 +0000
committerJesse Morgan <jesse@jesterpm.net>2011-02-11 18:53:32 +0000
commit354041e8d61571b25c6eeb672537a013d3e0fa60 (patch)
tree0ddd07f6fa6867148e3e8c75155c10a238ccd42c /src/tesseract/objects/Particle.java
parent39662ca98a4ea3de28d5ef4c113435d591ec471c (diff)
Broke the grabbing code but added Alden's collision code. Not sure if its working yet since my Mac doesn't like it.
Diffstat (limited to 'src/tesseract/objects/Particle.java')
-rw-r--r--src/tesseract/objects/Particle.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tesseract/objects/Particle.java b/src/tesseract/objects/Particle.java
index b2f66e4..a5b6029 100644
--- a/src/tesseract/objects/Particle.java
+++ b/src/tesseract/objects/Particle.java
@@ -15,7 +15,7 @@ import com.sun.j3d.utils.geometry.Sphere;
*
* @author Jesse Morgan
*/
-public class Particle extends ForceableObject {
+public class Particle extends PhysicalObject {
/**
* Rendered radius of particle.
*/
@@ -42,7 +42,7 @@ public class Particle extends ForceableObject {
final Color3f color) {
super(position, mass);
- getTransformGroup().addChild(createShape(color));
+ setShape(createShape(color));
}
/**
@@ -74,7 +74,7 @@ public class Particle extends ForceableObject {
cAttr = new ColoringAttributes(color, ColoringAttributes.FASTEST);
Appearance appearance = new Appearance();
appearance.setColoringAttributes(cAttr);
- return new Sphere(RADIUS, Sphere.ENABLE_GEOMETRY_PICKING,
+ return new Sphere(RADIUS, Sphere.ENABLE_GEOMETRY_PICKING | Sphere.GEOMETRY_NOT_SHARED,
DIVISIONS, appearance);
}
}