From f083765d6958bd5a9666913e9460d4c0be8a9f0c Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 25 Jan 2005 18:22:22 +0000 Subject: [PATCH] remove ProTimingDisplay; too hard to read to be useful --- stepmania/src/Makefile.am | 2 +- stepmania/src/Player.cpp | 15 +----- stepmania/src/Player.h | 2 - stepmania/src/PlayerOptions.cpp | 5 -- stepmania/src/PlayerOptions.h | 1 - stepmania/src/ProTimingDisplay.cpp | 79 ------------------------------ stepmania/src/ProTimingDisplay.h | 43 ---------------- stepmania/src/StepMania.dsp | 18 ++----- stepmania/src/StepMania.vcproj | 6 --- 9 files changed, 7 insertions(+), 164 deletions(-) delete mode 100644 stepmania/src/ProTimingDisplay.cpp delete mode 100644 stepmania/src/ProTimingDisplay.h diff --git a/stepmania/src/Makefile.am b/stepmania/src/Makefile.am index e971bfb077..57bce9ff57 100644 --- a/stepmania/src/Makefile.am +++ b/stepmania/src/Makefile.am @@ -218,7 +218,7 @@ GhostArrowRow.cpp GhostArrowRow.h HoldGhostArrow.cpp HoldGhostArrow.h HoldJudgme Judgment.cpp Judgment.h LifeMeter.h LifeMeterBar.cpp LifeMeterBar.h LifeMeterBattery.cpp LifeMeterBattery.h \ LyricDisplay.cpp LyricDisplay.h NoteDisplay.cpp NoteDisplay.h NoteField.cpp NoteField.h \ PercentageDisplay.cpp PercentageDisplay.h Player.cpp Player.h \ -ProTimingDisplay.cpp ProTimingDisplay.h ReceptorArrow.cpp ReceptorArrow.h ReceptorArrowRow.cpp ReceptorArrowRow.h \ +ReceptorArrow.cpp ReceptorArrow.h ReceptorArrowRow.cpp ReceptorArrowRow.h \ ScoreDisplay.cpp ScoreDisplay.h ScoreDisplayBattle.cpp ScoreDisplayBattle.h \ ScoreDisplayNormal.cpp ScoreDisplayNormal.h ScoreDisplayOni.cpp ScoreDisplayOni.h \ ScoreDisplayPercentage.cpp ScoreDisplayPercentage.h ScoreDisplayRave.cpp ScoreDisplayRave.h diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp index 9ab3ac89a8..4b906ced30 100644 --- a/stepmania/src/Player.cpp +++ b/stepmania/src/Player.cpp @@ -78,7 +78,6 @@ Player::Player() m_iOffsetSample = 0; this->AddChild( &m_Judgment ); - this->AddChild( &m_ProTimingDisplay ); this->AddChild( &m_Combo ); this->AddChild( &m_AttackDisplay ); for( int c=0; ciTotalError += ms_error; - if( hns == HNS_NG ) /* don't show a 0 for an OK */ - m_ProTimingDisplay.SetJudgment( ms_error, TNS_MISS ); } tn.HoldResult.fLife = fLife; @@ -590,10 +585,7 @@ void Player::DrawTapJudgments() if( m_pPlayerState->m_PlayerOptions.m_fBlind > 0 ) return; - if( m_pPlayerState->m_PlayerOptions.m_bProTiming ) - m_ProTimingDisplay.Draw(); - else - m_Judgment.Draw(); + m_Judgment.Draw(); } void Player::DrawHoldJudgments() @@ -915,8 +907,6 @@ void Player::Step( int col, RageTimer tm ) if( m_pPlayerStageStats ) m_pPlayerStageStats->iTotalError += ms_error; - if (!m_pPlayerState->m_PlayerOptions.m_fBlind) - m_ProTimingDisplay.SetJudgment( ms_error, score ); } if( score==TNS_MARVELOUS && !GAMESTATE->ShowMarvelous()) @@ -1133,10 +1123,7 @@ void Player::UpdateTapNotesMissedOlderThan( float fMissIfOlderThanSeconds ) m_NoteData.SetTapNote( t, r, tn ); if( m_pPlayerStageStats ) - { m_pPlayerStageStats->iTotalError += MAX_PRO_TIMING_ERROR; - m_ProTimingDisplay.SetJudgment( MAX_PRO_TIMING_ERROR, TNS_MISS ); - } } if( MissedNoteOnThisRow ) diff --git a/stepmania/src/Player.h b/stepmania/src/Player.h index bda0728d87..aad9895f9e 100644 --- a/stepmania/src/Player.h +++ b/stepmania/src/Player.h @@ -9,7 +9,6 @@ #include "Combo.h" #include "NoteDataWithScoring.h" #include "RageTimer.h" -#include "ProTimingDisplay.h" #include "RageSound.h" #include "AttackDisplay.h" #include "NoteField.h" @@ -82,7 +81,6 @@ protected: HoldJudgment m_HoldJudgment[MAX_NOTE_TRACKS]; Judgment m_Judgment; - ProTimingDisplay m_ProTimingDisplay; Combo m_Combo; diff --git a/stepmania/src/PlayerOptions.cpp b/stepmania/src/PlayerOptions.cpp index bc7d96a959..f0592f9f4a 100644 --- a/stepmania/src/PlayerOptions.cpp +++ b/stepmania/src/PlayerOptions.cpp @@ -32,7 +32,6 @@ void PlayerOptions::Init() m_fRandomSpeed = 0; m_SpeedfRandomSpeed = 1.0f; ZERO( m_bTurns ); ZERO( m_bTransforms ); - m_bProTiming = false; m_ScoreDisplay = SCORING_ADD; m_sNoteSkin = "default"; } @@ -158,8 +157,6 @@ CString PlayerOptions::GetString() const if( m_bTransforms[TRANSFORM_NOHANDS] ) sReturn += "NoHands, "; if( m_bTransforms[TRANSFORM_NOQUADS] ) sReturn += "NoQuads, "; - if( m_bProTiming ) sReturn += "ProTiming, "; - if( m_fSkew==1 && m_fPerspectiveTilt==-1 ) sReturn += "Incoming, "; else if( m_fSkew==1 && m_fPerspectiveTilt==+1 ) @@ -295,7 +292,6 @@ void PlayerOptions::FromString( CString sOptions ) else if( sBit == "blind" ) SET_FLOAT( fBlind ) else if( sBit == "cover" ) SET_FLOAT( fCover ) else if( sBit == "passmark" ) SET_FLOAT( fPassmark ) - else if( sBit == "protiming") m_bProTiming = on; else if( sBit == "overhead" ) { m_fSkew = 0; m_fPerspectiveTilt = 0; m_SpeedfSkew = m_SpeedfPerspectiveTilt = speed; } else if( sBit == "incoming" ) { m_fSkew = level; m_fPerspectiveTilt = -level; m_SpeedfSkew = m_SpeedfPerspectiveTilt = speed; } else if( sBit == "space" ) { m_fSkew = level; m_fPerspectiveTilt = +level; m_SpeedfSkew = m_SpeedfPerspectiveTilt = speed; } @@ -518,7 +514,6 @@ bool PlayerOptions::operator==( const PlayerOptions &other ) const COMPARE(m_fDark); COMPARE(m_fBlind); COMPARE(m_fCover); - COMPARE(m_bProTiming); COMPARE(m_fPerspectiveTilt); COMPARE(m_fSkew); COMPARE(m_sNoteSkin); diff --git a/stepmania/src/PlayerOptions.h b/stepmania/src/PlayerOptions.h index 322b274fe2..d08cc8f24f 100644 --- a/stepmania/src/PlayerOptions.h +++ b/stepmania/src/PlayerOptions.h @@ -124,7 +124,6 @@ struct PlayerOptions bool m_bTurns[NUM_TURNS]; bool m_bTransforms[NUM_TRANSFORMS]; - bool m_bProTiming; ScoreDisplay m_ScoreDisplay; CString m_sNoteSkin; diff --git a/stepmania/src/ProTimingDisplay.cpp b/stepmania/src/ProTimingDisplay.cpp deleted file mode 100644 index 568d9cf7c9..0000000000 --- a/stepmania/src/ProTimingDisplay.cpp +++ /dev/null @@ -1,79 +0,0 @@ -#include "global.h" -#include "ProTimingDisplay.h" -#include "ThemeManager.h" -#include "RageUtil.h" -#include "ThemeMetric.h" - -static const ThemeMetric MARVELOUS_COMMAND ("ProTimingDisplay","MarvelousCommand"); -static const ThemeMetric PERFECT_COMMAND ("ProTimingDisplay","PerfectCommand"); -static const ThemeMetric GREAT_COMMAND ("ProTimingDisplay","GreatCommand"); -static const ThemeMetric GOOD_COMMAND ("ProTimingDisplay","GoodCommand"); -static const ThemeMetric BOO_COMMAND ("ProTimingDisplay","BooCommand"); -static const ThemeMetric MISS_COMMAND ("ProTimingDisplay","MissCommand"); -static const ThemeMetric HIT_MINE_COMMAND ("ProTimingDisplay","HitMineCommand"); - -static const ThemeMetric *g_Commands[NUM_TAP_NOTE_SCORES] = -{ - NULL, /* no TNS_NONE */ - &HIT_MINE_COMMAND, - &MISS_COMMAND, - &BOO_COMMAND, - &GOOD_COMMAND, - &GREAT_COMMAND, - &PERFECT_COMMAND, - &MARVELOUS_COMMAND -}; - -ProTimingDisplay::ProTimingDisplay() -{ - m_Judgment.LoadFromFont( THEME->GetPathF("ProTimingDisplay","Judgment") ); - m_Judgment.SetName( "Judgment" ); - this->AddChild( &m_Judgment ); -} - -void ProTimingDisplay::Reset() -{ - m_Judgment.SetText(""); - - m_Judgment.SetDiffuse( RageColor(1,1,1,0) ); - m_Judgment.SetXY( 0, 0 ); - m_Judgment.StopTweening(); - m_Judgment.SetEffectNone(); -} - -void ProTimingDisplay::SetJudgment( int ms, TapNoteScore score ) -{ - Reset(); - - m_Judgment.SetText( ssprintf("%i", ms) ); - - ASSERT( score != TNS_NONE ); - ASSERT( score < NUM_TAP_NOTE_SCORES ); - - m_Judgment.RunCommands( *g_Commands[score] ); -} - -/* - * (c) 2001-2003 Glenn Maynard, Chris Danford - * 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. - */ diff --git a/stepmania/src/ProTimingDisplay.h b/stepmania/src/ProTimingDisplay.h deleted file mode 100644 index b395ce441a..0000000000 --- a/stepmania/src/ProTimingDisplay.h +++ /dev/null @@ -1,43 +0,0 @@ -#ifndef PRO_TIMING_DISPLAY_H -#define PRO_TIMING_DISPLAY_H - -#include "ActorFrame.h" -#include "BitmapText.h" -#include "GameConstantsAndTypes.h" - -class ProTimingDisplay: public ActorFrame -{ - BitmapText m_Judgment; - -public: - ProTimingDisplay(); - void SetJudgment( int ms, TapNoteScore score ); - void Reset(); -}; - -#endif - -/* - * (c) 2001-2003 Glenn Maynard, Chris Danford - * 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. - */ diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp index 0d532f3745..a7bd78f2cf 100644 --- a/stepmania/src/StepMania.dsp +++ b/stepmania/src/StepMania.dsp @@ -1,5 +1,5 @@ # Microsoft Developer Studio Project File - Name="StepMania" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 60000 +# Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Application" 0x0101 @@ -59,10 +59,10 @@ LINK32=link.exe # SUBTRACT LINK32 /verbose /profile /pdb:none /incremental:no /nodefaultlib # Begin Special Build Tool IntDir=.\../Debug6 -TargetDir=\stepmania\stepmania\Program +TargetDir=\temp\stepmania\Program TargetName=StepMania-debug SOURCE="$(InputPath)" -PreLink_Cmds=archutils\Win32\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ +PreLink_Cmds=archutils\Win32\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ PostBuild_Cmds=archutils\Win32\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi # End Special Build Tool @@ -96,10 +96,10 @@ LINK32=link.exe # SUBTRACT LINK32 /verbose /pdb:none /debug # Begin Special Build Tool IntDir=.\../Release6 -TargetDir=\stepmania\stepmania\Program +TargetDir=\temp\stepmania\Program TargetName=StepMania SOURCE="$(InputPath)" -PreLink_Cmds=archutils\Win32\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ +PreLink_Cmds=archutils\Win32\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ PostBuild_Cmds=archutils\Win32\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi # End Special Build Tool @@ -1974,14 +1974,6 @@ SOURCE=.\Player.h # End Source File # Begin Source File -SOURCE=.\ProTimingDisplay.cpp -# End Source File -# Begin Source File - -SOURCE=.\ProTimingDisplay.h -# End Source File -# Begin Source File - SOURCE=.\ReceptorArrow.cpp # End Source File # Begin Source File diff --git a/stepmania/src/StepMania.vcproj b/stepmania/src/StepMania.vcproj index 9a5ae586e5..fe9982415d 100644 --- a/stepmania/src/StepMania.vcproj +++ b/stepmania/src/StepMania.vcproj @@ -1744,12 +1744,6 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ - - - -