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

make ScreenEdit derive from ScreenWithMenuElements

Browse Source
This commit is contained in:
Chris Danford
2005-03-18 18:58:22 +00:00
parent b497b33aa0
commit db022cd518
2 changed files with 7 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEdit.cpp
+5 -35
View File
@@ -490,7 +490,7 @@ int g_iLastInsertAttackTrack = -1;
float g_fLastInsertAttackDurationSeconds = -1;
REGISTER_SCREEN_CLASS( ScreenEdit );
ScreenEdit::ScreenEdit( CString sName ) : Screen( sName )
ScreenEdit::ScreenEdit( CString sName ) : ScreenWithMenuElements( sName )
{
LOG->Trace( "ScreenEdit::ScreenEdit()" );
@@ -502,7 +502,7 @@ ScreenEdit::ScreenEdit( CString sName ) : Screen( sName )
void ScreenEdit::Init()
{
Screen::Init();
ScreenWithMenuElements::Init();
InitEditMappings();
@@ -558,9 +558,6 @@ void ScreenEdit::Init()
m_NoteFieldEdit.Init( GAMESTATE->m_pPlayerState[PLAYER_1], PLAYER_HEIGHT*2 );
m_NoteFieldEdit.Load( &m_NoteDataEdit, -240, 800 );
m_rectRecordBack.StretchTo( RectF(SCREEN_LEFT, SCREEN_TOP, SCREEN_RIGHT, SCREEN_BOTTOM) );
m_rectRecordBack.SetDiffuse( RageColor(0,0,0,0) );
m_NoteFieldRecord.SetXY( EDIT_X, PLAYER_Y );
m_NoteDataRecord.CopyAll( noteData );
m_NoteFieldRecord.Init( GAMESTATE->m_pPlayerState[PLAYER_1], 350 );
@@ -581,14 +578,6 @@ void ScreenEdit::Init()
GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerController = PC_HUMAN;
m_Player.SetXY( PLAYER_X, PLAYER_Y );
m_In.Load( THEME->GetPathB("ScreenEdit","in") );
m_In.StartTransitioning();
m_Out.Load( THEME->GetPathB("ScreenEdit","out") );
m_sprOverlay.LoadAndSetName( m_sName, "Overlay" );
SET_XY_AND_ON_COMMAND( m_sprOverlay );
m_textHelp.LoadFromFont( THEME->GetPathF("Common","normal") );
m_textHelp.SetXY( HELP_TEXT_X, HELP_TEXT_Y );
m_textHelp.SetHorizAlign( Actor::align_left );
@@ -737,13 +726,9 @@ void ScreenEdit::Update( float fDeltaTime )
m_SnapDisplay.Update( fDeltaTime );
m_NoteFieldEdit.Update( fDeltaTime );
m_In.Update( fDeltaTime );
m_Out.Update( fDeltaTime );
m_sprOverlay->Update( fDeltaTime );
m_textHelp.Update( fDeltaTime );
m_textInfo.Update( fDeltaTime );
m_rectRecordBack.Update( fDeltaTime );
if( m_EditMode == MODE_RECORDING )
m_NoteFieldRecord.Update( fDeltaTime );
@@ -754,7 +739,7 @@ void ScreenEdit::Update( float fDeltaTime )
}
//LOG->Trace( "ScreenEdit::Update(%f)", fDeltaTime );
Screen::Update( fDeltaTime );
ScreenWithMenuElements::Update( fDeltaTime );
// Update trailing beat
@@ -800,8 +785,6 @@ void ScreenEdit::UpdateTextInfo()
void ScreenEdit::DrawPrimitives()
{
// m_rectRecordBack.Draw();
switch( m_EditMode )
{
case MODE_EDITING:
@@ -842,10 +825,7 @@ void ScreenEdit::DrawPrimitives()
ASSERT(0);
}
m_In.Draw();
m_Out.Draw();
Screen::DrawPrimitives();
ScreenWithMenuElements::DrawPrimitives();
}
void ScreenEdit::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
@@ -1477,10 +1457,7 @@ void ScreenEdit::TransitionToEdit()
GAMESTATE->m_bPastHereWeGo = false;
m_soundMusic.StopPlaying();
m_soundAssistTick.StopPlaying(); /* Stop any queued assist ticks. */
m_rectRecordBack.StopTweening();
m_rectRecordBack.BeginTweening( 0.5f );
m_rectRecordBack.SetDiffuse( RageColor(0,0,0,0) );
/* Make sure we're snapped. */
GAMESTATE->m_fSongBeat = Quantize( GAMESTATE->m_fSongBeat, NoteTypeToBeat(m_SnapDisplay.GetNoteType()) );
@@ -2191,9 +2168,6 @@ void ScreenEdit::HandleAreaMenuChoice( AreaMenuChoice c, int* iAnswers )
m_Player.Load( m_NoteDataEdit );
GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerController = PREFSMAN->m_bAutoPlay?PC_AUTOPLAY:PC_HUMAN;
m_rectRecordBack.StopTweening();
m_rectRecordBack.BeginTweening( 0.5f );
m_rectRecordBack.SetDiffuse( RageColor(0,0,0,0.8f) );
const float fStartSeconds = m_pSong->GetElapsedTimeFromBeat(GAMESTATE->m_fSongBeat) ;
LOG->Trace( "Starting playback at %f", fStartSeconds );
@@ -2239,10 +2213,6 @@ void ScreenEdit::HandleAreaMenuChoice( AreaMenuChoice c, int* iAnswers )
m_NoteDataRecord.CopyAll( m_NoteDataEdit );
m_NoteFieldRecord.Load( &m_NoteDataRecord, -150, 350 );
m_rectRecordBack.StopTweening();
m_rectRecordBack.BeginTweening( 0.5f );
m_rectRecordBack.SetDiffuse( RageColor(0,0,0,0.8f) );
GAMESTATE->m_fSongBeat = NoteRowToBeat(m_NoteFieldEdit.m_iBeginMarker - ROWS_PER_MEASURE ); // give a 1 measure lead-in
float fStartSeconds = m_pSong->GetElapsedTimeFromBeat(GAMESTATE->m_fSongBeat);
LOG->Trace( "Starting playback at %f", fStartSeconds );
stepmania/src/ScreenEdit.h
+2 -7
View File
@@ -3,7 +3,7 @@
#ifndef SCREEN_EDIT_H
#define SCREEN_EDIT_H
#include "Screen.h"
#include "ScreenWithMenuElements.h"
#include "Sprite.h"
#include "Transition.h"
#include "BitmapText.h"
@@ -122,7 +122,7 @@ struct MapEditToDI
}
};
class ScreenEdit : public Screen
class ScreenEdit : public ScreenWithMenuElements
{
public:
ScreenEdit( CString sName );
@@ -160,7 +160,6 @@ protected:
NoteData m_NoteDataEdit;
SnapDisplay m_SnapDisplay;
AutoActor m_sprOverlay;
BitmapText m_textHelp;
BitmapText m_textInfo; // status information that changes
@@ -176,9 +175,6 @@ protected:
RageSound m_soundChangeSnap;
RageSound m_soundMarker;
Transition m_In;
Transition m_Out;
// used for reverting
void CopyToLastSave();
void CopyFromLastSave();
@@ -201,7 +197,6 @@ protected:
// for MODE_RECORD and MODE_PLAY
Quad m_rectRecordBack;
RageSound m_soundMusic;
RageSound m_soundAssistTick;