- merge changes to native bullet
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8144 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
parent
93326d1285
commit
31e151fec1
@ -165,7 +165,7 @@ public class KinematicRagdollControl implements PhysicsControl, PhysicsCollision
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
TempVars vars = TempVars.get();
|
TempVars vars = TempVars.get();
|
||||||
|
|
||||||
Quaternion tmpRot1 = vars.quat1;
|
Quaternion tmpRot1 = vars.quat1;
|
||||||
Quaternion tmpRot2 = vars.quat2;
|
Quaternion tmpRot2 = vars.quat2;
|
||||||
|
|
||||||
@ -660,7 +660,7 @@ public class KinematicRagdollControl implements PhysicsControl, PhysicsCollision
|
|||||||
}
|
}
|
||||||
|
|
||||||
//dispatching the event if the ragdoll has been hit
|
//dispatching the event if the ragdoll has been hit
|
||||||
if (hit) {
|
if (hit && listeners != null) {
|
||||||
for (RagdollCollisionListener listener : listeners) {
|
for (RagdollCollisionListener listener : listeners) {
|
||||||
listener.collide(hitBone, hitObject, event);
|
listener.collide(hitBone, hitObject, event);
|
||||||
}
|
}
|
||||||
@ -681,7 +681,8 @@ public class KinematicRagdollControl implements PhysicsControl, PhysicsCollision
|
|||||||
animControl.setEnabled(mode == Mode.Kinetmatic);
|
animControl.setEnabled(mode == Mode.Kinetmatic);
|
||||||
|
|
||||||
baseRigidBody.setKinematic(mode == Mode.Kinetmatic);
|
baseRigidBody.setKinematic(mode == Mode.Kinetmatic);
|
||||||
TempVars vars = TempVars.get();
|
TempVars vars = TempVars.get();
|
||||||
|
|
||||||
for (PhysicsBoneLink link : boneLinks.values()) {
|
for (PhysicsBoneLink link : boneLinks.values()) {
|
||||||
link.rigidBody.setKinematic(mode == Mode.Kinetmatic);
|
link.rigidBody.setKinematic(mode == Mode.Kinetmatic);
|
||||||
if (mode == Mode.Ragdoll) {
|
if (mode == Mode.Ragdoll) {
|
||||||
@ -715,8 +716,7 @@ public class KinematicRagdollControl implements PhysicsControl, PhysicsCollision
|
|||||||
animControl.setEnabled(true);
|
animControl.setEnabled(true);
|
||||||
|
|
||||||
|
|
||||||
|
TempVars vars = TempVars.get();
|
||||||
TempVars vars = TempVars.get();
|
|
||||||
for (PhysicsBoneLink link : boneLinks.values()) {
|
for (PhysicsBoneLink link : boneLinks.values()) {
|
||||||
|
|
||||||
Vector3f p = link.rigidBody.getMotionState().getWorldLocation();
|
Vector3f p = link.rigidBody.getMotionState().getWorldLocation();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user