sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Only apply advanced setting of angular/linear factor to rigid bodies (with angular rotation). The setting broke 'dynamic'-only objects.

Browse Source
This commit is contained in:
Erwin Coumans 2009-03-29 18:34:35 +00:00
parent d57811ada1
commit 30fa7a7286
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
View File

@ -1106,16 +1106,19 @@ void KX_ConvertBulletObject( class KX_GameObject* gameobj,
if (rbody)
{
btVector3 linearFactor(
objprop->m_lockXaxis? 0 : 1,
objprop->m_lockYaxis? 0 : 1,
objprop->m_lockZaxis? 0 : 1);
btVector3 angularFactor(
objprop->m_lockXRotaxis? 0 : 1,
objprop->m_lockYRotaxis? 0 : 1,
objprop->m_lockZRotaxis? 0 : 1);
rbody->setLinearFactor(linearFactor);
rbody->setAngularFactor(angularFactor);
if (objprop->m_angular_rigidbody)
{
btVector3 linearFactor(
objprop->m_lockXaxis? 0 : 1,
objprop->m_lockYaxis? 0 : 1,
objprop->m_lockZaxis? 0 : 1);
btVector3 angularFactor(
objprop->m_lockXRotaxis? 0 : 1,
objprop->m_lockYRotaxis? 0 : 1,
objprop->m_lockZRotaxis? 0 : 1);
rbody->setLinearFactor(linearFactor);
rbody->setAngularFactor(angularFactor);
}
if (rbody && objprop->m_disableSleeping)
{