diff options
| author | Jorge Bernal <jbernalmartinez@gmail.com> | 2015-12-14 08:49:56 +0300 |
|---|---|---|
| committer | Jorge Bernal <jbernalmartinez@gmail.com> | 2015-12-14 08:56:50 +0300 |
| commit | 4510fe82aaa1e60a82726d981a9a21ee4866ec7a (patch) | |
| tree | 896e937801abfcb7a6f1ab45875df14d2cdceef7 /source/gameengine/Physics/Bullet/CcdPhysicsController.cpp | |
| parent | 94b34c9d44dea4c3f22384a76122d57aec53b6ef (diff) | |
BGE Physics clean up: double-promotion warnings
Diffstat (limited to 'source/gameengine/Physics/Bullet/CcdPhysicsController.cpp')
| -rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsController.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp index 7917f47019d..89806d80ea9 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp @@ -157,7 +157,7 @@ CcdPhysicsController::CcdPhysicsController (const CcdConstructionInfo& ci) m_savedCollisionFlags = 0; m_savedCollisionFilterGroup = 0; m_savedCollisionFilterMask = 0; - m_savedMass = 0.0; + m_savedMass = 0.0f; m_savedDyna = false; m_suspended = false; @@ -280,7 +280,7 @@ bool CcdPhysicsController::CreateSoftbody() rbci.m_friction = m_cci.m_friction; rbci.m_restitution = m_cci.m_restitution; - btVector3 p(0,0,0);// = getOrigin(); + btVector3 p(0.0f,0.0f,0.0f);// = getOrigin(); //btSoftBody* psb=btSoftBodyHelpers::CreateRope(worldInfo, btVector3(-10,0,i*0.25),btVector3(10,0,i*0.25), 16,1+2); btSoftBody* psb = 0; btSoftBodyWorldInfo& worldInfo = m_cci.m_physicsEnv->GetDynamicsWorld()->getWorldInfo(); @@ -1095,7 +1095,7 @@ void CcdPhysicsController::SuspendDynamics(bool ghost) m_savedCollisionFilterMask = handle->m_collisionFilterMask; m_suspended = true; GetPhysicsEnvironment()->UpdateCcdPhysicsController(this, - 0.0, + 0.0f, btCollisionObject::CF_STATIC_OBJECT|((ghost)?btCollisionObject::CF_NO_CONTACT_RESPONSE:(m_savedCollisionFlags&btCollisionObject::CF_NO_CONTACT_RESPONSE)), btBroadphaseProxy::StaticFilter, btBroadphaseProxy::AllFilter ^ btBroadphaseProxy::StaticFilter); @@ -1561,9 +1561,9 @@ void CcdPhysicsController::AddCompoundChild(PHY_IPhysicsController* child) rootBody->getMotionState()->getWorldTransform(rootTrans); childBody->getMotionState()->getWorldTransform(childTrans); btVector3 rootScale = rootShape->getLocalScaling(); - rootScale[0] = 1.0/rootScale[0]; - rootScale[1] = 1.0/rootScale[1]; - rootScale[2] = 1.0/rootScale[2]; + rootScale[0] = 1.0f/rootScale[0]; + rootScale[1] = 1.0f/rootScale[1]; + rootScale[2] = 1.0f/rootScale[2]; // relative scale = child_scale/parent_scale btVector3 relativeScale = childShape->getLocalScaling()*rootScale; btMatrix3x3 rootRotInverse = rootTrans.getBasis().transpose(); |