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

Merge pull request #510 from bertleft/master

Browse Source 
Bugfix: Native Point2PointJoint.createJoint() incorrectly allocates btHingeConstraint
This commit is contained in:
empirephoenix 2016-07-26 16:38:17 +02:00 committed by GitHub
commit 46891b32c6
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jme3-bullet-native/src/native/cpp/com_jme3_bullet_joints_Point2PointJoint.cpp
View File

@ -146,14 +146,11 @@ extern "C" {
jmeClasses::initJavaClasses(env); jmeClasses::initJavaClasses(env);
btRigidBody* bodyA = reinterpret_cast<btRigidBody*>(bodyIdA); btRigidBody* bodyA = reinterpret_cast<btRigidBody*>(bodyIdA);
btRigidBody* bodyB = reinterpret_cast<btRigidBody*>(bodyIdB); btRigidBody* bodyB = reinterpret_cast<btRigidBody*>(bodyIdB);
//TODO: matrix not needed? btVector3 pivotAIn;
btMatrix3x3 mtx1 = btMatrix3x3(); btVector3 pivotBIn;
btMatrix3x3 mtx2 = btMatrix3x3(); jmeBulletUtil::convert(env, pivotA, &pivotAIn);
btTransform transA = btTransform(mtx1); jmeBulletUtil::convert(env, pivotB, &pivotBIn);
jmeBulletUtil::convert(env, pivotA, &transA.getOrigin()); btPoint2PointConstraint * joint = new btPoint2PointConstraint(*bodyA, *bodyB, pivotAIn, pivotBIn);
btTransform transB = btTransform(mtx2);
jmeBulletUtil::convert(env, pivotB, &transB.getOrigin());
btHingeConstraint* joint = new btHingeConstraint(*bodyA, *bodyB, transA, transB);
return reinterpret_cast<jlong>(joint); return reinterpret_cast<jlong>(joint);
} }