Merge pull request #491 from riccardobl/AddGimpactCollisionAlgo

Fix GImpact passing through other shapes.
cleanup_build_scripts
Kirill Vainer 9 years ago
parent d27b26805a
commit 4faf6cf36c
  1. 2
      jme3-bullet-native/src/native/cpp/jmePhysicsSpace.cpp
  2. 1
      jme3-bullet-native/src/native/cpp/jmePhysicsSpace.h

@ -147,6 +147,8 @@ void jmePhysicsSpace::createPhysicsSpace(jfloat minX, jfloat minY, jfloat minZ,
} else { } else {
dispatcher = new btCollisionDispatcher(collisionConfiguration); dispatcher = new btCollisionDispatcher(collisionConfiguration);
} }
btGImpactCollisionAlgorithm::registerAlgorithm(dispatcher);
// the default constraint solver. For parallel processing you can use a different solver (see Extras/BulletMultiThreaded) // the default constraint solver. For parallel processing you can use a different solver (see Extras/BulletMultiThreaded)
if (threading) { if (threading) {

@ -48,6 +48,7 @@
#include "BulletCollision/CollisionDispatch/btSimulationIslandManager.h" #include "BulletCollision/CollisionDispatch/btSimulationIslandManager.h"
#include "BulletCollision/NarrowPhaseCollision/btManifoldPoint.h" #include "BulletCollision/NarrowPhaseCollision/btManifoldPoint.h"
#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h" #include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
#include "BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h"
/** /**
* Author: Normen Hansen * Author: Normen Hansen

Loading…
Cancel
Save