sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix for proper collision distance based on

Browse Source 
precedent.  "I had one job..."
This commit is contained in:
pspeed42 2014-07-27 21:47:55 -04:00
parent 0633c0c5bc
commit 1b0f6d0f59
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jme3-core/src/main/java/com/jme3/bounding/BoundingSphere.java
View File

@ -851,8 +851,12 @@ public class BoundingSphere extends BoundingVolume {
Vector3f p = center.add(a.add(part1.mult(u)).addLocal(part2.mult(v))); Vector3f p = center.add(a.add(part1.mult(u)).addLocal(part2.mult(v)));
CollisionResult r = new CollisionResult(); CollisionResult r = new CollisionResult();
r.setDistance((float)Math.sqrt(d) - radius); Vector3f normal = n.normalize();
r.setContactNormal(n.normalize()); float dist = -normal.dot(a); // a is center relative, so -a points to center
dist = dist - radius;
r.setDistance(dist);
r.setContactNormal(normal);
r.setContactPoint(p); r.setContactPoint(p);
results.addCollision(r); results.addCollision(r);
return 1; return 1;
@ -920,7 +924,7 @@ public class BoundingSphere extends BoundingVolume {
Vector3f cn = nearestPt.divide(-dist); Vector3f cn = nearestPt.divide(-dist);
CollisionResult r = new CollisionResult(); CollisionResult r = new CollisionResult();
r.setDistance(dist); r.setDistance(dist - radius);
r.setContactNormal(cn); r.setContactNormal(cn);
r.setContactPoint(nearestPt.add(center)); r.setContactPoint(nearestPt.add(center));
results.addCollision(r); results.addCollision(r);
@ -960,7 +964,7 @@ public class BoundingSphere extends BoundingVolume {
Vector3f cn = nearestPt.divide(-dist); Vector3f cn = nearestPt.divide(-dist);
CollisionResult r = new CollisionResult(); CollisionResult r = new CollisionResult();
r.setDistance(dist); r.setDistance(dist - radius);
r.setContactNormal(cn); r.setContactNormal(cn);
r.setContactPoint(nearestPt.add(center)); r.setContactPoint(nearestPt.add(center));
results.addCollision(r); results.addCollision(r);