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

fix issue #1029, integrate PR #1031

Browse Source 
* Use gContactStartedCallback instead of gContactProcessedCallback to detect collision events. ( fix for #1029 )

* Fix  Conversion loses qualifiers
This commit is contained in:
Riccardo Balbo 2019-03-04 23:01:08 +01:00 committed by Stephen Gold
parent 7e6fa03009
commit 2bbf784c96
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,8 +150,8 @@ void jmePhysicsSpace::createPhysicsSpace(jfloat minX, jfloat minY, jfloat minZ,
dynamicsWorld->getPairCache()->setOverlapFilterCallback(new jmeFilterCallback()); dynamicsWorld->getPairCache()->setOverlapFilterCallback(new jmeFilterCallback());
dynamicsWorld->setInternalTickCallback(&jmePhysicsSpace::preTickCallback, static_cast<void *> (this), true); dynamicsWorld->setInternalTickCallback(&jmePhysicsSpace::preTickCallback, static_cast<void *> (this), true);
dynamicsWorld->setInternalTickCallback(&jmePhysicsSpace::postTickCallback, static_cast<void *> (this)); dynamicsWorld->setInternalTickCallback(&jmePhysicsSpace::postTickCallback, static_cast<void *> (this));
if (gContactProcessedCallback == NULL) { if (gContactStartedCallback == NULL) {
gContactProcessedCallback = &jmePhysicsSpace::contactProcessedCallback; gContactStartedCallback = &jmePhysicsSpace::contactStartedCallback;
} }
} }
@ -183,11 +183,10 @@ void jmePhysicsSpace::postTickCallback(btDynamicsWorld *world, btScalar timeStep
} }
} }
bool jmePhysicsSpace::contactProcessedCallback(btManifoldPoint &cp, void *body0, void *body1) { void jmePhysicsSpace::contactStartedCallback(btPersistentManifold* const &pm) {
// printf("contactProcessedCallback %d %dn", body0, body1); const btCollisionObject* co0 = pm->getBody0();
btCollisionObject* co0 = (btCollisionObject*) body0; const btCollisionObject* co1 = pm->getBody1();
jmeUserPointer *up0 = (jmeUserPointer*) co0 -> getUserPointer(); jmeUserPointer *up0 = (jmeUserPointer*) co0 -> getUserPointer();
btCollisionObject* co1 = (btCollisionObject*) body1;
jmeUserPointer *up1 = (jmeUserPointer*) co1 -> getUserPointer(); jmeUserPointer *up1 = (jmeUserPointer*) co1 -> getUserPointer();
if (up0 != NULL) { if (up0 != NULL) {
jmePhysicsSpace *dynamicsWorld = (jmePhysicsSpace *)up0->space; jmePhysicsSpace *dynamicsWorld = (jmePhysicsSpace *)up0->space;
@ -197,18 +196,18 @@ bool jmePhysicsSpace::contactProcessedCallback(btManifoldPoint &cp, void *body0,
if (javaPhysicsSpace != NULL) { if (javaPhysicsSpace != NULL) {
jobject javaCollisionObject0 = env->NewLocalRef(up0->javaCollisionObject); jobject javaCollisionObject0 = env->NewLocalRef(up0->javaCollisionObject);
jobject javaCollisionObject1 = env->NewLocalRef(up1->javaCollisionObject); jobject javaCollisionObject1 = env->NewLocalRef(up1->javaCollisionObject);
env->CallVoidMethod(javaPhysicsSpace, jmeClasses::PhysicsSpace_addCollisionEvent, javaCollisionObject0, javaCollisionObject1, (jlong) & cp); for(int i=0;i<pm->getNumContacts();i++){
env->CallVoidMethod(javaPhysicsSpace, jmeClasses::PhysicsSpace_addCollisionEvent, javaCollisionObject0, javaCollisionObject1, (jlong) & pm->getContactPoint(i));
if (env->ExceptionCheck()) {
env->Throw(env->ExceptionOccurred());
}
}
env->DeleteLocalRef(javaPhysicsSpace); env->DeleteLocalRef(javaPhysicsSpace);
env->DeleteLocalRef(javaCollisionObject0); env->DeleteLocalRef(javaCollisionObject0);
env->DeleteLocalRef(javaCollisionObject1); env->DeleteLocalRef(javaCollisionObject1);
if (env->ExceptionCheck()) {
env->Throw(env->ExceptionOccurred());
return true;
} }
} }
} }
}
return true;
} }
btDynamicsWorld* jmePhysicsSpace::getDynamicsWorld() { btDynamicsWorld* jmePhysicsSpace::getDynamicsWorld() {

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

@ -62,5 +62,5 @@ public:
JNIEnv* getEnv(); JNIEnv* getEnv();
static void preTickCallback(btDynamicsWorld*, btScalar); static void preTickCallback(btDynamicsWorld*, btScalar);
static void postTickCallback(btDynamicsWorld*, btScalar); static void postTickCallback(btDynamicsWorld*, btScalar);
static bool contactProcessedCallback(btManifoldPoint &, void *, void *); static void contactStartedCallback(btPersistentManifold* const &);
}; };