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

fix build

Browse Source
This commit is contained in:
erwin coumans
2014-10-22 14:46:48 -07:00
parent 579b34d2e0
commit 1ce647742c
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/BulletSoftBody/btSoftBody.cpp
View File

@@ -3605,8 +3605,8 @@ const char* btSoftBody::serialize(void* dataBuffer, class btSerializer* serializ
m_joints[i]->m_refs[0].serializeFloat(memPtr->m_refs[0]);
m_joints[i]->m_refs[1].serializeFloat(memPtr->m_refs[1]);
memPtr->m_cfm = m_joints[i]->m_cfm;
memPtr->m_erp = m_joints[i]->m_erp;
memPtr->m_split = m_joints[i]->m_split;
memPtr->m_erp = float(m_joints[i]->m_erp);
memPtr->m_split = float(m_joints[i]->m_split);
memPtr->m_delete = m_joints[i]->m_delete;
for (int j=0;j<4;j++)

2
src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
View File

@@ -76,7 +76,7 @@ void btSoftRigidDynamicsWorld::predictUnconstraintMotion(btScalar timeStep)
btDiscreteDynamicsWorld::predictUnconstraintMotion( timeStep );
{
BT_PROFILE("predictUnconstraintMotionSoftBody");
m_softBodySolver->predictMotion( timeStep );
m_softBodySolver->predictMotion( float(timeStep) );
}
}

2
src/LinearMath/btScalar.h
View File

@@ -358,7 +358,7 @@ inline __m128 operator * (const __m128 A, const __m128 B)
#define BT_INFINITY (btInfinityMask.mask)
inline int btGetInfinityMask()//suppress stupid compiler warning
{
return btInfinityMask.mask;
return btInfinityMask.intmask;
}
#endif
#endif//BT_USE_NEON