From 1ce647742cb135e8b912f9d95fdf87eff7183158 Mon Sep 17 00:00:00 2001 From: erwin coumans Date: Wed, 22 Oct 2014 14:46:48 -0700 Subject: [PATCH] fix build --- Demos3/ImportColladaDemo/ImportColladaSetup.cpp | 8 ++++---- src/BulletSoftBody/btSoftBody.cpp | 4 ++-- src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp | 2 +- src/LinearMath/btScalar.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Demos3/ImportColladaDemo/ImportColladaSetup.cpp b/Demos3/ImportColladaDemo/ImportColladaSetup.cpp index 23741c06b..14862cc19 100644 --- a/Demos3/ImportColladaDemo/ImportColladaSetup.cpp +++ b/Demos3/ImportColladaDemo/ImportColladaSetup.cpp @@ -82,7 +82,7 @@ void ImportColladaSetup::initPhysics(GraphicsPhysicsBridge& gfxBridge) btAlignedObjectArray visualShapes; btAlignedObjectArray 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); diff --git a/src/BulletSoftBody/btSoftBody.cpp b/src/BulletSoftBody/btSoftBody.cpp index 2bfd62f2a..51f4b33d0 100644 --- a/src/BulletSoftBody/btSoftBody.cpp +++ b/src/BulletSoftBody/btSoftBody.cpp @@ -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++) diff --git a/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp b/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp index 5f3593545..653d5a06b 100644 --- a/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp +++ b/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp @@ -76,7 +76,7 @@ void btSoftRigidDynamicsWorld::predictUnconstraintMotion(btScalar timeStep) btDiscreteDynamicsWorld::predictUnconstraintMotion( timeStep ); { BT_PROFILE("predictUnconstraintMotionSoftBody"); - m_softBodySolver->predictMotion( timeStep ); + m_softBodySolver->predictMotion( float(timeStep) ); } } diff --git a/src/LinearMath/btScalar.h b/src/LinearMath/btScalar.h index 3e54536c2..5ee65fc39 100644 --- a/src/LinearMath/btScalar.h +++ b/src/LinearMath/btScalar.h @@ -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