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:
authorCampbell Barton <ideasman42@gmail.com>2012-02-27 14:35:39 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-02-27 14:35:39 +0400
commit47c373c7a970fa4bd26453a6e35a4b066f2b77e4 (patch)
tree43d916fb86bcf797afa834649706669694225fe8 /source/gameengine/Ketsji
parent120297734b4a01d93e5223e02f255b5aef01e281 (diff)
style cleanup (mostly whitespace)
Diffstat (limited to 'source/gameengine/Ketsji')
-rw-r--r--source/gameengine/Ketsji/KX_Camera.h2
-rw-r--r--source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp2
-rw-r--r--source/gameengine/Ketsji/KX_Dome.cpp8
-rw-r--r--source/gameengine/Ketsji/KX_GameObject.h2
-rw-r--r--source/gameengine/Ketsji/KX_MeshProxy.h2
-rw-r--r--source/gameengine/Ketsji/KX_PolyProxy.h2
-rw-r--r--source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h4
-rw-r--r--source/gameengine/Ketsji/KX_SteeringActuator.cpp2
-rw-r--r--source/gameengine/Ketsji/KX_TouchSensor.h2
-rw-r--r--source/gameengine/Ketsji/KX_VertexProxy.h2
10 files changed, 14 insertions, 14 deletions
diff --git a/source/gameengine/Ketsji/KX_Camera.h b/source/gameengine/Ketsji/KX_Camera.h
index 2f5fe112de6..082d363fed6 100644
--- a/source/gameengine/Ketsji/KX_Camera.h
+++ b/source/gameengine/Ketsji/KX_Camera.h
@@ -145,7 +145,7 @@ protected:
public:
- enum { INSIDE, INTERSECT, OUTSIDE } ;
+ enum { INSIDE, INTERSECT, OUTSIDE };
KX_Camera(void* sgReplicationInfo,SG_Callbacks callbacks,const RAS_CameraData& camdata, bool frustum_culling = true, bool delete_node = false);
virtual ~KX_Camera();
diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
index f21a7f815e5..ac83200cb2e 100644
--- a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
+++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
@@ -353,7 +353,7 @@ void KX_ConvertBulletObject( class KX_GameObject* gameobj,
//////////
//do Fh, do Rot Fh
ci.m_do_fh = shapeprops->m_do_fh;
- ci.m_do_rot_fh = shapeprops->m_do_rot_fh ;
+ ci.m_do_rot_fh = shapeprops->m_do_rot_fh;
ci.m_fh_damping = smmaterial->m_fh_damping;
ci.m_fh_distance = smmaterial->m_fh_distance;
ci.m_fh_normal = smmaterial->m_fh_normal;
diff --git a/source/gameengine/Ketsji/KX_Dome.cpp b/source/gameengine/Ketsji/KX_Dome.cpp
index 4f959d9d2f9..6bd30685696 100644
--- a/source/gameengine/Ketsji/KX_Dome.cpp
+++ b/source/gameengine/Ketsji/KX_Dome.cpp
@@ -1415,13 +1415,13 @@ void KX_Dome::SplitFace(vector <DomeFace>& face, int *nfaces)
face[n2+2].v[1] = (face[i].v[1] + face[i].v[2]) /2;
face[n2+2].v[2] = (face[i].v[2] + face[i].v[0]) /2;
- //face[i].verts[0] = face[i].verts[0] ;
+ //face[i].verts[0] = face[i].verts[0];
face[i].verts[1] = (face[i].verts[0] + face[i].verts[1]) /2;
face[i].verts[2] = (face[i].verts[0] + face[i].verts[2]) /2;
//face[i].u[0] = face[i].u[0];
face[i].u[1] = (face[i].u[0] + face[i].u[1]) /2;
face[i].u[2] = (face[i].u[0] + face[i].u[2]) /2;
- //face[i].v[0] = face[i].v[0] ;
+ //face[i].v[0] = face[i].v[0];
face[i].v[1] = (face[i].v[0] + face[i].v[1]) /2;
face[i].v[2] = (face[i].v[0] + face[i].v[2]) /2;
@@ -1812,13 +1812,13 @@ void KX_Dome::DrawDomeFisheye(void)
else if(m_mode == DOME_TRUNCATED_FRONT)
{
ortho_width = 1.0;
- ortho_height = 2 * ((float)can_height/can_width) - 1.0 ;
+ ortho_height = 2 * ((float)can_height / can_width) - 1.0;
glOrtho((-ortho_width), ortho_width, (-ortho_height), ortho_width, -20.0, 10.0);
}
else { //m_mode == DOME_TRUNCATED_REAR
ortho_width = 1.0;
- ortho_height = 2 * ((float)can_height/can_width) - 1.0 ;
+ ortho_height = 2 * ((float)can_height / can_width) - 1.0;
glOrtho((-ortho_width), ortho_width, (-ortho_width), ortho_height, -20.0, 10.0);
}
diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h
index 895140528e8..ea721d19179 100644
--- a/source/gameengine/Ketsji/KX_GameObject.h
+++ b/source/gameengine/Ketsji/KX_GameObject.h
@@ -431,7 +431,7 @@ public:
* @return a pointer to the physics controller owned by this class.
*/
- KX_IPhysicsController* GetPhysicsController() ;
+ KX_IPhysicsController* GetPhysicsController();
void SetPhysicsController(KX_IPhysicsController* physicscontroller,bool isDynamic)
{
diff --git a/source/gameengine/Ketsji/KX_MeshProxy.h b/source/gameengine/Ketsji/KX_MeshProxy.h
index dfaf1eba009..58b5c87e494 100644
--- a/source/gameengine/Ketsji/KX_MeshProxy.h
+++ b/source/gameengine/Ketsji/KX_MeshProxy.h
@@ -51,7 +51,7 @@ public:
void SetMeshModified(bool v);
// stuff for cvalue related things
- virtual CValue* Calc(VALUE_OPERATOR op, CValue *val) ;
+ virtual CValue* Calc(VALUE_OPERATOR op, CValue *val);
virtual CValue* CalcFinal(VALUE_DATA_TYPE dtype, VALUE_OPERATOR op, CValue *val);
virtual const STR_String & GetText();
virtual double GetNumber();
diff --git a/source/gameengine/Ketsji/KX_PolyProxy.h b/source/gameengine/Ketsji/KX_PolyProxy.h
index 44945e58c2a..83c3bff0ee2 100644
--- a/source/gameengine/Ketsji/KX_PolyProxy.h
+++ b/source/gameengine/Ketsji/KX_PolyProxy.h
@@ -47,7 +47,7 @@ public:
virtual ~KX_PolyProxy();
// stuff for cvalue related things
- CValue* Calc(VALUE_OPERATOR op, CValue *val) ;
+ CValue* Calc(VALUE_OPERATOR op, CValue *val);
CValue* CalcFinal(VALUE_DATA_TYPE dtype, VALUE_OPERATOR op, CValue *val);
const STR_String & GetText();
double GetNumber();
diff --git a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
index d9cd1b5ff24..40136f429a2 100644
--- a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
+++ b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
@@ -93,7 +93,7 @@ public:
CValue*
GetReplica(
- ) ;
+ );
virtual void
ProcessReplica();
@@ -114,7 +114,7 @@ public:
SCA_IObject*
GetLastCreatedObject(
- ) const ;
+ ) const;
void InstantAddObject();
diff --git a/source/gameengine/Ketsji/KX_SteeringActuator.cpp b/source/gameengine/Ketsji/KX_SteeringActuator.cpp
index 232b907d9a8..bc8c5ec92a8 100644
--- a/source/gameengine/Ketsji/KX_SteeringActuator.cpp
+++ b/source/gameengine/Ketsji/KX_SteeringActuator.cpp
@@ -338,7 +338,7 @@ static bool barDistSqPointToTri(const float* p, const float* a, const float* b,
float ud = u<0.f ? -u : (u>1.f ? u-1.f : 0.f);
float vd = v<0.f ? -v : (v>1.f ? v-1.f : 0.f);
- return ud*ud+vd*vd ;
+ return ud * ud + vd * vd;
}
inline void flipAxes(float* vec)
diff --git a/source/gameengine/Ketsji/KX_TouchSensor.h b/source/gameengine/Ketsji/KX_TouchSensor.h
index 1ce1742ed46..df96b75084a 100644
--- a/source/gameengine/Ketsji/KX_TouchSensor.h
+++ b/source/gameengine/Ketsji/KX_TouchSensor.h
@@ -79,7 +79,7 @@ public:
class KX_GameObject* gameobj,
bool bFindMaterial,
bool bTouchPulse,
- const STR_String& touchedpropname) ;
+ const STR_String& touchedpropname);
virtual ~KX_TouchSensor();
virtual CValue* GetReplica();
diff --git a/source/gameengine/Ketsji/KX_VertexProxy.h b/source/gameengine/Ketsji/KX_VertexProxy.h
index baed5330f7e..3084e5fac93 100644
--- a/source/gameengine/Ketsji/KX_VertexProxy.h
+++ b/source/gameengine/Ketsji/KX_VertexProxy.h
@@ -48,7 +48,7 @@ public:
virtual ~KX_VertexProxy();
// stuff for cvalue related things
- CValue* Calc(VALUE_OPERATOR op, CValue *val) ;
+ CValue* Calc(VALUE_OPERATOR op, CValue *val);
CValue* CalcFinal(VALUE_DATA_TYPE dtype, VALUE_OPERATOR op, CValue *val);
const STR_String & GetText();
double GetNumber();