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-09-16 08:58:18 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-09-16 08:58:18 +0400
commit2fb82920059257fd7ac8e33bfe53de13e7ed53bd (patch)
treecb8de3a839cb9878d0869d4e436a235346109c16 /source/gameengine/Ketsji/KX_KetsjiEngine.cpp
parentc2a1dcf6218cbd56126a5deb1aeaf212d67e54cb (diff)
style cleanup
Diffstat (limited to 'source/gameengine/Ketsji/KX_KetsjiEngine.cpp')
-rw-r--r--source/gameengine/Ketsji/KX_KetsjiEngine.cpp46
1 files changed, 23 insertions, 23 deletions
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
index a560b606f5b..c2857141058 100644
--- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
+++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
@@ -253,7 +253,7 @@ void KX_KetsjiEngine::SetRasterizer(RAS_IRasterizer* rasterizer)
* At the moment the bge.logic module is imported into 'pythondictionary' after this function is called.
* if this function ever changes to assign a copy, make sure the game logic module is imported into this dictionary before hand.
*/
-void KX_KetsjiEngine::SetPyNamespace(PyObject* pythondictionary)
+void KX_KetsjiEngine::SetPyNamespace(PyObject *pythondictionary)
{
MT_assert(pythondictionary);
m_pythondictionary = pythondictionary;
@@ -361,7 +361,7 @@ void KX_KetsjiEngine::RenderDome()
// no FlushDebugLines
}
m_dome->BindImages(i);
- }
+ }
m_canvas->EndFrame();//XXX do we really need that?
@@ -391,7 +391,7 @@ void KX_KetsjiEngine::RenderDome()
// Draw Callback for the last scene
#ifdef WITH_PYTHON
scene->RunDrawingCallbacks(scene->GetPostDrawCB());
-#endif
+#endif
EndFrame();
}
@@ -477,7 +477,7 @@ void KX_KetsjiEngine::ClearFrame()
SetBackGround(firstscene->GetWorldInfo());
m_canvas->SetViewPort(clearvp.GetLeft(), clearvp.GetBottom(),
- clearvp.GetRight(), clearvp.GetTop());
+ clearvp.GetRight(), clearvp.GetTop());
m_rasterizer->ClearColorBuffer();
}
}
@@ -498,7 +498,7 @@ bool KX_KetsjiEngine::BeginFrame()
}
return false;
-}
+}
void KX_KetsjiEngine::EndFrame()
@@ -641,7 +641,7 @@ else
scene->GetPhysicsEnvironment()->endFrame();
// Update scenegraph after physics step. This maps physics calculations
- // into node positions.
+ // into node positions.
//m_logger->StartLog(tc_scenegraph, m_kxsystem->GetTimeInSeconds(), true);
//SG_SetActiveStage(SG_STAGE_PHYSICS1_UPDATE);
//scene->UpdateParents(m_frameTime);
@@ -692,7 +692,7 @@ else
if (m_animation_record)
- {
+ {
m_sceneconverter->WritePhysicsObjectToAnimationIpo(++m_currentFrame);
}
@@ -725,7 +725,7 @@ else
bool bUseAsyncLogicBricks= false;//true;
if (bUseAsyncLogicBricks)
- {
+ {
// Logic update sub frame: this will let some logic bricks run at the
// full frame rate.
for (sceneit = m_scenes.begin();sceneit != m_scenes.end(); ++sceneit)
@@ -756,7 +756,7 @@ else
m_logger->StartLog(tc_physics, m_kxsystem->GetTimeInSeconds(), true);
scene->GetPhysicsEnvironment()->proceedDeltaTime(m_clockTime,timestep,timestep);
// Update scenegraph after physics step. This maps physics calculations
- // into node positions.
+ // into node positions.
m_logger->StartLog(tc_scenegraph, m_kxsystem->GetTimeInSeconds(), true);
SG_SetActiveStage(SG_STAGE_PHYSICS2);
scene->UpdateParents(m_clockTime);
@@ -938,7 +938,7 @@ void KX_KetsjiEngine::Render()
//RenderFrame(scene);
RenderFrame(scene, cam);
- list<class KX_Camera*>* cameras = scene->GetCameras();
+ list<class KX_Camera*>* cameras = scene->GetCameras();
// Draw the scene once for each camera with an enabled viewport
list<KX_Camera*>::iterator it = cameras->begin();
@@ -1013,7 +1013,7 @@ void KX_KetsjiEngine::SetBackGround(KX_WorldInfo* wi)
if (wi->hasWorld())
{
if (m_drawingmode == RAS_IRasterizer::KX_TEXTURED)
- {
+ {
m_rasterizer->SetBackColor(
wi->getBackColorRed(),
wi->getBackColorGreen(),
@@ -1038,7 +1038,7 @@ void KX_KetsjiEngine::SetWorldSettings(KX_WorldInfo* wi)
);
if (m_drawingmode >= RAS_IRasterizer::KX_SOLID)
- {
+ {
if (wi->hasMist())
{
m_rasterizer->SetFog(
@@ -1203,11 +1203,11 @@ void KX_KetsjiEngine::RenderFrame(KX_Scene* scene, KX_Camera* cam)
GetSceneViewport(scene, cam, area, viewport);
// store the computed viewport in the scene
- scene->SetSceneViewport(viewport);
+ scene->SetSceneViewport(viewport);
// set the viewport for this frame and scene
m_canvas->SetViewPort(viewport.GetLeft(), viewport.GetBottom(),
- viewport.GetRight(), viewport.GetTop());
+ viewport.GetRight(), viewport.GetTop());
// see KX_BlenderMaterial::Activate
//m_rasterizer->SetAmbient();
@@ -1348,7 +1348,7 @@ void KX_KetsjiEngine::PostRenderScene(KX_Scene* scene)
m_rasterizer->FlushDebugShapes();
scene->Render2DFilters(m_canvas);
#ifdef WITH_PYTHON
- scene->RunDrawingCallbacks(scene->GetPostDrawCB());
+ scene->RunDrawingCallbacks(scene->GetPostDrawCB());
#endif
}
@@ -1368,10 +1368,10 @@ void KX_KetsjiEngine::StopEngine()
{
KX_Scene* scene = *sceneit;
m_sceneconverter->RemoveScene(scene);
- }
+ }
m_scenes.clear();
- // cleanup all the stuff
+ // cleanup all the stuff
m_rasterizer->Exit();
}
}
@@ -1469,7 +1469,7 @@ void KX_KetsjiEngine::RenderDebugProperties()
/* Profile and framerate display */
if (m_show_profile)
- {
+ {
for (int j = tc_first; j < tc_numCategories; j++)
{
debugtxt.Format(m_profileLabels[j]);
@@ -1556,7 +1556,7 @@ void KX_KetsjiEngine::RenderDebugProperties()
KX_SceneList* KX_KetsjiEngine::CurrentScenes()
{
- return &m_scenes;
+ return &m_scenes;
}
@@ -1572,7 +1572,7 @@ KX_Scene* KX_KetsjiEngine::FindScene(const STR_String& scenename)
sceneit++;
}
- return ((sceneit == m_scenes.end()) ? NULL : *sceneit);
+ return ((sceneit == m_scenes.end()) ? NULL : *sceneit);
}
@@ -1635,7 +1635,7 @@ void KX_KetsjiEngine::RemoveScheduledScenes()
m_scenes.erase(sceneit);
break;
}
- }
+ }
}
m_removingScenes.clear();
}
@@ -1737,7 +1737,7 @@ void KX_KetsjiEngine::ReplaceScheduledScenes()
}
}
m_replace_scenes.clear();
- }
+ }
}
@@ -1910,7 +1910,7 @@ void KX_KetsjiEngine::SceneListsChanged(void)
while ((sceneit != m_scenes.end()) && (!m_propertiesPresent))
{
KX_Scene* scene = *sceneit;
- vector<SCA_DebugProp*>& debugproplist = scene->GetDebugProperties();
+ vector<SCA_DebugProp*>& debugproplist = scene->GetDebugProperties();
m_propertiesPresent = !debugproplist.empty();
sceneit++;
}