From b5010ce20754b03017516f3338cd92a45b65c9f8 Mon Sep 17 00:00:00 2001 From: "nor..67" Date: Sat, 15 Oct 2011 13:52:24 +0000 Subject: [PATCH] - commit fix to bullet RigidBody angular/linear mixup (thanks to @chototsu) git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8393 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- .../native/com_jme3_bullet_objects_PhysicsRigidBody.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/engine/src/bullet/native/com_jme3_bullet_objects_PhysicsRigidBody.cpp b/engine/src/bullet/native/com_jme3_bullet_objects_PhysicsRigidBody.cpp index e6d3933e2..4429df562 100644 --- a/engine/src/bullet/native/com_jme3_bullet_objects_PhysicsRigidBody.cpp +++ b/engine/src/bullet/native/com_jme3_bullet_objects_PhysicsRigidBody.cpp @@ -433,7 +433,7 @@ extern "C" { env->ThrowNew(newExc, "The native object does not exist."); return; } - body->setDamping(body->getLinearDamping(), value); + body->setDamping(body->getAngularDamping(), value); } /* @@ -756,7 +756,7 @@ extern "C" { env->ThrowNew(newExc, "The native object does not exist."); return; } - body->setSleepingThresholds(value, body->getAngularSleepingThreshold()); + body->setSleepingThresholds(value, body->getLinearSleepingThreshold()); } /* @@ -772,7 +772,7 @@ extern "C" { env->ThrowNew(newExc, "The native object does not exist."); return; } - body->setSleepingThresholds(body->getLinearSleepingThreshold(), value); + body->setSleepingThresholds(body->getAngularSleepingThreshold(), value); } /*