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-05-20 23:49:27 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-05-20 23:49:27 +0400
commit2d2d36fe3b2f3e7eed7d05714abc80f1a5a82303 (patch)
tree7ad54825db128e59312fbf787555fd91edf09a07 /source/gameengine
parent5d9256404159670bec6d65557697accb5b3111b8 (diff)
code cleanup:
- style - multi-line ifs move braces onto new lines. - iterators - convert some to macros, other split up and move brace.
Diffstat (limited to 'source/gameengine')
-rw-r--r--source/gameengine/Converter/BL_MeshDeformer.cpp3
-rw-r--r--source/gameengine/GameLogic/SCA_IController.h4
-rw-r--r--source/gameengine/GameLogic/SCA_ISensor.cpp5
-rw-r--r--source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h6
-rw-r--r--source/gameengine/Rasterizer/RAS_IRasterizer.h10
-rw-r--r--source/gameengine/SceneGraph/SG_Spatial.cpp4
6 files changed, 18 insertions, 14 deletions
diff --git a/source/gameengine/Converter/BL_MeshDeformer.cpp b/source/gameengine/Converter/BL_MeshDeformer.cpp
index 682ff57be6b..c9371b9df50 100644
--- a/source/gameengine/Converter/BL_MeshDeformer.cpp
+++ b/source/gameengine/Converter/BL_MeshDeformer.cpp
@@ -54,7 +54,8 @@ bool BL_MeshDeformer::Apply(RAS_IPolyMaterial*)
// only apply once per frame if the mesh is actually modified
if (m_pMeshObject->MeshModified() &&
- m_lastDeformUpdate != m_gameobj->GetLastFrame()) {
+ m_lastDeformUpdate != m_gameobj->GetLastFrame())
+ {
// For each material
for (list<RAS_MeshMaterial>::iterator mit= m_pMeshObject->GetFirstMaterial();
mit != m_pMeshObject->GetLastMaterial(); ++ mit) {
diff --git a/source/gameengine/GameLogic/SCA_IController.h b/source/gameengine/GameLogic/SCA_IController.h
index 1b15547d898..656c4299dff 100644
--- a/source/gameengine/GameLogic/SCA_IController.h
+++ b/source/gameengine/GameLogic/SCA_IController.h
@@ -65,8 +65,8 @@ public:
void UnlinkAllActuators();
void UnlinkActuator(class SCA_IActuator* actua);
void UnlinkSensor(class SCA_ISensor* sensor);
- void SetState(unsigned int state) { m_statemask = state; }
- void ApplyState(unsigned int state);
+ void SetState(unsigned int state) { m_statemask = state; }
+ void ApplyState(unsigned int state);
void Deactivate()
{
// the controller can only be part of a sensor m_newControllers list
diff --git a/source/gameengine/GameLogic/SCA_ISensor.cpp b/source/gameengine/GameLogic/SCA_ISensor.cpp
index 4728729acb0..76b9a8df00f 100644
--- a/source/gameengine/GameLogic/SCA_ISensor.cpp
+++ b/source/gameengine/GameLogic/SCA_ISensor.cpp
@@ -101,8 +101,9 @@ bool SCA_ISensor::IsPositiveTrigger()
}
void SCA_ISensor::SetPulseMode(bool posmode,
- bool negmode,
- int freq) {
+ bool negmode,
+ int freq)
+{
m_pos_pulsemode = posmode;
m_neg_pulsemode = negmode;
m_pulse_frequency = freq;
diff --git a/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h b/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
index a356b20ed1a..92ba6100359 100644
--- a/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
+++ b/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
@@ -50,8 +50,10 @@ public:
virtual void NextFrame();
bool Connect(char *address, unsigned int port, char *password,
- unsigned int localport, unsigned int timeout) {
- return true;}
+ unsigned int localport, unsigned int timeout)
+ {
+ return true;
+ }
bool Disconnect(void) {return true;}
virtual void SendNetworkMessage(class NG_NetworkMessage* msg);
diff --git a/source/gameengine/Rasterizer/RAS_IRasterizer.h b/source/gameengine/Rasterizer/RAS_IRasterizer.h
index d6c9ddd9603..828ee01d150 100644
--- a/source/gameengine/Rasterizer/RAS_IRasterizer.h
+++ b/source/gameengine/Rasterizer/RAS_IRasterizer.h
@@ -99,11 +99,11 @@ public:
/**
*/
- enum {
- RAS_RENDER_3DPOLYGON_TEXT = 64, /* GEMAT_TEXT */
- KX_BACKCULL = 16, /* GEMAT_BACKCULL */
- KX_TEX = 4096, /* GEMAT_TEX */
- KX_LINES = 32768
+ enum {
+ RAS_RENDER_3DPOLYGON_TEXT = 64, /* GEMAT_TEXT */
+ KX_BACKCULL = 16, /* GEMAT_BACKCULL */
+ KX_TEX = 4096, /* GEMAT_TEX */
+ KX_LINES = 32768
};
/**
diff --git a/source/gameengine/SceneGraph/SG_Spatial.cpp b/source/gameengine/SceneGraph/SG_Spatial.cpp
index b5b38fd3ba6..e026419ca67 100644
--- a/source/gameengine/SceneGraph/SG_Spatial.cpp
+++ b/source/gameengine/SceneGraph/SG_Spatial.cpp
@@ -112,8 +112,8 @@ SG_Spatial::
UpdateSpatialData(
const SG_Spatial *parent,
double time,
- bool& parentUpdated
- ) {
+ bool& parentUpdated)
+{
bool bComputesWorldTransform = false;
// update spatial controllers