AuroraMiddleware/bullet3
1
0
Fork 0
mirror of https://github.com/bulletphysics/bullet3 synced 2025-01-19 05:20:06 +00:00
Code Issues Releases Wiki Activity

Merge pull request #275 from erwincoumans/master

Browse Source 
fix build
This commit is contained in:
erwincoumans 2014-10-22 14:47:53 -07:00
commit 0160512a01
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Demos3/ImportColladaDemo/ImportColladaSetup.cpp
View File

@ -82,7 +82,7 @@ void ImportColladaSetup::initPhysics(GraphicsPhysicsBridge& gfxBridge)
btAlignedObjectArray<GLInstanceGraphicsShape> visualShapes;
btAlignedObjectArray<ColladaGraphicsInstance> visualShapeInstances;
btScalar unitMeterScaling(1);
float unitMeterScaling(1);
btTransform upAxisTrans;
upAxisTrans.setIdentity();
@ -140,9 +140,9 @@ void ImportColladaSetup::initPhysics(GraphicsPhysicsBridge& gfxBridge)
{
btVector3 pos(verts[v].xyzw[0],verts[v].xyzw[1],verts[v].xyzw[2]);
pos = worldMat*pos;
verts[v].xyzw[0] = pos[0];
verts[v].xyzw[1] = pos[1];
verts[v].xyzw[2] = pos[2];
verts[v].xyzw[0] = float(pos[0]);
verts[v].xyzw[1] = float(pos[1]);
verts[v].xyzw[2] = float(pos[2]);
}
int shapeId = m_app->m_renderer->registerShape(&verts[0].xyzw[0], gfxShape->m_numvertices, &gfxShape->m_indices->at(0), gfxShape->m_numIndices);

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