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

Bullet Native:

Browse Source 
- dont use pointers in stack (thanks to chototsu)

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7473 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
nor..67 2011-05-09 15:40:07 +00:00
parent 29df71be5b
commit 6d8b0a2b9d
4 changed files with 16 additions and 16 deletions

8
engine/src/bullet/native/com_jme3_bullet_joints_ConeJoint.cpp

@ -73,12 +73,12 @@ extern "C" {
jmeClasses::initJavaClasses(env); jmeClasses::initJavaClasses(env);
btRigidBody* bodyA = (btRigidBody*) bodyIdA; btRigidBody* bodyA = (btRigidBody*) bodyIdA;
btRigidBody* bodyB = (btRigidBody*) bodyIdB; btRigidBody* bodyB = (btRigidBody*) bodyIdB;
btMatrix3x3* mtx1 = &btMatrix3x3(); btMatrix3x3 mtx1 = btMatrix3x3();
btMatrix3x3* mtx2 = &btMatrix3x3(); btMatrix3x3 mtx2 = btMatrix3x3();
btTransform transA = btTransform(*mtx1); btTransform transA = btTransform(mtx1);
jmeBulletUtil::convert(env, pivotA, &transA.getOrigin()); jmeBulletUtil::convert(env, pivotA, &transA.getOrigin());
jmeBulletUtil::convert(env, rotA, &transA.getBasis()); jmeBulletUtil::convert(env, rotA, &transA.getBasis());
btTransform transB = btTransform(*mtx2); btTransform transB = btTransform(mtx2);
jmeBulletUtil::convert(env, pivotB, &transB.getOrigin()); jmeBulletUtil::convert(env, pivotB, &transB.getOrigin());
jmeBulletUtil::convert(env, rotB, &transB.getBasis()); jmeBulletUtil::convert(env, rotB, &transB.getBasis());
btConeTwistConstraint* joint = new btConeTwistConstraint(*bodyA, *bodyB, transA, transB); btConeTwistConstraint* joint = new btConeTwistConstraint(*bodyA, *bodyB, transA, transB);

8
engine/src/bullet/native/com_jme3_bullet_joints_Point2PointJoint.cpp

@ -117,11 +117,11 @@ extern "C" {
btRigidBody* bodyA = (btRigidBody*) bodyIdA; btRigidBody* bodyA = (btRigidBody*) bodyIdA;
btRigidBody* bodyB = (btRigidBody*) bodyIdB; btRigidBody* bodyB = (btRigidBody*) bodyIdB;
//TODO: matrix not needed? //TODO: matrix not needed?
btMatrix3x3* mtx1=&btMatrix3x3(); btMatrix3x3 mtx1=btMatrix3x3();
btMatrix3x3* mtx2=&btMatrix3x3(); btMatrix3x3 mtx2=btMatrix3x3();
btTransform transA = btTransform(*mtx1); btTransform transA = btTransform(mtx1);
jmeBulletUtil::convert(env, pivotA, &transA.getOrigin()); jmeBulletUtil::convert(env, pivotA, &transA.getOrigin());
btTransform transB = btTransform(*mtx2); btTransform transB = btTransform(mtx2);
jmeBulletUtil::convert(env, pivotB, &transB.getOrigin()); jmeBulletUtil::convert(env, pivotB, &transB.getOrigin());
btHingeConstraint* joint = new btHingeConstraint(*bodyA, *bodyB, transA, transB); btHingeConstraint* joint = new btHingeConstraint(*bodyA, *bodyB, transA, transB);
return (long) joint; return (long) joint;

8
engine/src/bullet/native/com_jme3_bullet_joints_SixDofJoint.cpp

@ -124,12 +124,12 @@ extern "C" {
jmeClasses::initJavaClasses(env); jmeClasses::initJavaClasses(env);
btRigidBody* bodyA = (btRigidBody*) bodyIdA; btRigidBody* bodyA = (btRigidBody*) bodyIdA;
btRigidBody* bodyB = (btRigidBody*) bodyIdB; btRigidBody* bodyB = (btRigidBody*) bodyIdB;
btMatrix3x3* mtx1 = &btMatrix3x3(); btMatrix3x3 mtx1 = btMatrix3x3();
btMatrix3x3* mtx2 = &btMatrix3x3(); btMatrix3x3 mtx2 = btMatrix3x3();
btTransform transA = btTransform(*mtx1); btTransform transA = btTransform(mtx1);
jmeBulletUtil::convert(env, pivotA, &transA.getOrigin()); jmeBulletUtil::convert(env, pivotA, &transA.getOrigin());
jmeBulletUtil::convert(env, rotA, &transA.getBasis()); jmeBulletUtil::convert(env, rotA, &transA.getBasis());
btTransform transB = btTransform(*mtx2); btTransform transB = btTransform(mtx2);
jmeBulletUtil::convert(env, pivotB, &transB.getOrigin()); jmeBulletUtil::convert(env, pivotB, &transB.getOrigin());
jmeBulletUtil::convert(env, rotB, &transB.getBasis()); jmeBulletUtil::convert(env, rotB, &transB.getBasis());
btGeneric6DofConstraint* joint = new btGeneric6DofConstraint(*bodyA, *bodyB, transA, transB, useLinearReferenceFrameA); btGeneric6DofConstraint* joint = new btGeneric6DofConstraint(*bodyA, *bodyB, transA, transB, useLinearReferenceFrameA);

8
engine/src/bullet/native/com_jme3_bullet_joints_SliderJoint.cpp

@ -666,12 +666,12 @@ extern "C" {
jmeClasses::initJavaClasses(env); jmeClasses::initJavaClasses(env);
btRigidBody* bodyA = (btRigidBody*) bodyIdA; btRigidBody* bodyA = (btRigidBody*) bodyIdA;
btRigidBody* bodyB = (btRigidBody*) bodyIdB; btRigidBody* bodyB = (btRigidBody*) bodyIdB;
btMatrix3x3* mtx1=&btMatrix3x3(); btMatrix3x3 mtx1=btMatrix3x3();
btMatrix3x3* mtx2=&btMatrix3x3(); btMatrix3x3 mtx2=btMatrix3x3();
btTransform transA = btTransform(*mtx1); btTransform transA = btTransform(mtx1);
jmeBulletUtil::convert(env, pivotA, &transA.getOrigin()); jmeBulletUtil::convert(env, pivotA, &transA.getOrigin());
jmeBulletUtil::convert(env, rotA, &transA.getBasis()); jmeBulletUtil::convert(env, rotA, &transA.getBasis());
btTransform transB = btTransform(*mtx2); btTransform transB = btTransform(mtx2);
jmeBulletUtil::convert(env, pivotB, &transB.getOrigin()); jmeBulletUtil::convert(env, pivotB, &transB.getOrigin());
jmeBulletUtil::convert(env, rotB, &transB.getBasis()); jmeBulletUtil::convert(env, rotB, &transB.getBasis());
btSliderConstraint* joint = new btSliderConstraint(*bodyA, *bodyB, transA, transB, useLinearReferenceFrameA); btSliderConstraint* joint = new btSliderConstraint(*bodyA, *bodyB, transA, transB, useLinearReferenceFrameA);