Commit: fc5f717888f11caaa9cd246e2131a3892c81fbd1
Author: Porteries Tristan
Date: Thu Oct 29 15:13:04 2015 +0100
Branches: master
https://developer.blender.org/rBfc5f717888f11caaa9cd246e2131a3892c81fbd1
BGE: Cleanup KX_IPO_SGCOntroller.
- Add spaces around operators.
- Replace !(a == b) by a != b
- Add "f" at end of float value.
- Remove extras lines in fonctions declaration.
- Remove indentation to align attributes definition.
===================================================================
M source/gameengine/Ketsji/KX_IPO_SGController.cpp
M source/gameengine/Ketsji/KX_IPO_SGController.h
===================================================================
diff --git a/source/gameengine/Ketsji/KX_IPO_SGController.cpp
b/source/gameengine/Ketsji/KX_IPO_SGController.cpp
index f756336..0ce39e4 100644
--- a/source/gameengine/Ketsji/KX_IPO_SGController.cpp
+++ b/source/gameengine/Ketsji/KX_IPO_SGController.cpp
@@ -61,18 +61,16 @@ KX_IpoSGController::KX_IpoSGController()
m_modified(true),
m_ipotime(1.0),
m_ipo_start_initialized(false),
- m_ipo_start_euler(0.0,0.0,0.0),
+ m_ipo_start_euler(0.0f, 0.0f, 0.0f),
m_ipo_euler_initialized(false)
{
m_game_object = NULL;
- for (int i=0; i < KX_MAX_IPO_CHANNELS; i++)
+ for (int i = 0; i < KX_MAX_IPO_CHANNELS; i++)
m_ipo_channels_active[i] = false;
}
-void KX_IpoSGController::SetOption(
- int option,
- int value)
+void KX_IpoSGController::SetOption(int option, int value)
{
switch (option) {
case SG_CONTR_IPO_IPO_AS_FORCE:
@@ -93,7 +91,8 @@ void KX_IpoSGController::SetOption(
if (value/* && ((SG_Node*)m_pObject)->GetSGParent() == NULL*/) {
// only accept local Ipo if the object has no parent
m_ipo_local = true;
- } else {
+ }
+ else {
m_ipo_local = false;
}
m_modified = true;
@@ -103,38 +102,29 @@ void KX_IpoSGController::SetOption(
}
}
- void
-KX_IpoSGController::UpdateSumoReference(
- )
+void KX_IpoSGController::UpdateSumoReference()
{
if (m_game_object) {
-
}
}
- void
-KX_IpoSGController::SetGameObject(
- KX_GameObject* go
- )
+void KX_IpoSGController::SetGameObject(KX_GameObject *go)
{
m_game_object = go;
}
-
-
bool KX_IpoSGController::Update(double currentTime)
{
- if (m_modified)
- {
+ if (m_modified) {
T_InterpolatorList::iterator i;
- for (i = m_interpolators.begin(); !(i ==
m_interpolators.end()); ++i) {
+ for (i = m_interpolators.begin(); i != m_interpolators.end();
++i) {
(*i)->Execute(m_ipotime);//currentTime);
}
-
- SG_Spatial* ob = (SG_Spatial*)m_pObject;
+
+ SG_Spatial *ob = (SG_Spatial *)m_pObject;
//initialization on the first frame of the IPO
- if (! m_ipo_start_initialized && currentTime != 0.0) {
+ if (!m_ipo_start_initialized && currentTime != 0.0f) {
m_ipo_start_point = ob->GetLocalPosition();
m_ipo_start_orient = ob->GetLocalOrientation();
m_ipo_start_scale = ob->GetLocalScale();
@@ -150,22 +140,19 @@ bool KX_IpoSGController::Update(double currentTime)
if (m_ipo_channels_active[OB_LOC_X] ||
m_ipo_channels_active[OB_LOC_Y] || m_ipo_channels_active[OB_LOC_Z] ||
m_ipo_channels_active[OB_DLOC_X] ||
m_ipo_channels_active[OB_DLOC_Y] || m_ipo_channels_active[OB_DLOC_Z])
{
- if (m_ipo_as_force == true)
- {
- if (m_game_object && ob &&
m_game_object->GetPhysicsController())
- {
+ if (m_ipo_as_force == true) {
+ if (m_game_object && ob &&
m_game_object->GetPhysicsController()) {
MT_Vector3 vec = m_ipo_local ?
ob->GetWorldOrientation() * m_ipo_xform.GetPosition() :
m_ipo_xform.GetPosition();
m_game_object->GetPhysicsController()->ApplyForce(vec, false);
}
}
- else
- {
+ else {
// Local ipo should be defined with the object
position at (0,0,0)
// Local transform is applied to the object
based on initial position
- MT_Point3 newPosition(0.0,0.0,0.0);
-
+ MT_Point3 newPosition(0.0f, 0.0f, 0.0f);
+
if (!m_ipo_add)
newPosition = ob->GetLocalPosition();
//apply separate IPO channels if there is any
data in them
@@ -175,21 +162,21 @@ bool KX_IpoSGController::Update(double currentTime)
newPosition[0] =
(m_ipo_channels_active[OB_DLOC_X] ? m_ipo_xform.GetPosition()[0] +
m_ipo_xform.GetDeltaPosition()[0] : m_ipo_xform.GetPosition()[0]);
}
else if (m_ipo_channels_active[OB_DLOC_X] &&
m_ipo_start_initialized) {
- newPosition[0] =
(((!m_ipo_add)?m_ipo_start_point[0]:0.0) + m_ipo_xform.GetDeltaPosition()[0]);
+ newPosition[0] = (((!m_ipo_add) ?
m_ipo_start_point[0] : 0.0f) + m_ipo_xform.GetDeltaPosition()[0]);
}
//LocY and dLocY
if (m_ipo_channels_active[OB_LOC_Y]) {
newPosition[1] =
(m_ipo_channels_active[OB_DLOC_Y] ? m_ipo_xform.GetPosition()[1] +
m_ipo_xform.GetDeltaPosition()[1] : m_ipo_xform.GetPosition()[1]);
}
else if (m_ipo_channels_active[OB_DLOC_Y] &&
m_ipo_start_initialized) {
- newPosition[1] =
(((!m_ipo_add)?m_ipo_start_point[1]:0.0) + m_ipo_xform.GetDeltaPosition()[1]);
+ newPosition[1] = (((!m_ipo_add) ?
m_ipo_start_point[1] : 0.0f) + m_ipo_xform.GetDeltaPosition()[1]);
}
//LocZ and dLocZ
if (m_ipo_channels_active[OB_LOC_Z]) {
newPosition[2] =
(m_ipo_channels_active[OB_DLOC_Z] ? m_ipo_xform.GetPosition()[2] +
m_ipo_xform.GetDeltaPosition()[2] : m_ipo_xform.GetPosition()[2]);
}
else if (m_ipo_channels_active[OB_DLOC_Z] &&
m_ipo_start_initialized) {
- newPosition[2] =
(((!m_ipo_add)?m_ipo_start_point[2]:0.0) + m_ipo_xform.GetDeltaPosition()[2]);
+ newPosition[2] = (((!m_ipo_add) ?
m_ipo_start_point[2] : 0.0f) + m_ipo_xform.GetDeltaPosition()[2]);
}
if (m_ipo_add) {
if (m_ipo_local)
@@ -206,15 +193,15 @@ bool KX_IpoSGController::Update(double currentTime)
m_ipo_channels_active[OB_DROT_X] ||
m_ipo_channels_active[OB_DROT_Y] || m_ipo_channels_active[OB_DROT_Z])
{
if (m_ipo_as_force) {
-
if (m_game_object && ob) {
m_game_object->ApplyTorque(m_ipo_local ?
ob->GetWorldOrientation() *
m_ipo_xform.GetEulerAngles() :
m_ipo_xform.GetEulerAngles(),
false);
}
- } else if (m_ipo_add) {
+ }
+ else if (m_ipo_add) {
if (m_ipo_start_initialized) {
- double yaw=0, pitch=0, roll=0; //delta
Euler angles
+ double yaw = 0.0, pitch = 0.0, roll =
0.0; //delta Euler angles
//RotX and dRotX
if (m_ipo_channels_active[OB_ROT_X])
@@ -227,7 +214,7 @@ bool KX_IpoSGController::Update(double currentTime)
pitch +=
m_ipo_xform.GetEulerAngles()[1];
if (m_ipo_channels_active[OB_DROT_Y])
pitch +=
m_ipo_xform.GetDeltaEulerAngles()[1];
-
+
//RotZ and dRotZ
if (m_ipo_channels_active[OB_ROT_Z])
roll +=
m_ipo_xform.GetEulerAngles()[2];
@@ -242,12 +229,13 @@ bool KX_IpoSGController::Update(double currentTime)
if (m_game_object)
m_game_object->NodeSetLocalOrientation(rotation);
}
- } else if (m_ipo_channels_active[OB_ROT_X] ||
m_ipo_channels_active[OB_ROT_Y] || m_ipo_channels_active[OB_ROT_Z]) {
+ }
+ else if (m_ipo_channels_active[OB_ROT_X] ||
m_ipo_channels_active[OB_ROT_Y] || m_ipo_channels_active[OB_ROT_Z]) {
if (m_ipo_euler_initialized) {
// assume all channel absolute
// All 3 channels should be specified
but if they are not, we will take
// the value at the start of the game
to avoid angle sign reversal
- double yaw=m_ipo_start_euler[0],
pitch=m_ipo_start_euler[1], roll=m_ipo_start_euler[2];
+ double yaw = m_ipo_start_euler[0],
pitch = m_ipo_start_euler[1], roll = m_ipo_start_euler[2];
//RotX and dRotX
if (m_ipo_channels_active[OB_ROT_X]) {
@@ -275,9 +263,10 @@ bool KX_IpoSGController::Update(double currentTime)
if (m_game_object)
m_game_object->NodeSetLocalOrientation(MT_Vector3(yaw, pitch, roll));
}
- } else if (m_ipo_start_initialized) {
+ }
+ else if (m_ipo_start_initialized) {
// only DROT, treat as Add
- double yaw=0, pitch=0, roll=0; //delta Euler
angles
+ double yaw = 0.0, pitch = 0.0, roll = 0.0;
//delta Euler angles
//dRotX
if (m_ipo_channels_active[OB_DROT_X])
@@ -286,7 +275,7 @@ bool KX_IpoSGController::Update(double currentTime)
//dRotY
if (m_ipo_channels_active[OB_DROT_Y])
pitch =
m_ipo_xform.GetDeltaEulerAngles()[1];
-
+
//dRotZ
if (m_ipo_channels_active[OB_DROT_Z])
roll =
m_ipo_xform.GetDeltaEulerAngles()[2];
@@ -303,7 +292,7 @@ bool KX_IpoSGController::Update(double currentTime)
m_ipo_channels_active[OB_DSIZE_X] ||
m_ipo_channels_active[OB_DSIZE_Y] || m_ipo_channels_active[OB_DSIZE_Z])
{
//default is no scale change
- MT_Vector3 newScale(1.0,1.0,1.0);
+ MT_Vector3 newScale(1.0f, 1.0f, 1.0f);
if (!m_ipo_add)
newScale = ob->GetLocalScale();
@@ -311,7 +300,7 @@ bool KX_IpoSGController::Update(double currentTime)
newScale[0] =
(m_ipo_channels_active[OB_DSIZE_X] ? (m_ipo_xform.GetScaling()[0] +
m_ipo_xform.GetDeltaScaling()[0]) : m_ipo_xform.GetScaling()[0]);
}
else if (m_ipo_channels_active[OB_DSIZE_X] &&
m_ipo_start_initialized) {
- newScale[0] = (m_ipo_xform.GetDeltaScaling()[0]
+ ((!m_ipo_add)?m_ipo_start_scale[0]:0.0));
+ newScale[0] = (m_ipo_xform.GetDeltaScaling()[0]
+ ((!m_ipo_add) ? m_ipo_start_scale[0] : 0.0f));
}
//RotY dRotY
@@ -319,7 +308,7 @@ bool KX_IpoSGController::Update(double currentTime)
newScale[1] =
(m_ipo_channels_active[OB_DSIZE_Y] ? (m_ipo_xform.GetScaling()[1] +
m_ipo_xform.GetDeltaScaling()[1]): m_ipo_xform.GetScaling()[1]);
}
else if (m_ipo_channels_active[OB_DSIZE_Y] &&
m_ipo_start_initialized) {
- newScale[1] = (m_ipo_xform.GetDeltaScaling()[1]
+ ((!m_ipo_add)?m_ipo_start_scale[1]:0.0));
+ newScale[1] = (m_ipo_xform.GetDeltaScaling()[1]
+ ((!m_ipo_add)?m_ipo_start_scale[1] : 0.0f));
}
//RotZ and dRotZ
@@ -327,7 +316,7 @@ bool KX_IpoSGController::Update(double currentTime)
newScale[2] =
(m_ipo_channels_active[OB_DSIZE_Z] ? (m_ipo_xform.GetScaling()[2] +
m_ipo_xform.GetDeltaScaling()[2]) : m_ipo_xform.GetScaling()[2]);
}
else if (m_ipo_channels_active[OB_DSIZE_Z] &&
m_ipo_start_initialized) {
- newScale[2] = (m_ipo_xform.GetDeltaScaling()[2]
+ ((!m_ipo_add)?m_ipo_start_scale[2]:1.0));
+ newScale[2] = (m_ipo_xform.GetDeltaScaling()[2]
+ ((!m_ipo_add)?m_ipo_start_scale[2] : 1.0f));
}
if (m_ipo_add) {
@@ -336,24 +325,22 @@ bool KX_IpoSGController::Update(double currentTime)
if (m_game_object)
m_game_object->NodeSetLocalScale(newScale);
}
-
- m_modified=false;
+ m_modified = false;
}
return false;
}
-
-void KX_IpoSGController::AddInterpolator(KX_IInterpolator* interp)
+void KX_IpoSGController::AddInterpolator(KX_IInterpolator *interp)
{
- this->m_interpolators.push_back(interp);
+ m_interpolators.push_back(interp);
}
-SG_Controller* KX_IpoSGController::GetReplica(class SG_Node* destn
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
