OSDN Git Service

- commit fix to bullet RigidBody angular/linear mixup (thanks to @chototsu)
authornormen667 <normen667@75d07b2b-3a1a-0410-a2c5-0572b91ccdca>
Sat, 15 Oct 2011 13:52:24 +0000 (13:52 +0000)
committernormen667 <normen667@75d07b2b-3a1a-0410-a2c5-0572b91ccdca>
Sat, 15 Oct 2011 13:52:24 +0000 (13:52 +0000)
git-svn-id: http://jmonkeyengine.googlecode.com/svn/trunk@8393 75d07b2b-3a1a-0410-a2c5-0572b91ccdca

engine/src/bullet/native/com_jme3_bullet_objects_PhysicsRigidBody.cpp

index e6d3933..4429df5 100644 (file)
@@ -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);
     }
 
     /*