actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

err, commit cumulative-FPS display

Browse Source
This commit is contained in:
Glenn Maynard
2003-01-14 21:58:01 +00:00
parent 1258b0c22f
commit 70e386192b
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageDisplay.cpp
+1 -1
View File
@@ -68,7 +68,7 @@ void GetGLExtensions(set<string> &ext)
RageDisplay::RageDisplay( bool windowed, int width, int height, int bpp, int rate, bool vsync ) RageDisplay::RageDisplay( bool windowed, int width, int height, int bpp, int rate, bool vsync )
{ {
// LOG->Trace( "RageDisplay::RageDisplay()" ); LOG->Trace( "RageDisplay::RageDisplay()" );
m_oglspecs = new oglspecs_t; m_oglspecs = new oglspecs_t;
SDL_InitSubSystem(SDL_INIT_VIDEO); SDL_InitSubSystem(SDL_INIT_VIDEO);
stepmania/src/ScreenManager.cpp
+8 -3
View File
@@ -137,9 +137,10 @@ void ScreenManager::Draw()
{ {
/* If FPS == 0, we don't have stats yet. */ /* If FPS == 0, we don't have stats yet. */
m_textStats.SetText( ssprintf(DISPLAY->GetFPS()? m_textStats.SetText( ssprintf(DISPLAY->GetFPS()?
"%i FPS\n%i VPF": "%i FPS\n%i av FPS\n%i VPF":
"-- FPS\n-- VPF", "-- FPS\n-- av FPS\n-- VPF",
DISPLAY->GetFPS(), DISPLAY->GetVPF()) ); DISPLAY->GetFPS(), DISPLAY->GetCumFPS(),
DISPLAY->GetVPF()) );
m_textStats.Draw(); m_textStats.Draw();
} }
@@ -187,6 +188,8 @@ void ScreenManager::Input( const DeviceInput& DeviceI, const InputEventType type
#include "ScreenSongOptions.h" #include "ScreenSongOptions.h"
#include "ScreenStage.h" #include "ScreenStage.h"
#include "ScreenTest.h" #include "ScreenTest.h"
#include "ScreenTestFonts.h"
#include "ScreenTestSound.h"
#include "ScreenTitleMenu.h" #include "ScreenTitleMenu.h"
#include "ScreenEz2SelectMusic.h" #include "ScreenEz2SelectMusic.h"
#include "ScreenWarning.h" #include "ScreenWarning.h"
@@ -234,6 +237,8 @@ Screen* ScreenManager::MakeNewScreen( CString sClassName )
else if( 0==stricmp(sClassName, "ScreenSongOptions") ) ret = new ScreenSongOptions; else if( 0==stricmp(sClassName, "ScreenSongOptions") ) ret = new ScreenSongOptions;
else if( 0==stricmp(sClassName, "ScreenStage") ) ret = new ScreenStage; else if( 0==stricmp(sClassName, "ScreenStage") ) ret = new ScreenStage;
else if( 0==stricmp(sClassName, "ScreenTest") ) ret = new ScreenTest; else if( 0==stricmp(sClassName, "ScreenTest") ) ret = new ScreenTest;
else if( 0==stricmp(sClassName, "ScreenTestFonts") ) ret = new ScreenTestFonts;
else if( 0==stricmp(sClassName, "ScreenTestSound") ) ret = new ScreenTestSound;
else if( 0==stricmp(sClassName, "ScreenTitleMenu") ) ret = new ScreenTitleMenu; else if( 0==stricmp(sClassName, "ScreenTitleMenu") ) ret = new ScreenTitleMenu;
else if( 0==stricmp(sClassName, "ScreenEz2SelectMusic") ) ret = new ScreenEz2SelectMusic; else if( 0==stricmp(sClassName, "ScreenEz2SelectMusic") ) ret = new ScreenEz2SelectMusic;
else if( 0==stricmp(sClassName, "ScreenWarning") ) ret = new ScreenWarning; else if( 0==stricmp(sClassName, "ScreenWarning") ) ret = new ScreenWarning;