bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

BGE fix: complement to recent patch for Rigid Body Constraint. patch by Juha Mäki-Kanto (kanttori)

Browse Source
This commit is contained in:
Dalai Felinto 2011-02-28 20:22:28 +00:00
parent fa42cf671a
commit 12f77ddb9e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/gameengine/Converter/BL_BlenderDataConversion.cpp
View File

@ -2658,8 +2658,7 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
for (dof=3;dof<6;dof++)
{
// flag only applies to angular limit x
if(dof != 3 || dat->flag & dofbit)
if(dat->flag & dofbit)
{
kxscene->GetPhysicsEnvironment()->setConstraintParam(constraintId,dof,dat->minLimit[dof],dat->maxLimit[dof]);
}

5
source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
View File

@ -2001,7 +2001,10 @@ void CcdPhysicsEnvironment::setConstraintParam(int constraintId,int param,float
{
//param = 3,4,5 are constraint limits, high limit values
btConeTwistConstraint* coneTwist = (btConeTwistConstraint*)typedConstraint;
coneTwist->setLimit(param,value1);
if(value1<0.0f)
coneTwist->setLimit(param,btScalar(BT_LARGE_FLOAT));
else
coneTwist->setLimit(param,value1);
break;
}
default: