Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorge Bernal <jbernalmartinez@gmail.com>2015-12-16 03:31:38 +0300
committerJorge Bernal <jbernalmartinez@gmail.com>2015-12-16 03:53:48 +0300
commit0c19a043e8198018ae794145fc4f1e78d5f00923 (patch)
tree3758688cd3639adcd50b0ce298bdf758b890e4f9 /source/gameengine/Ketsji/KX_ObjectActuator.cpp
parent5b331150709616fc5aee9c1af228d48175032ea0 (diff)
BGE Ketsji clean-up: double-promotion warnings
Diffstat (limited to 'source/gameengine/Ketsji/KX_ObjectActuator.cpp')
-rw-r--r--source/gameengine/Ketsji/KX_ObjectActuator.cpp32
1 files changed, 16 insertions, 16 deletions
diff --git a/source/gameengine/Ketsji/KX_ObjectActuator.cpp b/source/gameengine/Ketsji/KX_ObjectActuator.cpp
index 762148d8f76..87c2592ecfd 100644
--- a/source/gameengine/Ketsji/KX_ObjectActuator.cpp
+++ b/source/gameengine/Ketsji/KX_ObjectActuator.cpp
@@ -65,12 +65,12 @@ KX_ObjectActuator(
m_drot(drot),
m_linear_velocity(linV),
m_angular_velocity(angV),
- m_linear_length2(0.0),
- m_current_linear_factor(0.0),
- m_current_angular_factor(0.0),
+ m_linear_length2(0.0f),
+ m_current_linear_factor(0.0f),
+ m_current_angular_factor(0.0f),
m_damping(damping),
- m_previous_error(0.0,0.0,0.0),
- m_error_accumulator(0.0,0.0,0.0),
+ m_previous_error(0.0f,0.0f,0.0f),
+ m_error_accumulator(0.0f,0.0f,0.0f),
m_bitLocalFlag (flag),
m_reference(refobj),
m_active_combined_velocity (false),
@@ -134,13 +134,13 @@ bool KX_ObjectActuator::Update()
// Explicitly stop the movement if we're using character motion
if (m_bitLocalFlag.CharacterMotion) {
- character->SetWalkDirection(MT_Vector3 (0.0, 0.0, 0.0));
+ character->SetWalkDirection(MT_Vector3 (0.0f, 0.0f, 0.0f));
}
m_linear_damping_active = false;
m_angular_damping_active = false;
- m_error_accumulator.setValue(0.0,0.0,0.0);
- m_previous_error.setValue(0.0,0.0,0.0);
+ m_error_accumulator.setValue(0.0f,0.0f,0.0f);
+ m_previous_error.setValue(0.0f,0.0f,0.0f);
m_jumping = false;
return false;
@@ -299,10 +299,10 @@ bool KX_ObjectActuator::Update()
m_current_linear_factor = linV.dot(m_linear_velocity)/m_linear_length2;
m_linear_damping_active = true;
}
- if (m_current_linear_factor < 1.0)
- m_current_linear_factor += 1.0/m_damping;
- if (m_current_linear_factor > 1.0)
- m_current_linear_factor = 1.0;
+ if (m_current_linear_factor < 1.0f)
+ m_current_linear_factor += 1.0f/m_damping;
+ if (m_current_linear_factor > 1.0f)
+ m_current_linear_factor = 1.0f;
linV = m_current_linear_factor * m_linear_velocity;
parent->setLinearVelocity(linV,(m_bitLocalFlag.LinearVelocity) != 0);
} else {
@@ -327,10 +327,10 @@ bool KX_ObjectActuator::Update()
m_current_angular_factor = angV.dot(m_angular_velocity)/m_angular_length2;
m_angular_damping_active = true;
}
- if (m_current_angular_factor < 1.0)
- m_current_angular_factor += 1.0/m_damping;
- if (m_current_angular_factor > 1.0)
- m_current_angular_factor = 1.0;
+ if (m_current_angular_factor < 1.0f)
+ m_current_angular_factor += 1.0f/m_damping;
+ if (m_current_angular_factor > 1.0f)
+ m_current_angular_factor = 1.0f;
angV = m_current_angular_factor * m_angular_velocity;
parent->setAngularVelocity(angV,(m_bitLocalFlag.AngularVelocity) != 0);
} else {