diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-11-11 17:09:14 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-11 17:09:14 +0400 |
commit | e84c0980a3afb89301f8512acee64e525db3a49d (patch) | |
tree | 8700c1b43e1887ad8916c623b1f5066bc6b6f17f /source/gameengine/Ketsji | |
parent | 094c9799f9926ae37515a1fe0380403ce3298a77 (diff) |
correct indentation and some whitespace edits (no functional changes)
Diffstat (limited to 'source/gameengine/Ketsji')
-rw-r--r-- | source/gameengine/Ketsji/BL_Action.cpp | 5 | ||||
-rw-r--r-- | source/gameengine/Ketsji/BL_Shader.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_Dome.cpp | 24 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_IpoActuator.h | 18 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_MouseFocusSensor.h | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_NearSensor.h | 12 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_Scene.cpp | 14 |
7 files changed, 40 insertions, 37 deletions
diff --git a/source/gameengine/Ketsji/BL_Action.cpp b/source/gameengine/Ketsji/BL_Action.cpp index 931e5412338..1d5a3dd461a 100644 --- a/source/gameengine/Ketsji/BL_Action.cpp +++ b/source/gameengine/Ketsji/BL_Action.cpp @@ -309,8 +309,9 @@ void BL_Action::BlendShape(Key* key, float srcweight, std::vector<float>& blends dstweight = 1.0F - srcweight; //printf("Dst: %f\tSrc: %f\n", srcweight, dstweight); for (it=blendshape.begin(), kb = (KeyBlock*)key->block.first; - kb && it != blendshape.end(); - kb = (KeyBlock*)kb->next, it++) { + kb && it != blendshape.end(); + kb = (KeyBlock*)kb->next, it++) + { //printf("OirgKeys: %f\t%f\n", kb->curval, (*it)); kb->curval = kb->curval * dstweight + (*it) * srcweight; //printf("NewKey: %f\n", kb->curval); diff --git a/source/gameengine/Ketsji/BL_Shader.cpp b/source/gameengine/Ketsji/BL_Shader.cpp index aea33246a3f..682b42cc3cf 100644 --- a/source/gameengine/Ketsji/BL_Shader.cpp +++ b/source/gameengine/Ketsji/BL_Shader.cpp @@ -451,7 +451,7 @@ void BL_Shader::Update( const RAS_MeshSlot & ms, RAS_IRasterizer* rasty ) const MT_Matrix4x4& view = rasty->GetViewMatrix(); if(mAttr==SHD_TANGENT) - ms.m_mesh->SetMeshModified(true); + ms.m_mesh->SetMeshModified(true); BL_UniformVecDef::iterator it; for(it = mPreDef.begin(); it!= mPreDef.end(); it++) diff --git a/source/gameengine/Ketsji/KX_Dome.cpp b/source/gameengine/Ketsji/KX_Dome.cpp index 44cfd4bddbc..828c327a228 100644 --- a/source/gameengine/Ketsji/KX_Dome.cpp +++ b/source/gameengine/Ketsji/KX_Dome.cpp @@ -425,21 +425,21 @@ void KX_Dome::GLDrawWarpQuads(void) if (warp.nodes[i][j].i < 0 || warp.nodes[i2][j].i < 0 || warp.nodes[i2][j+1].i < 0 || warp.nodes[i][j+1].i < 0) continue; - glColor3f(warp.nodes[i][j].i,warp.nodes[i][j].i,warp.nodes[i][j].i); - glTexCoord2f((warp.nodes[i][j].u * uv_width), (warp.nodes[i][j].v * uv_height)); - glVertex3f(warp.nodes[i][j].x,warp.nodes[i][j].y,0.0); + glColor3f(warp.nodes[i][j].i,warp.nodes[i][j].i,warp.nodes[i][j].i); + glTexCoord2f((warp.nodes[i][j].u * uv_width), (warp.nodes[i][j].v * uv_height)); + glVertex3f(warp.nodes[i][j].x,warp.nodes[i][j].y,0.0); - glColor3f(warp.nodes[i2][j].i,warp.nodes[i2][j].i,warp.nodes[i2][j].i); - glTexCoord2f((warp.nodes[i2][j].u * uv_width), (warp.nodes[i2][j].v * uv_height)); - glVertex3f(warp.nodes[i2][j].x,warp.nodes[i2][j].y,0.0); + glColor3f(warp.nodes[i2][j].i,warp.nodes[i2][j].i,warp.nodes[i2][j].i); + glTexCoord2f((warp.nodes[i2][j].u * uv_width), (warp.nodes[i2][j].v * uv_height)); + glVertex3f(warp.nodes[i2][j].x,warp.nodes[i2][j].y,0.0); - glColor3f(warp.nodes[i2][j+1].i,warp.nodes[i2][j+1].i,warp.nodes[i2][j+1].i); - glTexCoord2f((warp.nodes[i2][j+1].u * uv_width), (warp.nodes[i2][j+1].v * uv_height)); - glVertex3f(warp.nodes[i2][j+1].x,warp.nodes[i2][j+1].y,0.0); + glColor3f(warp.nodes[i2][j+1].i,warp.nodes[i2][j+1].i,warp.nodes[i2][j+1].i); + glTexCoord2f((warp.nodes[i2][j+1].u * uv_width), (warp.nodes[i2][j+1].v * uv_height)); + glVertex3f(warp.nodes[i2][j+1].x,warp.nodes[i2][j+1].y,0.0); - glColor3f(warp.nodes[i2][j+1].i,warp.nodes[i2][j+1].i,warp.nodes[i2][j+1].i); - glTexCoord2f((warp.nodes[i2][j+1].u * uv_width), (warp.nodes[i2][j+1].v * uv_height)); - glVertex3f(warp.nodes[i2][j+1].x,warp.nodes[i2][j+1].y,0.0); + glColor3f(warp.nodes[i2][j+1].i,warp.nodes[i2][j+1].i,warp.nodes[i2][j+1].i); + glTexCoord2f((warp.nodes[i2][j+1].u * uv_width), (warp.nodes[i2][j+1].v * uv_height)); + glVertex3f(warp.nodes[i2][j+1].x,warp.nodes[i2][j+1].y,0.0); } } diff --git a/source/gameengine/Ketsji/KX_IpoActuator.h b/source/gameengine/Ketsji/KX_IpoActuator.h index fa26bbaa6e1..6b172ba8603 100644 --- a/source/gameengine/Ketsji/KX_IpoActuator.h +++ b/source/gameengine/Ketsji/KX_IpoActuator.h @@ -123,15 +123,15 @@ public: int m_type; KX_IpoActuator(SCA_IObject* gameobj, - const STR_String& propname, - const STR_String& framePropname, - float starttime, - float endtime, - bool recurse, - int acttype, - bool ipo_as_force, - bool ipo_add, - bool ipo_local); + const STR_String& propname, + const STR_String& framePropname, + float starttime, + float endtime, + bool recurse, + int acttype, + bool ipo_as_force, + bool ipo_add, + bool ipo_local); virtual ~KX_IpoActuator() {}; virtual CValue* GetReplica() { diff --git a/source/gameengine/Ketsji/KX_MouseFocusSensor.h b/source/gameengine/Ketsji/KX_MouseFocusSensor.h index 277af87f9f2..43bf6bc5302 100644 --- a/source/gameengine/Ketsji/KX_MouseFocusSensor.h +++ b/source/gameengine/Ketsji/KX_MouseFocusSensor.h @@ -121,7 +121,7 @@ class KX_MouseFocusSensor : public SCA_MouseSensor /** * The focus mode. 1 for handling focus, 0 for not handling, 2 for focus on any object */ - int m_focusmode; + int m_focusmode; /** * Flags whether the previous test showed a mouse-over. diff --git a/source/gameengine/Ketsji/KX_NearSensor.h b/source/gameengine/Ketsji/KX_NearSensor.h index 26adcb993b8..a81d621e8fc 100644 --- a/source/gameengine/Ketsji/KX_NearSensor.h +++ b/source/gameengine/Ketsji/KX_NearSensor.h @@ -49,12 +49,12 @@ protected: KX_ClientObjectInfo* m_client_info; public: KX_NearSensor(class SCA_EventManager* eventmgr, - class KX_GameObject* gameobj, - float margin, - float resetmargin, - bool bFindMaterial, - const STR_String& touchedpropname, - PHY_IPhysicsController* ctrl); + class KX_GameObject* gameobj, + float margin, + float resetmargin, + bool bFindMaterial, + const STR_String& touchedpropname, + PHY_IPhysicsController* ctrl); /* public: KX_NearSensor(class SCA_EventManager* eventmgr, diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index 9b8f7f27d80..20743504dad 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -1247,9 +1247,10 @@ KX_Camera* KX_Scene::FindCamera(KX_Camera* cam) { list<KX_Camera*>::iterator it = m_cameras.begin(); - while ( (it != m_cameras.end()) - && ((*it) != cam) ) { - it++; + while ( (it != m_cameras.end()) + && ((*it) != cam) ) + { + it++; } return ((it == m_cameras.end()) ? NULL : (*it)); @@ -1260,9 +1261,10 @@ KX_Camera* KX_Scene::FindCamera(STR_String& name) { list<KX_Camera*>::iterator it = m_cameras.begin(); - while ( (it != m_cameras.end()) - && ((*it)->GetName() != name) ) { - it++; + while ( (it != m_cameras.end()) + && ((*it)->GetName() != name) ) + { + it++; } return ((it == m_cameras.end()) ? NULL : (*it)); |