Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update serialization structures

Browse Source
This commit is contained in:
erwin.coumans
2013-09-14 06:22:22 +00:00
parent 1aac33f6b6
commit e22a11c021
5 changed files with 656 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Extras/Serialize/BulletWorldImporter/btWorldImporter.cpp
View File

@@ -687,18 +687,18 @@ void btWorldImporter::convertConstraintBackwardsCompatible281(btTypedConstraintD
}
case SLIDER_CONSTRAINT_TYPE:
{
btSliderConstraintDoubleData* sliderData = (btSliderConstraintDoubleData*)constraintData;
btSliderConstraintData* sliderData = (btSliderConstraintData*)constraintData;
btSliderConstraint* slider = 0;
if (rbA&& rbB)
{
btTransform rbAFrame,rbBFrame;
rbAFrame.deSerializeDouble(sliderData->m_rbAFrame);
rbBFrame.deSerializeDouble(sliderData->m_rbBFrame);
rbAFrame.deSerializeFloat(sliderData->m_rbAFrame);
rbBFrame.deSerializeFloat(sliderData->m_rbBFrame);
slider = createSliderConstraint(*rbA,*rbB,rbAFrame,rbBFrame,sliderData->m_useLinearReferenceFrameA!=0);
} else
{
btTransform rbBFrame;
rbBFrame.deSerializeDouble(sliderData->m_rbBFrame);
rbBFrame.deSerializeFloat(sliderData->m_rbBFrame);
slider = createSliderConstraint(*rbB,rbBFrame,sliderData->m_useLinearReferenceFrameA!=0);
}
slider->setLowerLinLimit((btScalar)sliderData->m_linearLowerLimit);
@@ -905,7 +905,7 @@ void btWorldImporter::convertConstraintFloat(btTypedConstraintFloatData* constra
}
case SLIDER_CONSTRAINT_TYPE:
{
btSliderConstraintData* sliderData = (btSliderConstraintData*)constraintData;
btSliderConstraintFloatData* sliderData = (btSliderConstraintFloatData*)constraintData;
btSliderConstraint* slider = 0;
if (rbA&& rbB)
{