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

Merge remote-tracking branch 'origin/master' into removeLocalPlayerInfo

Browse Source
This commit is contained in:
hiker 2016-01-12 13:02:34 +11:00
commit 7b6ec4e916
3 changed files with 23 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/supertuxkart.desktop
View File

@ -12,3 +12,4 @@ Terminal=false
StartupNotify=false StartupNotify=false
Type=Application Type=Application
Categories=Game;ArcadeGame; Categories=Game;ArcadeGame;
Keywords=tux;game;race;

48
src/graphics/irr_driver.cpp
View File

@ -2182,25 +2182,29 @@ void IrrDriver::update(float dt)
World *world = World::getWorld(); World *world = World::getWorld();
if (GUIEngine::getCurrentScreen() != NULL && if (world)
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()) if (CVS->isGLSL())
renderGLSL(dt); renderGLSL(dt);
else else
renderFixed(dt); renderFixed(dt);
GUIEngine::render(dt); GUIEngine::Screen* current_screen = GUIEngine::getCurrentScreen();
//m_video_driver->endScene(); if (current_screen != NULL && current_screen->needs3D())
return; {
GUIEngine::render(dt);
}
if (world->getPhysics() != NULL)
{
IrrDebugDrawer* debug_drawer = world->getPhysics()->getDebugDrawer();
if (debug_drawer != NULL && debug_drawer->debugEnabled())
{
debug_drawer->beginNextFrame();
}
}
} }
else if (!world) else
{ {
m_video_driver->beginScene(/*backBuffer clear*/ true, /*zBuffer*/ true, m_video_driver->beginScene(/*backBuffer clear*/ true, /*zBuffer*/ true,
video::SColor(255,100,101,140)); video::SColor(255,100,101,140));
@ -2208,24 +2212,8 @@ void IrrDriver::update(float dt)
GUIEngine::render(dt); GUIEngine::render(dt);
m_video_driver->endScene(); m_video_driver->endScene();
return;
} }
if (CVS->isGLSL())
renderGLSL(dt);
else
renderFixed(dt);
if (world != NULL && world->getPhysics() != NULL)
{
IrrDebugDrawer* debug_drawer = world->getPhysics()->getDebugDrawer();
if (debug_drawer != NULL && debug_drawer->debugEnabled())
{
debug_drawer->beginNextFrame();
}
}
if (m_request_screenshot) doScreenShot(); if (m_request_screenshot) doScreenShot();
// Enable this next print statement to get render information printed // Enable this next print statement to get render information printed

8
src/utils/vs.hpp
View File

@ -38,14 +38,14 @@
#if defined(WIN32) && defined(DEBUG) #if defined(WIN32) && defined(DEBUG)
# define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
# include <Windows.h> # include <windows.h>
#endif #endif
namespace VS namespace VS
{ {
#if defined(WIN32) && defined(DEBUG) #if defined(_MSC_VER) && defined(DEBUG)
# define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
# include <Windows.h> # include <windows.h>
/** This function sets the name of this thread in the VS debugger. /** This function sets the name of this thread in the VS debugger.
* \param name Name of the thread. * \param name Name of the thread.
@ -87,4 +87,4 @@ namespace VS
} // namespace VS } // namespace VS
#endif // HEADER_VS_HPP #endif // HEADER_VS_HPP