From 70e386192b432edfd67da492211084a5da9fd673 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 14 Jan 2003 21:58:01 +0000 Subject: [PATCH] err, commit cumulative-FPS display --- stepmania/src/RageDisplay.cpp | 2 +- stepmania/src/ScreenManager.cpp | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/stepmania/src/RageDisplay.cpp b/stepmania/src/RageDisplay.cpp index fd4db729e6..1aba9019da 100644 --- a/stepmania/src/RageDisplay.cpp +++ b/stepmania/src/RageDisplay.cpp @@ -68,7 +68,7 @@ void GetGLExtensions(set &ext) 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; SDL_InitSubSystem(SDL_INIT_VIDEO); diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp index 2ced3f1330..2c9b89e917 100644 --- a/stepmania/src/ScreenManager.cpp +++ b/stepmania/src/ScreenManager.cpp @@ -137,9 +137,10 @@ void ScreenManager::Draw() { /* If FPS == 0, we don't have stats yet. */ m_textStats.SetText( ssprintf(DISPLAY->GetFPS()? - "%i FPS\n%i VPF": - "-- FPS\n-- VPF", - DISPLAY->GetFPS(), DISPLAY->GetVPF()) ); + "%i FPS\n%i av FPS\n%i VPF": + "-- FPS\n-- av FPS\n-- VPF", + DISPLAY->GetFPS(), DISPLAY->GetCumFPS(), + DISPLAY->GetVPF()) ); m_textStats.Draw(); } @@ -187,6 +188,8 @@ void ScreenManager::Input( const DeviceInput& DeviceI, const InputEventType type #include "ScreenSongOptions.h" #include "ScreenStage.h" #include "ScreenTest.h" +#include "ScreenTestFonts.h" +#include "ScreenTestSound.h" #include "ScreenTitleMenu.h" #include "ScreenEz2SelectMusic.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, "ScreenStage") ) ret = new ScreenStage; 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, "ScreenEz2SelectMusic") ) ret = new ScreenEz2SelectMusic; else if( 0==stricmp(sClassName, "ScreenWarning") ) ret = new ScreenWarning;