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

move stats and skips into ScreenStatsOverlay

Browse Source
This commit is contained in:
Chris Danford
2005-10-04 06:02:18 +00:00
parent 4f4738c04c
commit 7cb3a12722
10 changed files with 254 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Makefile.am
+1
View File
@@ -60,6 +60,7 @@ ScreenPrompt.cpp ScreenPrompt.h ScreenRanking.cpp ScreenRanking.h \
ScreenReloadSongs.cpp ScreenReloadSongs.h \
ScreenSandbox.cpp ScreenSandbox.h \
ScreenSaveSync.cpp ScreenSaveSync.h \
ScreenStatsOverlay.cpp ScreenStatsOverlay.h \
ScreenSelect.cpp ScreenSelect.h ScreenSelectCharacter.cpp ScreenSelectCharacter.h \
ScreenSelectDifficulty.cpp ScreenSelectDifficulty.h ScreenSelectGroup.cpp ScreenSelectGroup.h \
ScreenSelectMaster.cpp ScreenSelectMaster.h ScreenSelectMode.cpp ScreenSelectMode.h \
stepmania/src/ScreenStatsOverlay.cpp
+173
View File
@@ -0,0 +1,173 @@
#include "global.h"
#include "ScreenStatsOverlay.h"
#include "ActorUtil.h"
#include "PrefsManager.h"
#include "RageDisplay.h"
#include "RageLog.h"
#include "ScreenDimensions.h"
REGISTER_SCREEN_CLASS( ScreenStatsOverlay );
ScreenStatsOverlay::ScreenStatsOverlay( const CString &sName ) : Screen(sName)
{
}
ScreenStatsOverlay::~ScreenStatsOverlay()
{
}
void ScreenStatsOverlay::Init()
{
Screen::Init();
m_textStats.LoadFromFont( THEME->GetPathF(m_sName,"stats") );
m_textStats.SetName( "Stats" );
SET_XY_AND_ON_COMMAND( m_textStats );
this->AddChild( &m_textStats );
/* "Was that a skip?" This displays a message when an update takes
* abnormally long, to quantify skips more precisely, verify them
* when they're subtle, and show the time it happened, so you can pinpoint
* the time in the log. */
m_LastSkip = 0;
const float SKIP_X = SCREEN_RIGHT - 100;
const float SKIP_Y = SCREEN_BOTTOM - 100;
const float SKIP_WIDTH = 190;
const float SKIP_SPACING_Y = 14;
RectF rectSkips = RectF(
SKIP_X-SKIP_WIDTH/2,
SKIP_Y-(SKIP_SPACING_Y*NUM_SKIPS_TO_SHOW)/2 - 10,
SKIP_X+SKIP_WIDTH/2,
SKIP_Y+(SKIP_SPACING_Y*NUM_SKIPS_TO_SHOW)/2 + 10
);
m_quadSkipBackground.StretchTo( rectSkips );
m_quadSkipBackground.SetDiffuse( RageColor(0,0,0,0.4f) );
this->AddChild(&m_quadSkipBackground);
for( int i=0; i<NUM_SKIPS_TO_SHOW; i++ )
{
/* This is somewhat big. Let's put it on the right side, where it'll
* obscure the 2P side during gameplay; there's nowhere to put it that
* doesn't obscure something, and it's just a diagnostic. */
m_textSkips[i].LoadFromFont( THEME->GetPathF("Common","normal") );
m_textSkips[i].SetX( SKIP_X );
m_textSkips[i].SetY(
SCALE( i, 0, NUM_SKIPS_TO_SHOW-1, rectSkips.top + 10, rectSkips.bottom - 10 )
);
m_textSkips[i].SetZoom( 0.6f );
m_textSkips[i].SetDiffuse( RageColor(1,1,1,0) );
m_textSkips[i].SetShadowLength( 0 );
this->AddChild( &m_textSkips[i] );
}
this->SubscribeToMessage( "ShowStatsChanged" );
}
void ScreenStatsOverlay::Update( float fDeltaTime )
{
Screen::Update(fDeltaTime);
static bool bShowStatsWasOn = false;
if( PREFSMAN->m_bShowStats && !bShowStatsWasOn )
{
// Reset skip timer when we toggle Stats on so we don't show a large skip
// from the span when stats were turned off.
m_timerSkip.Touch();
}
bShowStatsWasOn = PREFSMAN->m_bShowStats;
this->SetVisible( PREFSMAN->m_bShowStats );
if( PREFSMAN->m_bShowStats )
{
m_textStats.SetText( DISPLAY->GetStats() );
UpdateSkips();
}
}
void ScreenStatsOverlay::AddTimestampLine( const CString &txt, const RageColor &color )
{
m_textSkips[m_LastSkip].SetText( txt );
m_textSkips[m_LastSkip].StopTweening();
m_textSkips[m_LastSkip].SetDiffuse( RageColor(1,1,1,1) );
m_textSkips[m_LastSkip].BeginTweening( 0.2f );
m_textSkips[m_LastSkip].SetDiffuse( color );
m_textSkips[m_LastSkip].BeginTweening( 3.0f );
m_textSkips[m_LastSkip].BeginTweening( 0.2f );
m_textSkips[m_LastSkip].SetDiffuse( RageColor(1,1,1,0) );
m_LastSkip++;
m_LastSkip %= NUM_SKIPS_TO_SHOW;
}
void ScreenStatsOverlay::UpdateSkips()
{
/* Use our own timer, so we ignore `/tab. */
const float UpdateTime = m_timerSkip.GetDeltaTime();
/* FPS is 0 for a little while after we load a screen; don't report
* during this time. Do clear the timer, though, so we don't report
* a big "skip" after this period passes. */
if( !DISPLAY->GetFPS() )
return;
/* We want to display skips. We expect to get updates of about 1.0/FPS ms. */
const float ExpectedUpdate = 1.0f / DISPLAY->GetFPS();
/* These are thresholds for severity of skips. The smallest
* is slightly above expected, to tolerate normal jitter. */
const float Thresholds[] =
{
ExpectedUpdate * 2.0f, ExpectedUpdate * 4.0f, 0.1f, -1
};
int skip = 0;
while( Thresholds[skip] != -1 && UpdateTime > Thresholds[skip] )
skip++;
if( skip )
{
CString time(SecondsToMMSSMsMs(RageTimer::GetTimeSinceStartFast()));
static const RageColor colors[] =
{
RageColor(0,0,0,0), /* unused */
RageColor(1.0f,1.0f,1.0f,1), /* white*/
RageColor(1.0f,1.0f,0.0f,1), /* yellow */
RageColor(1.0f,0.4f,0.4f,1) /* light red */
};
AddTimestampLine( ssprintf("%s: %.0fms (%.0f)", time.c_str(), 1000*UpdateTime, UpdateTime/ExpectedUpdate), colors[skip] );
if( PREFSMAN->m_bLogSkips )
LOG->Trace( "Frame skip: %.0fms (%.0f)", 1000*UpdateTime, UpdateTime/ExpectedUpdate );
}
}
/*
* (c) 2001-2005 Chris Danford, Glenn Maynard
* All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, and/or sell copies of the Software, and to permit persons to
* whom the Software is furnished to do so, provided that the above
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
* OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
stepmania/src/ScreenStatsOverlay.h
+58
View File
@@ -0,0 +1,58 @@
/* ScreenStatsOverlay - credits and statistics drawn on top of everything else. */
#ifndef ScreenStatsOverlay_H
#define ScreenStatsOverlay_H
#include "Screen.h"
#include "BitmapText.h"
#include "Quad.h"
const int NUM_SKIPS_TO_SHOW = 5;
class ScreenStatsOverlay : public Screen
{
public:
ScreenStatsOverlay( const CString &sName );
virtual ~ScreenStatsOverlay();
virtual void Init();
void Update( float fDeltaTime );
private:
void AddTimestampLine( const CString &txt, const RageColor &color );
void UpdateSkips();
BitmapText m_textStats;
Quad m_quadSkipBackground;
BitmapText m_textSkips[NUM_SKIPS_TO_SHOW];
RageTimer m_timerSkip;
int m_LastSkip;
};
#endif
/*
* (c) 2001-2005 Chris Danford, Glenn Maynard
* All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, and/or sell copies of the Software, and to permit persons to
* whom the Software is furnished to do so, provided that the above
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
* OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
stepmania/src/ScreenSystemLayer.cpp
-118
View File
@@ -46,42 +46,9 @@ void ScreenSystemLayer::Init()
Screen::Init();
this->AddChild(&m_textMessage);
this->AddChild(&m_textStats);
this->AddChild(&m_textTime);
FOREACH_PlayerNumber( p )
this->AddChild(&m_textCredits[p]);
/* "Was that a skip?" This displays a message when an update takes
* abnormally long, to quantify skips more precisely, verify them
* when they're subtle, and show the time it happened, so you can pinpoint
* the time in the log. Put a dim quad behind it to make it easier to
* read. */
m_LastSkip = 0;
const float SKIP_LEFT = 320.0f, SKIP_TOP = 60.0f,
SKIP_WIDTH = 160.0f, SKIP_Y_DIST = 16.0f;
m_quadSkipBackground.StretchTo(RectF(SKIP_LEFT-8, SKIP_TOP-8,
SKIP_LEFT+SKIP_WIDTH, SKIP_TOP+SKIP_Y_DIST*NUM_SKIPS_TO_SHOW));
m_quadSkipBackground.SetDiffuse( RageColor(0,0,0,0.4f) );
m_quadSkipBackground.SetHidden( !PREFSMAN->m_bTimestamping );
this->AddChild(&m_quadSkipBackground);
for( int i=0; i<NUM_SKIPS_TO_SHOW; i++ )
{
/* This is somewhat big. Let's put it on the right side, where it'll
* obscure the 2P side during gameplay; there's nowhere to put it that
* doesn't obscure something, and it's just a diagnostic. */
m_textSkips[i].LoadFromFont( THEME->GetPathF("Common","normal") );
m_textSkips[i].SetXY( SKIP_LEFT, SKIP_TOP + SKIP_Y_DIST*i );
m_textSkips[i].SetHorizAlign( Actor::align_left );
m_textSkips[i].SetVertAlign( Actor::align_top );
m_textSkips[i].SetZoom( 0.5f );
m_textSkips[i].SetDiffuse( RageColor(1,1,1,0) );
m_textSkips[i].SetShadowLength( 0 );
this->AddChild(&m_textSkips[i]);
}
m_quadBrightnessAdd.StretchTo( RectF(SCREEN_LEFT,SCREEN_TOP,SCREEN_RIGHT,SCREEN_BOTTOM) );
m_quadBrightnessAdd.SetDiffuse( RageColor(1,1,1,PREFSMAN->m_fBrightnessAdd) );
m_quadBrightnessAdd.SetHidden( PREFSMAN->m_fBrightnessAdd == 0 );
@@ -110,14 +77,6 @@ void ScreenSystemLayer::ReloadCreditsText()
SET_XY_AND_ON_COMMAND( m_textMessage );
m_textMessage.SetHidden( true );
m_textStats.LoadFromFont( THEME->GetPathF(m_sName,"stats") );
m_textStats.SetName( "Stats" );
SET_XY_AND_ON_COMMAND( m_textStats );
m_textTime.LoadFromFont( THEME->GetPathF(m_sName,"time") );
m_textTime.SetName( "Time" );
m_textTime.SetHidden( !PREFSMAN->m_bTimestamping );
SET_XY_AND_ON_COMMAND( m_textTime );
FOREACH_PlayerNumber( p )
{
@@ -267,86 +226,9 @@ void ScreenSystemLayer::HandleMessage( const CString &sMessage )
Screen::HandleMessage( sMessage );
}
void ScreenSystemLayer::AddTimestampLine( const CString &txt, const RageColor &color )
{
m_textSkips[m_LastSkip].SetText( txt );
m_textSkips[m_LastSkip].StopTweening();
m_textSkips[m_LastSkip].SetDiffuse( RageColor(1,1,1,1) );
m_textSkips[m_LastSkip].BeginTweening( 0.2f );
m_textSkips[m_LastSkip].SetDiffuse( color );
m_textSkips[m_LastSkip].BeginTweening( 3.0f );
m_textSkips[m_LastSkip].BeginTweening( 0.2f );
m_textSkips[m_LastSkip].SetDiffuse( RageColor(1,1,1,0) );
m_LastSkip++;
m_LastSkip %= NUM_SKIPS_TO_SHOW;
}
void ScreenSystemLayer::UpdateSkips()
{
if( !PREFSMAN->m_bTimestamping && !PREFSMAN->m_bLogSkips )
return;
/* Use our own timer, so we ignore `/tab. */
const float UpdateTime = SkipTimer.GetDeltaTime();
/* FPS is 0 for a little while after we load a screen; don't report
* during this time. Do clear the timer, though, so we don't report
* a big "skip" after this period passes. */
if( !DISPLAY->GetFPS() )
return;
/* We want to display skips. We expect to get updates of about 1.0/FPS ms. */
const float ExpectedUpdate = 1.0f / DISPLAY->GetFPS();
/* These are thresholds for severity of skips. The smallest
* is slightly above expected, to tolerate normal jitter. */
const float Thresholds[] =
{
ExpectedUpdate * 2.0f, ExpectedUpdate * 4.0f, 0.1f, -1
};
int skip = 0;
while( Thresholds[skip] != -1 && UpdateTime > Thresholds[skip] )
skip++;
if( skip )
{
CString time(SecondsToMMSSMsMs(RageTimer::GetTimeSinceStartFast()));
static const RageColor colors[] =
{
RageColor(0,0,0,0), /* unused */
RageColor(0.2f,0.2f,1,1), /* light blue */
RageColor(1,1,0,1), /* yellow */
RageColor(1,0.2f,0.2f,1) /* light red */
};
if( PREFSMAN->m_bTimestamping )
AddTimestampLine( ssprintf("%s: %.0fms (%.0f)", time.c_str(), 1000*UpdateTime, UpdateTime/ExpectedUpdate), colors[skip] );
if( PREFSMAN->m_bLogSkips )
LOG->Trace( "Frame skip: %.0fms (%.0f)", 1000*UpdateTime, UpdateTime/ExpectedUpdate );
}
}
void ScreenSystemLayer::Update( float fDeltaTime )
{
Screen::Update(fDeltaTime);
if( PREFSMAN && (bool)PREFSMAN->m_bShowStats )
{
m_textStats.SetDiffuse( RageColor(1,1,1,0.7f) );
m_textStats.SetText( DISPLAY->GetStats() );
}
else
{
m_textStats.SetDiffuse( RageColor(1,1,1,0) ); /* hide */
}
UpdateSkips();
if( PREFSMAN->m_bTimestamping )
m_textTime.SetText( SecondsToMMSSMsMs(RageTimer::GetTimeSinceStartFast()) );
}
/*
stepmania/src/ScreenSystemLayer.h
-10
View File
@@ -9,8 +9,6 @@
#include "ThemeMetric.h"
#include "AutoActor.h"
const int NUM_SKIPS_TO_SHOW = 5;
class ScreenSystemLayer : public Screen
{
public:
@@ -23,19 +21,11 @@ public:
void Update( float fDeltaTime );
private:
BitmapText m_textStats;
AutoActor m_sprMessageFrame;
BitmapText m_textMessage;
BitmapText m_textCredits[NUM_PLAYERS];
BitmapText m_textTime;
BitmapText m_textSkips[NUM_SKIPS_TO_SHOW];
int m_LastSkip;
Quad m_quadSkipBackground;
Quad m_quadBrightnessAdd;
RageTimer SkipTimer;
void AddTimestampLine( const CString &txt, const RageColor &color );
void UpdateSkips();
CString GetCreditsMessage( PlayerNumber pn ) const;
ThemeMetric<CString> CREDITS_PRESS_START;
stepmania/src/StepMania-net2003.vcproj
+6
View File
@@ -639,6 +639,12 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
<File
RelativePath="ScreenStage.h">
</File>
<File
RelativePath=".\ScreenStatsOverlay.cpp">
</File>
<File
RelativePath=".\ScreenStatsOverlay.h">
</File>
<File
RelativePath="ScreenSyncOverlay.cpp">
</File>
stepmania/src/StepMania.vcproj
+6
View File
@@ -613,6 +613,12 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
<File
RelativePath="ScreenStage.h">
</File>
<File
RelativePath="ScreenStatsOverlay.cpp">
</File>
<File
RelativePath="ScreenStatsOverlay.h">
</File>
<File
RelativePath="ScreenSyncOverlay.cpp">
</File>