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

Merge pull request #491 from riccardobl/AddGimpactCollisionAlgo

Browse Source 
Fix GImpact passing through other shapes.
This commit is contained in:
Kirill Vainer 2016-05-04 13:50:47 -04:00
commit 3078f2ad22
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jme3-bullet-native/src/native/cpp/jmePhysicsSpace.cpp
View File

@ -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) {

1
jme3-bullet-native/src/native/cpp/jmePhysicsSpace.h
View File

@ -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