From 24cb053e35068d0a3e7a18cb4f7c01becf0a6c1e Mon Sep 17 00:00:00 2001 From: Andrew Livy Date: Tue, 29 Oct 2002 01:26:10 +0000 Subject: [PATCH] ScreenGameplay now has bpm on it for para support (hidden for all gametypes but para via metrics) --- stepmania/TODO.andy | 23 +++++++++++++++-------- stepmania/Themes/default/metrics.ini | 3 +++ stepmania/src/BPMDisplay.cpp | 1 + stepmania/src/SDL_rotozoom.h | 2 +- stepmania/src/ScreenGameplay.cpp | 20 +++++++++++++++++++- stepmania/src/ScreenGameplay.h | 3 ++- stepmania/src/StepMania.dsp | 10 +++++----- 7 files changed, 46 insertions(+), 16 deletions(-) diff --git a/stepmania/TODO.andy b/stepmania/TODO.andy index ee91f2b0c7..86a08ff7d1 100644 --- a/stepmania/TODO.andy +++ b/stepmania/TODO.andy @@ -3,7 +3,14 @@ X denotes task complete or no longer required to do. - denotes task to do, but also being worked upon by other dev. H denotes task on hold. +TODO As of: 07:30:PM 28/10/02 +* Networking Assignment +* Integrating Assignment 1 (nearly finished!) +* Update Menu Graphics for Para +* Update Menu Graphics for Ez2 +* Finish The PUMP Graphics +* Work on Beatmania Support TODO As of: 07:47:PM 12/09/02 @@ -21,16 +28,16 @@ TODO As of: 01:29:AM 04/09/02 X Fix Ez2dancer SelectPlayer Theme Metrics X Try to fix ez2dancer select style. -* Create Ez2dancer style Gameover by making some Gameover Metrics. -* Create Ez2dancer style End Scroll, possibly new class, possibly just metric changes. -* Create Ez2dancer style song select. -* Add Scoreboard System (longterm project) -* Create some kind of metrics so that Ez2dancer may have extra stage the way it should +H Create Ez2dancer style Gameover by making some Gameover Metrics. +H Create Ez2dancer style End Scroll, possibly new class, possibly just metric changes. +H Create Ez2dancer style song select. +H Add Scoreboard System (longterm project) +H Create some kind of metrics so that Ez2dancer may have extra stage the way it should X Fix Ez2dancer type stage screens - Create Ez2dancer type "extra stage" stage screen. -* Modify Gameplay Screen Metrics so that Ez2dancer style screen is more arcade-accurate -* Modify DEMO Play Screen so that Ez2dancer shows each style (double, real, e.t.c.) in the way it should. -* Create Ez2dancer HowToPlay screens. +H Modify Gameplay Screen Metrics so that Ez2dancer style screen is more arcade-accurate +H Modify DEMO Play Screen so that Ez2dancer shows each style (double, real, e.t.c.) in the way it should. +H Create Ez2dancer HowToPlay screens. - Modify Pump Style Select So it is more arcade accurate. - Update the rather tacky graphics. diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 6bab14ff39..4a007d00e3 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -283,6 +283,9 @@ TimerSeconds=60 StageType=0 // 0 for MAX, 1 for Pump, 2 for EZ2 [ScreenGameplay] +BPMX=999 // don't show by default +BPMY=999 +BPMZoom=0.0 LifeFrameX=320 LifeFrameY=36 LifeFrameExtraY=442 diff --git a/stepmania/src/BPMDisplay.cpp b/stepmania/src/BPMDisplay.cpp index e612fadf79..ca55d8d312 100644 --- a/stepmania/src/BPMDisplay.cpp +++ b/stepmania/src/BPMDisplay.cpp @@ -48,6 +48,7 @@ BPMDisplay::BPMDisplay() m_textLabel.TurnShadowOff(); m_textLabel.SetXY( 34, 2 ); m_textLabel.SetText( "BPM" ); +// if(GAMESTATE-> m_textLabel.SetZoom( 0.7f ); m_textLabel.SetZoomX( 0.5f ); m_textLabel.SetDiffuseTopEdge( NORMAL_COLOR_TOP ); // yellow diff --git a/stepmania/src/SDL_rotozoom.h b/stepmania/src/SDL_rotozoom.h index 7b0287b344..0be252a4ac 100644 --- a/stepmania/src/SDL_rotozoom.h +++ b/stepmania/src/SDL_rotozoom.h @@ -15,7 +15,7 @@ extern "C" { #endif -#include +//#include /* VC6 seems to hate this why?? - ANDY */ #ifndef M_PI #define M_PI 3.141592654 #endif diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 872f8bd29b..5658d4e327 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -32,6 +32,9 @@ // Defines // +#define BPM_X THEME->GetMetricF("ScreenGameplay","BPMX") +#define BPM_Y THEME->GetMetricF("ScreenGameplay","BPMY") +#define BPM_ZOOM THEME->GetMetricF("ScreenGameplay","BPMZoom") #define LIFE_FRAME_X THEME->GetMetricF("ScreenGameplay","LifeFrameX") #define LIFE_FRAME_Y( e ) THEME->GetMetricF("ScreenGameplay",ssprintf("LifeFrame%sY",e?"Extra":"")) #define SCORE_FRAME_X THEME->GetMetricF("ScreenGameplay","ScoreFrameX") @@ -146,7 +149,6 @@ ScreenGameplay::ScreenGameplay() } - m_bChangedOffsetOrBPM = (GAMESTATE->m_SongOptions.m_AutoAdjust == SongOptions::ADJUST_ON); @@ -221,6 +223,16 @@ ScreenGameplay::ScreenGameplay() m_textStageNumber.SetText( GAMESTATE->GetStageText() ); m_textStageNumber.SetDiffuse( GAMESTATE->GetStageColor() ); + Song* pSong; + pSong = GAMESTATE->m_pCurSong; + m_BPMDisplay.SetXY( BPM_X, BPM_Y ); + m_BPMDisplay.SetZoom( BPM_ZOOM ); + this->AddChild( &m_BPMDisplay ); + float fMinBPM, fMaxBPM; + pSong->GetMinMaxBPM( fMinBPM, fMaxBPM ); + m_BPMDisplay.SetBPMRange( fMinBPM, fMaxBPM ); + + for( p=0; pGetPathTo("Fonts","Header2") ); @@ -645,6 +657,12 @@ bool ScreenGameplay::PlayTicks() const return bAnyoneHasANote; } +/*********************************** +UPDATE +(had to add this I was LOST in this code +hehe - Andy) +************************************/ + void ScreenGameplay::Update( float fDeltaTime ) { //LOG->Trace( "ScreenGameplay::Update(%f)", fDeltaTime ); diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h index ea15fdd278..29b822d0d8 100644 --- a/stepmania/src/ScreenGameplay.h +++ b/stepmania/src/ScreenGameplay.h @@ -26,7 +26,7 @@ #include "DifficultyIcon.h" #include "TransitionFadeWipe.h" #include "TransitionOniFade.h" - +#include "BPMDisplay.h" // messages sent by Combo const ScreenMessage SM_BeginToasty = ScreenMessage(SM_User+104); @@ -90,6 +90,7 @@ private: BitmapText m_textCourseSongNumber[NUM_PLAYERS]; Sprite m_sprMiddleFrame; + BPMDisplay m_BPMDisplay; Sprite m_sprScoreFrame; ScoreDisplay* m_pScoreDisplay[NUM_PLAYERS]; diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp index 9fc0103656..2c22792411 100644 --- a/stepmania/src/StepMania.dsp +++ b/stepmania/src/StepMania.dsp @@ -57,10 +57,10 @@ LINK32=link.exe # SUBTRACT LINK32 /pdb:none # Begin Special Build Tool IntDir=.\../Release6 -TargetDir=\stepmania\stepmania +TargetDir=\Stepmania\stepmania TargetName=StepMania SOURCE="$(InputPath)" -PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ +PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi # End Special Build Tool @@ -92,10 +92,10 @@ LINK32=link.exe # SUBTRACT LINK32 /profile /pdb:none /incremental:no /nodefaultlib # Begin Special Build Tool IntDir=.\../Debug6 -TargetDir=\stepmania\stepmania +TargetDir=\Stepmania\stepmania TargetName=StepMania-debug SOURCE="$(InputPath)" -PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ +PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi # End Special Build Tool @@ -121,7 +121,7 @@ SOURCE=.\SDL_dither.h # End Source File # Begin Source File -SOURCE=.\SDL_rotozoom.c +SOURCE=.\SDL_rotozoom.cpp # End Source File # Begin Source File