From 8e8d612a7ae753ba3affb2afaa49d6fac5eac07a Mon Sep 17 00:00:00 2001 From: "nor..67" Date: Sat, 15 Oct 2011 19:42:43 +0000 Subject: [PATCH] - bullet native: fix two variables from temprorary git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8397 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- .../native/com_jme3_bullet_joints_SixDofSpringJoint.cpp | 9 --------- .../native/com_jme3_bullet_objects_PhysicsVehicle.cpp | 3 ++- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/engine/src/bullet/native/com_jme3_bullet_joints_SixDofSpringJoint.cpp b/engine/src/bullet/native/com_jme3_bullet_joints_SixDofSpringJoint.cpp index 282b400f9..391b06b93 100644 --- a/engine/src/bullet/native/com_jme3_bullet_joints_SixDofSpringJoint.cpp +++ b/engine/src/bullet/native/com_jme3_bullet_joints_SixDofSpringJoint.cpp @@ -78,15 +78,6 @@ JNIEXPORT jlong JNICALL Java_com_jme3_bullet_joints_SixDofSpringJoint_createJoin jmeClasses::initJavaClasses(env); btRigidBody* bodyA = (btRigidBody*) bodyIdA; btRigidBody* bodyB = (btRigidBody*) bodyIdB; - btMatrix3x3* mtx1 = &btMatrix3x3(); - btMatrix3x3* mtx2 = &btMatrix3x3(); -/* btTransform* transA = &btTransform(*mtx1); - jmeBulletUtil::convert(env, pivotA, &transA->getOrigin()); - jmeBulletUtil::convert(env, rotA, &transA->getBasis()); - btTransform* transB = &btTransform(*mtx2); - jmeBulletUtil::convert(env, pivotB, &transB->getOrigin()); - jmeBulletUtil::convert(env, rotB, &transB->getBasis()); -*/ btTransform transA; jmeBulletUtil::convert(env, pivotA, &transA.getOrigin()); jmeBulletUtil::convert(env, rotA, &transA.getBasis()); diff --git a/engine/src/bullet/native/com_jme3_bullet_objects_PhysicsVehicle.cpp b/engine/src/bullet/native/com_jme3_bullet_objects_PhysicsVehicle.cpp index 2c52ca90f..db4a54bb7 100644 --- a/engine/src/bullet/native/com_jme3_bullet_objects_PhysicsVehicle.cpp +++ b/engine/src/bullet/native/com_jme3_bullet_objects_PhysicsVehicle.cpp @@ -231,7 +231,8 @@ extern "C" { env->ThrowNew(newExc, "The native object does not exist."); return; } - jmeBulletUtil::convert(env, &vehicle->getForwardVector(), out); + btVector3 forwardVector = vehicle->getForwardVector(); + jmeBulletUtil::convert(env, &forwardVector, out); } /*