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>2011-09-25 16:31:21 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-09-25 16:31:21 +0400
commit274b9c8fb88ff6499ac3b13a081c1e60965e459e (patch)
tree461590235bfb22af06bb6a7079f4e1732acdc241 /source/gameengine/Ketsji
parent558b646216feaa43abf44eb332d2449c68bf1b39 (diff)
whitespace cleanup
Diffstat (limited to 'source/gameengine/Ketsji')
-rw-r--r--source/gameengine/Ketsji/KX_CameraActuator.cpp2
-rw-r--r--source/gameengine/Ketsji/KX_KetsjiEngine.cpp10
-rw-r--r--source/gameengine/Ketsji/KX_MouseFocusSensor.h2
-rw-r--r--source/gameengine/Ketsji/KX_NearSensor.cpp4
-rw-r--r--source/gameengine/Ketsji/KX_ObjectActuator.h2
-rw-r--r--source/gameengine/Ketsji/KX_ParentActuator.h6
-rw-r--r--source/gameengine/Ketsji/KX_PythonSeq.cpp6
-rw-r--r--source/gameengine/Ketsji/KX_SCA_DynamicActuator.h8
8 files changed, 20 insertions, 20 deletions
diff --git a/source/gameengine/Ketsji/KX_CameraActuator.cpp b/source/gameengine/Ketsji/KX_CameraActuator.cpp
index ebb291b2284..7df08b83d49 100644
--- a/source/gameengine/Ketsji/KX_CameraActuator.cpp
+++ b/source/gameengine/Ketsji/KX_CameraActuator.cpp
@@ -253,7 +253,7 @@ bool KX_CameraActuator::Update(double curtime, bool frame)
/* ... set up some parameters ... */
/* missing here: the 'floorloc' of the actor's shadow */
- mindistsq= m_minHeight*m_minHeight;
+ mindistsq= m_minHeight*m_minHeight;
maxdistsq= m_maxHeight*m_maxHeight;
/* C1: not checked... is a future option */
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
index acd25ace04a..8e6126bb173 100644
--- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
+++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
@@ -765,12 +765,12 @@ else
m_logger->StartLog(tc_scenegraph, m_kxsystem->GetTimeInSeconds(), true);
SG_SetActiveStage(SG_STAGE_ACTUATOR);
scene->UpdateParents(m_clockTime);
-
- scene->setSuspendedTime(0.0);
+
+ scene->setSuspendedTime(0.0);
} // suspended
- else
- if(scene->getSuspendedTime()==0.0)
- scene->setSuspendedTime(m_clockTime);
+ else
+ if(scene->getSuspendedTime()==0.0)
+ scene->setSuspendedTime(m_clockTime);
m_logger->StartLog(tc_services, m_kxsystem->GetTimeInSeconds(), true);
}
diff --git a/source/gameengine/Ketsji/KX_MouseFocusSensor.h b/source/gameengine/Ketsji/KX_MouseFocusSensor.h
index 73c5d94e4a5..07787665b1d 100644
--- a/source/gameengine/Ketsji/KX_MouseFocusSensor.h
+++ b/source/gameengine/Ketsji/KX_MouseFocusSensor.h
@@ -140,7 +140,7 @@ class KX_MouseFocusSensor : public SCA_MouseSensor
*/
bool m_positive_event;
- /**
+ /**
* Tests whether the object is in mouse focus for this camera
*/
bool ParentObjectHasFocusCamera(KX_Camera *cam);
diff --git a/source/gameengine/Ketsji/KX_NearSensor.cpp b/source/gameengine/Ketsji/KX_NearSensor.cpp
index 913a1adac55..eca4d45e9c6 100644
--- a/source/gameengine/Ketsji/KX_NearSensor.cpp
+++ b/source/gameengine/Ketsji/KX_NearSensor.cpp
@@ -49,8 +49,8 @@ KX_NearSensor::KX_NearSensor(SCA_EventManager* eventmgr,
float resetmargin,
bool bFindMaterial,
const STR_String& touchedpropname,
- PHY_IPhysicsController* ctrl)
- :KX_TouchSensor(eventmgr,
+ PHY_IPhysicsController* ctrl)
+ :KX_TouchSensor(eventmgr,
gameobj,
bFindMaterial,
false,
diff --git a/source/gameengine/Ketsji/KX_ObjectActuator.h b/source/gameengine/Ketsji/KX_ObjectActuator.h
index 0737535b84c..3ba257b4f05 100644
--- a/source/gameengine/Ketsji/KX_ObjectActuator.h
+++ b/source/gameengine/Ketsji/KX_ObjectActuator.h
@@ -100,7 +100,7 @@ class KX_ObjectActuator : public SCA_IActuator
// used in servo control
MT_Vector3 m_previous_error;
MT_Vector3 m_error_accumulator;
- KX_LocalFlags m_bitLocalFlag;
+ KX_LocalFlags m_bitLocalFlag;
KX_GameObject* m_reference;
// A hack bool -- oh no sorry everyone
// This bool is used to check if we have informed
diff --git a/source/gameengine/Ketsji/KX_ParentActuator.h b/source/gameengine/Ketsji/KX_ParentActuator.h
index a850cc72eb9..6984465623d 100644
--- a/source/gameengine/Ketsji/KX_ParentActuator.h
+++ b/source/gameengine/Ketsji/KX_ParentActuator.h
@@ -56,8 +56,8 @@ class KX_ParentActuator : public SCA_IActuator
- public:
- enum KX_PARENTACT_MODE
+public:
+ enum KX_PARENTACT_MODE
{
KX_PARENT_NODEF = 0,
KX_PARENT_SET,
@@ -65,7 +65,7 @@ class KX_ParentActuator : public SCA_IActuator
KX_PARENT_MAX
};
-
+
KX_ParentActuator(class SCA_IObject* gameobj,
int mode,
bool addToCompound,
diff --git a/source/gameengine/Ketsji/KX_PythonSeq.cpp b/source/gameengine/Ketsji/KX_PythonSeq.cpp
index 04a53fbb493..729376f0a24 100644
--- a/source/gameengine/Ketsji/KX_PythonSeq.cpp
+++ b/source/gameengine/Ketsji/KX_PythonSeq.cpp
@@ -375,9 +375,9 @@ static PyObject *KX_PythonSeq_getIter(KX_PythonSeq *self)
return (PyObject *)self;
} else {
return KX_PythonSeq_CreatePyObject(self->base, self->type);
- }
- }
-
+ }
+}
+
/*
* Return next KX_PythonSeq iter.
diff --git a/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h b/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
index 04b2c00f4c1..ecae0eba6cd 100644
--- a/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
+++ b/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
@@ -50,10 +50,10 @@ class KX_SCA_DynamicActuator : public SCA_IActuator
float m_setmass;
public:
KX_SCA_DynamicActuator(
- SCA_IObject* gameobj,
- short dyn_operation,
- float setmass
- );
+ SCA_IObject* gameobj,
+ short dyn_operation,
+ float setmass
+ );
~KX_SCA_DynamicActuator(
);