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 | |
parent | 94b34c9d44dea4c3f22384a76122d57aec53b6ef (diff) |
BGE Physics clean up: double-promotion warnings
Diffstat (limited to 'source/gameengine')
4 files changed, 33 insertions, 33 deletions
diff --git a/source/gameengine/Physics/Bullet/CcdGraphicController.cpp b/source/gameengine/Physics/Bullet/CcdGraphicController.cpp index fdafc4e507d..470a5431843 100644 --- a/source/gameengine/Physics/Bullet/CcdGraphicController.cpp +++ b/source/gameengine/Physics/Bullet/CcdGraphicController.cpp @@ -86,15 +86,15 @@ void CcdGraphicController::GetAabb(btVector3& aabbMin, btVector3& aabbMax) btVector3 tmpAabbMin = m_localAabbMin * scale; btVector3 tmpAabbMax = m_localAabbMax * scale; - localAabbMin[0] = (scale.getX() >= 0.0) ? tmpAabbMin[0] : tmpAabbMax[0]; - localAabbMin[1] = (scale.getY() >= 0.0) ? tmpAabbMin[1] : tmpAabbMax[1]; - localAabbMin[2] = (scale.getZ() >= 0.0) ? tmpAabbMin[2] : tmpAabbMax[2]; - localAabbMax[0] = (scale.getX() <= 0.0) ? tmpAabbMin[0] : tmpAabbMax[0]; - localAabbMax[1] = (scale.getY() <= 0.0) ? tmpAabbMin[1] : tmpAabbMax[1]; - localAabbMax[2] = (scale.getZ() <= 0.0) ? tmpAabbMin[2] : tmpAabbMax[2]; - - btVector3 localHalfExtents = btScalar(0.5)*(localAabbMax-localAabbMin); - btVector3 localCenter = btScalar(0.5)*(localAabbMax+localAabbMin); + localAabbMin[0] = (scale.getX() >= 0.0f) ? tmpAabbMin[0] : tmpAabbMax[0]; + localAabbMin[1] = (scale.getY() >= 0.0f) ? tmpAabbMin[1] : tmpAabbMax[1]; + localAabbMin[2] = (scale.getZ() >= 0.0f) ? tmpAabbMin[2] : tmpAabbMax[2]; + localAabbMax[0] = (scale.getX() <= 0.0f) ? tmpAabbMin[0] : tmpAabbMax[0]; + localAabbMax[1] = (scale.getY() <= 0.0f) ? tmpAabbMin[1] : tmpAabbMax[1]; + localAabbMax[2] = (scale.getZ() <= 0.0f) ? tmpAabbMin[2] : tmpAabbMax[2]; + + btVector3 localHalfExtents = btScalar(0.5f)*(localAabbMax-localAabbMin); + btVector3 localCenter = btScalar(0.5f)*(localAabbMax+localAabbMin); btMatrix3x3 abs_b = rot.absolute(); btVector3 center = rot*localCenter + pos; 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(); diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.h b/source/gameengine/Physics/Bullet/CcdPhysicsController.h index a0b04736bdf..58ea5e2e390 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsController.h +++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.h @@ -72,8 +72,8 @@ public: CcdShapeConstructionInfo() : m_shapeType(PHY_SHAPE_NONE), - m_radius(1.0), - m_height(1.0), + m_radius(1.0f), + m_height(1.0f), m_halfExtend(0.f,0.f,0.f), m_childScale(1.0f,1.0f,1.0f), m_userData(NULL), diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp index 9f0fc6d9d4d..72c96668fe7 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp @@ -598,7 +598,7 @@ void CcdPhysicsEnvironment::UpdateCcdPhysicsController(CcdPhysicsController* ctr btCollisionObject* obj = ctrl->GetCollisionObject(); if (obj) { - btVector3 inertia(0.0,0.0,0.0); + btVector3 inertia(0.0f,0.0f,0.0f); m_dynamicsWorld->removeCollisionObject(obj); obj->setCollisionFlags(newCollisionFlags); if (body) @@ -861,7 +861,7 @@ void CcdPhysicsEnvironment::ProcessFhSprings(double curTime,float interval) lspot -= hit_object->getCenterOfMassPosition(); btVector3 rel_vel = cl_object->getLinearVelocity() - hit_object->getVelocityInLocalPoint(lspot); btScalar rel_vel_ray = ray_dir.dot(rel_vel); - btScalar spring_extent = 1.0 - distance / hitObjShapeProps.m_fh_distance; + btScalar spring_extent = 1.0f - distance / hitObjShapeProps.m_fh_distance; btScalar i_spring = spring_extent * hitObjShapeProps.m_fh_spring; btScalar i_damp = rel_vel_ray * hitObjShapeProps.m_fh_damping; @@ -889,7 +889,7 @@ void CcdPhysicsEnvironment::ProcessFhSprings(double curTime,float interval) if (rel_vel_lateral > SIMD_EPSILON) { btScalar friction_factor = hit_object->getFriction();//cl_object->getFriction(); - btScalar max_friction = friction_factor * btMax(btScalar(0.0), i_spring); + btScalar max_friction = friction_factor * btMax(btScalar(0.0f), i_spring); btScalar rel_mom_lateral = rel_vel_lateral / cl_object->getInvMass(); @@ -2803,7 +2803,7 @@ int CcdPhysicsEnvironment::CreateConstraint(class PHY_IPhysicsController* ctrl btTransform frameInB; btVector3 axis1(axis1X,axis1Y,axis1Z), axis2(axis2X,axis2Y,axis2Z); - if (axis1.length() == 0.0) + if (axis1.length() == 0.0f) { btPlaneSpace1( axisInA, axis1, axis2 ); } @@ -2877,7 +2877,7 @@ int CcdPhysicsEnvironment::CreateConstraint(class PHY_IPhysicsController* ctrl btTransform frameInB; btVector3 axis1(axis1X,axis1Y,axis1Z), axis2(axis2X,axis2Y,axis2Z); - if (axis1.length() == 0.0) + if (axis1.length() == 0.0f) { btPlaneSpace1( axisInA, axis1, axis2 ); } @@ -2955,7 +2955,7 @@ int CcdPhysicsEnvironment::CreateConstraint(class PHY_IPhysicsController* ctrl btTransform frameInB; btVector3 axis1(axis1X,axis1Y,axis1Z), axis2(axis2X,axis2Y,axis2Z); - if (axis1.length() == 0.0) + if (axis1.length() == 0.0f) { btPlaneSpace1( axisInA, axis1, axis2 ); } @@ -2984,7 +2984,7 @@ int CcdPhysicsEnvironment::CreateConstraint(class PHY_IPhysicsController* ctrl btTransform frameInB; btVector3 axis1(axis1X,axis1Y,axis1Z), axis2(axis2X,axis2Y,axis2Z); - if (axis1.length() == 0.0) + if (axis1.length() == 0.0f) { btPlaneSpace1( axisInA, axis1, axis2 ); } @@ -3149,7 +3149,7 @@ struct BlenderDebugDraw : public btIDebugDraw virtual void drawContactPoint(const btVector3& PointOnB,const btVector3& normalOnB,float distance,int lifeTime,const btVector3& color) { drawLine(PointOnB, PointOnB + normalOnB, color); - drawSphere(PointOnB, 0.1, color); + drawSphere(PointOnB, 0.1f, color); } virtual void setDebugMode(int debugMode) @@ -3289,7 +3289,7 @@ void CcdPhysicsEnvironment::ConvertObject(KX_GameObject *gameobj, RAS_MeshObject ci.m_margin = 0.f; ci.m_gamesoftFlag = OB_BSB_BENDING_CONSTRAINTS | OB_BSB_SHAPE_MATCHING | OB_BSB_AERO_VPOINT; - ci.m_soft_linStiff = 0.5; + ci.m_soft_linStiff = 0.5f; ci.m_soft_angStiff = 1.f; /* angular stiffness 0..1 */ ci.m_soft_volume = 1.f; /* volume preservation 0..1 */ @@ -3300,7 +3300,7 @@ void CcdPhysicsEnvironment::ConvertObject(KX_GameObject *gameobj, RAS_MeshObject ci.m_soft_kSRHR_CL = 0.1f; ci.m_soft_kSKHR_CL = 1.f; - ci.m_soft_kSSHR_CL = 0.5; + ci.m_soft_kSSHR_CL = 0.5f; ci.m_soft_kSR_SPLT_CL = 0.5f; ci.m_soft_kSK_SPLT_CL = 0.5f; @@ -3358,8 +3358,8 @@ void CcdPhysicsEnvironment::ConvertObject(KX_GameObject *gameobj, RAS_MeshObject BoundBox *bb= BKE_object_boundbox_get(blenderobject); if (bb==NULL) { - bounds_center[0] = bounds_center[1] = bounds_center[2] = 0.0; - bounds_extends[0] = bounds_extends[1] = bounds_extends[2] = 1.0; + bounds_center[0] = bounds_center[1] = bounds_center[2] = 0.0f; + bounds_extends[0] = bounds_extends[1] = bounds_extends[2] = 1.0f; } else { @@ -3398,7 +3398,7 @@ void CcdPhysicsEnvironment::ConvertObject(KX_GameObject *gameobj, RAS_MeshObject 2.f * bounds_extends[1], 2.f * bounds_extends[2]); - shapeInfo->m_halfExtend /= 2.0; + shapeInfo->m_halfExtend /= 2.0f; shapeInfo->m_halfExtend = shapeInfo->m_halfExtend.absolute(); shapeInfo->m_shapeType = PHY_SHAPE_BOX; bm = shapeInfo->CreateBulletShape(ci.m_margin); @@ -3504,9 +3504,9 @@ void CcdPhysicsEnvironment::ConvertObject(KX_GameObject *gameobj, RAS_MeshObject SG_Node* parentNode = parent->GetSGNode(); // relative transform MT_Vector3 parentScale = parentNode->GetWorldScaling(); - parentScale[0] = MT_Scalar(1.0)/parentScale[0]; - parentScale[1] = MT_Scalar(1.0)/parentScale[1]; - parentScale[2] = MT_Scalar(1.0)/parentScale[2]; + parentScale[0] = MT_Scalar(1.0f)/parentScale[0]; + parentScale[1] = MT_Scalar(1.0f)/parentScale[1]; + parentScale[2] = MT_Scalar(1.0f)/parentScale[2]; MT_Vector3 relativeScale = gameNode->GetWorldScaling() * parentScale; MT_Matrix3x3 parentInvRot = parentNode->GetWorldOrientation().transposed(); MT_Vector3 relativePos = parentInvRot*((gameNode->GetWorldPosition()-parentNode->GetWorldPosition())*parentScale); |