From: <mbj...@us...> - 2009-03-30 18:09:38
|
Revision: 3323 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=3323&view=rev Author: mbjornstk Date: 2009-03-30 18:09:33 +0000 (Mon, 30 Mar 2009) Log Message: ----------- Hacky FPS reporting (look for lastFPS to see the code involved). It is off by default, with #if 0, but this way anybody can enable it. When we get "on game" text, speed, etc it must be moved to the right place (and better code, the chain of "->" is pretty ugly). Modified Paths: -------------- main/branches/irrlicht/src/main_loop.cpp Modified: main/branches/irrlicht/src/main_loop.cpp =================================================================== --- main/branches/irrlicht/src/main_loop.cpp 2009-03-30 01:42:12 UTC (rev 3322) +++ main/branches/irrlicht/src/main_loop.cpp 2009-03-30 18:09:33 UTC (rev 3323) @@ -36,6 +36,11 @@ MainLoop* main_loop = 0; +// FIXME hacky hacky FPS info +int minFPS = 999; +int lastFPS = -1; +int maxFPS = 0; + MainLoop::MainLoop() : m_abort(false), m_frame_count(0), @@ -108,8 +113,8 @@ if (!music_on && !race_manager->raceIsActive()) { sound_manager->stopMusic(); // stop potential 'left over' music from race - sound_manager->startMusic(stk_config->m_title_music); - music_on = true; + sound_manager->startMusic(stk_config->m_title_music); + music_on = true; } network_manager->update(dt); @@ -212,6 +217,26 @@ #ifdef HAVE_IRRLICHT if(!user_config->m_bullet_debug) irr_driver->update(dt); +// FIXME hacky hacky FPS reporting +// it should be moved to the right place when on screen display is done +#if 0 + int fps = irr_driver->getDevice()->getVideoDriver()->getFPS(); + bool printFPS = false; + if((fps < minFPS) && (fps > 1)) { // First report seems to be always 1, so not useful + minFPS = fps; + printFPS = true; + } + if(fps > maxFPS) { + maxFPS = fps; + printFPS = true; + } + if ((lastFPS+5 <= fps) || (lastFPS-5 >= fps)) { + lastFPS = fps; + printFPS = true; + } + // First print per run will be really silly, as in 999 1 1, just ignore it ;] + if (printFPS) printf("FPS %3d<%3d<%3d\n", minFPS, fps, maxFPS); +#endif #else glFlush(); SDL_GL_SwapBuffers(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mbj...@us...> - 2009-03-31 18:04:07
|
Revision: 3330 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=3330&view=rev Author: mbjornstk Date: 2009-03-31 18:04:04 +0000 (Tue, 31 Mar 2009) Log Message: ----------- Small logic changes to the FPS reporting, only update if FPS>1. Still disabled, but at least nobody would say there is a bug like min FPS being 999. Modified Paths: -------------- main/branches/irrlicht/src/main_loop.cpp Modified: main/branches/irrlicht/src/main_loop.cpp =================================================================== --- main/branches/irrlicht/src/main_loop.cpp 2009-03-31 16:03:12 UTC (rev 3329) +++ main/branches/irrlicht/src/main_loop.cpp 2009-03-31 18:04:04 UTC (rev 3330) @@ -222,19 +222,23 @@ #if 0 int fps = irr_driver->getDevice()->getVideoDriver()->getFPS(); bool printFPS = false; - if((fps < minFPS) && (fps > 1)) { // First report seems to be always 1, so not useful - minFPS = fps; - printFPS = true; - } - if(fps > maxFPS) { - maxFPS = fps; - printFPS = true; - } - if ((lastFPS+5 <= fps) || (lastFPS-5 >= fps)) { - lastFPS = fps; - printFPS = true; - } - // First print per run will be really silly, as in 999 1 1, just ignore it ;] + // First reports seem to be always 1, so not useful + if (fps > 1) { + // More than +-5 range is interesting to report (otherwise noise) + if ((lastFPS+5 <= fps) || (lastFPS-5 >= fps)) { + lastFPS = fps; + printFPS = true; + } + // Min and max are worth updating any time they happen + if (fps < minFPS) { + minFPS = fps; + printFPS = true; + } + if (fps > maxFPS) { + maxFPS = fps; + printFPS = true; + } + } // no else, or you get over 50 'printf ("FPS below 1!\n")' easily if (printFPS) printf("FPS %3d<%3d<%3d\n", minFPS, fps, maxFPS); #endif #else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mbj...@us...> - 2009-04-05 00:29:04
|
Revision: 3362 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=3362&view=rev Author: mbjornstk Date: 2009-04-05 00:28:50 +0000 (Sun, 05 Apr 2009) Log Message: ----------- Only check FPS while gaming, so menus do not make maxFPS useless. Modified Paths: -------------- main/branches/irrlicht/src/main_loop.cpp Modified: main/branches/irrlicht/src/main_loop.cpp =================================================================== --- main/branches/irrlicht/src/main_loop.cpp 2009-04-05 00:16:52 UTC (rev 3361) +++ main/branches/irrlicht/src/main_loop.cpp 2009-04-05 00:28:50 UTC (rev 3362) @@ -225,7 +225,7 @@ int fps = irr_driver->getDevice()->getVideoDriver()->getFPS(); bool printFPS = false; // First reports seem to be always 1, so not useful - if (fps > 1) { + if ((race_manager->raceIsActive()) && (fps > 1)) { // More than +-5 range is interesting to report (otherwise noise) if ((lastFPS+5 <= fps) || (lastFPS-5 >= fps)) { lastFPS = fps; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <au...@us...> - 2009-04-12 18:22:58
|
Revision: 3385 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=3385&view=rev Author: auria Date: 2009-04-12 18:22:54 +0000 (Sun, 12 Apr 2009) Log Message: ----------- fixed warning Modified Paths: -------------- main/branches/irrlicht/src/main_loop.cpp Modified: main/branches/irrlicht/src/main_loop.cpp =================================================================== --- main/branches/irrlicht/src/main_loop.cpp 2009-04-12 11:20:13 UTC (rev 3384) +++ main/branches/irrlicht/src/main_loop.cpp 2009-04-12 18:22:54 UTC (rev 3385) @@ -57,14 +57,12 @@ //----------------------------------------------------------------------------- void MainLoop::loadBackgroundImages() { +#ifndef HAVE_IRRLICHT int ind = user_config->getBackgroundIndex(); const std::string &main = stk_config->getMainMenuPicture(ind); -#ifndef HAVE_IRRLICHT m_title_screen_texture = material_manager->getMaterial(main)->getState()->getTextureHandle(); -#endif const std::string &background = stk_config->getBackgroundPicture(ind); -#ifndef HAVE_IRRLICHT m_bg_texture = material_manager->getMaterial(background)->getState()->getTextureHandle(); #endif } // loadBackgroundImages This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hik...@us...> - 2009-06-29 03:38:50
|
Revision: 3677 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=3677&view=rev Author: hikerstk Date: 2009-06-29 03:38:48 +0000 (Mon, 29 Jun 2009) Log Message: ----------- Removed compiler warning. Modified Paths: -------------- main/branches/irrlicht/src/main_loop.cpp Modified: main/branches/irrlicht/src/main_loop.cpp =================================================================== --- main/branches/irrlicht/src/main_loop.cpp 2009-06-29 01:40:15 UTC (rev 3676) +++ main/branches/irrlicht/src/main_loop.cpp 2009-06-29 03:38:48 UTC (rev 3677) @@ -84,7 +84,7 @@ // the noise the fan on a graphics card makes. // When in menus, reduce FPS much, it's not necessary to push to the maximum for plain menus const int max_fps = StateManager::isGameState() ? UserConfigParams::m_max_fps : 35; - const int current_fps = 1000/dt; + const int current_fps = (int)(1000.0f/dt); if( current_fps > max_fps ) { int wait_time = 1000/max_fps - 1000/current_fps; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |