diff options
author | Erwin Coumans <blender@erwincoumans.com> | 2006-04-23 22:42:17 +0400 |
---|---|---|
committer | Erwin Coumans <blender@erwincoumans.com> | 2006-04-23 22:42:17 +0400 |
commit | d1c0a4e6d12b2a3b0a1708687056f5d3106f4595 (patch) | |
tree | 9c2cbbd598cc5c5da1aeb43caea953c93d5d31c5 /extern | |
parent | a26ef5887711c98d8fbd37be6871c84b9f7d5d98 (diff) |
use ContinuousConvexCollision for raycaster, fixes raycast problems
Diffstat (limited to 'extern')
-rw-r--r-- | extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp b/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp index cf9c4157475..4359eeffffe 100644 --- a/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp +++ b/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp @@ -27,6 +27,7 @@ #include "NarrowPhaseCollision/VoronoiSimplexSolver.h" #include "NarrowPhaseCollision/SubSimplexConvexCast.h" #include "NarrowPhaseCollision/GjkConvexCast.h" +#include "NarrowPhaseCollision/ContinuousConvexCollision.h" #include "CollisionDispatch/CollisionDispatcher.h" @@ -1299,8 +1300,9 @@ PHY_IPhysicsController* CcdPhysicsEnvironment::rayTest(PHY_IPhysicsController* i ConvexShape* convexShape = (ConvexShape*) body->GetCollisionShape(); VoronoiSimplexSolver simplexSolver; - SubsimplexConvexCast convexCaster(&pointShape,convexShape,&simplexSolver); + //SubsimplexConvexCast convexCaster(&pointShape,convexShape,&simplexSolver); //GjkConvexCast convexCaster(&pointShape,convexShape,&simplexSolver); + ContinuousConvexCollision convexCaster(&pointShape,convexShape,&simplexSolver,0); if (convexCaster.calcTimeOfImpact(rayFromTrans,rayToTrans,body->getCenterOfMassTransform(),body->getCenterOfMassTransform(),rayResult)) { |