ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify code a bit

Browse Source
This commit is contained in:
Deve
2016-01-08 20:12:59 +01:00
parent 280ad614bb
commit 2da5efd983
1 changed files with 18 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/graphics/irr_driver.cpp
View File

@@ -2182,40 +2182,20 @@ void IrrDriver::update(float dt)
World *world = World::getWorld();
if (GUIEngine::getCurrentScreen() != NULL &&
GUIEngine::getCurrentScreen()->needs3D() &&
world != NULL)
{
//printf("Screen that needs 3D\n");
//m_video_driver->beginScene(/*backBuffer clear*/true, /*zBuffer*/true,
// video::SColor(0,0,0,255));
//m_scene_manager->drawAll();
if (CVS->isGLSL())
renderGLSL(dt);
else
renderFixed(dt);
GUIEngine::render(dt);
//m_video_driver->endScene();
}
else if (!world)
{
m_video_driver->beginScene(/*backBuffer clear*/ true, /*zBuffer*/ true,
video::SColor(255,100,101,140));
GUIEngine::render(dt);
m_video_driver->endScene();
}
else
if (world)
{
if (CVS->isGLSL())
renderGLSL(dt);
else
renderFixed(dt);
if (world != NULL && world->getPhysics() != NULL)
GUIEngine::Screen* current_screen = GUIEngine::getCurrentScreen();
if (current_screen != NULL && current_screen->needs3D())
{
GUIEngine::render(dt);
}
if (world->getPhysics() != NULL)
{
IrrDebugDrawer* debug_drawer = world->getPhysics()->getDebugDrawer();
if (debug_drawer != NULL && debug_drawer->debugEnabled())
@@ -2224,6 +2204,15 @@ void IrrDriver::update(float dt)
}
}
}
else
{
m_video_driver->beginScene(/*backBuffer clear*/ true, /*zBuffer*/ true,
video::SColor(255,100,101,140));
GUIEngine::render(dt);
m_video_driver->endScene();
}
if (m_request_screenshot) doScreenShot();