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

optionally show (mostly) synced BGAs in the editor

Browse Source 
(mostly: movies will start correctly but will not seek)
This commit is contained in:
Glenn Maynard
2004-01-23 08:25:00 +00:00
parent d505a60d5a
commit 3c940c997e
4 changed files with 78 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/PrefsManager.cpp
+6
View File
@@ -213,6 +213,8 @@ PrefsManager::PrefsManager()
m_bAllowExtraStage = true;
g_bAutoRestart = false;
m_bEditorShowBGChangesPlay = false;
/* XXX: Set these defaults for individual consoles using VideoCardDefaults.ini. */
#ifdef _XBOX
m_bInterlaced = true;
@@ -485,6 +487,8 @@ void PrefsManager::ReadGlobalPrefsFromDisk()
ini.GetValue( "Options", "AllowExtraStage", m_bAllowExtraStage );
ini.GetValue( "Options", "AutoRestart", g_bAutoRestart );
ini.GetValue( "Editor", "ShowBGChangesPlay", m_bEditorShowBGChangesPlay );
CString sAdditionalSongFolders;
if( ini.GetValue( "Options", "AdditionalSongFolders", sAdditionalSongFolders ) )
{
@@ -695,6 +699,8 @@ void PrefsManager::SaveGlobalPrefsToDisk() const
ini.SetValue( "Options", "AutoRestart", g_bAutoRestart );
ini.SetValue( "Options", "SoundWriteAhead", m_iSoundWriteAhead );
ini.SetValue( "Editor", "ShowBGChangesPlay", m_bEditorShowBGChangesPlay );
/* Only write these if they aren't the default. This ensures that we can change
* the default and have it take effect for everyone (except people who
* tweaked this value). */
stepmania/src/PrefsManager.h
+3
View File
@@ -187,6 +187,9 @@ public:
int m_iAttractSoundFrequency; // 0 = never, 1 = every time
bool m_bAllowExtraStage;
/* Editor prefs: */
bool m_bEditorShowBGChangesPlay;
// course ranking
enum CourseSortOrders { COURSE_SORT_SONGS, COURSE_SORT_METER, COURSE_SORT_METER_SUM, COURSE_SORT_RANK } m_iCourseSortOrder;
bool m_bMoveRandomToEnd;
stepmania/src/ScreenEdit.cpp
+59 -3
View File
@@ -93,7 +93,7 @@ const ScreenMessage SM_BackFromPlayerOptions = (ScreenMessage)(SM_User+7);
const ScreenMessage SM_BackFromSongOptions = (ScreenMessage)(SM_User+8);
const ScreenMessage SM_BackFromInsertAttack = (ScreenMessage)(SM_User+9);
const ScreenMessage SM_BackFromInsertAttackModifiers= (ScreenMessage)(SM_User+10);
const ScreenMessage SM_BackFromPrefs = (ScreenMessage)(SM_User+11);
const CString HELP_TEXT =
"Up/Down:\n change beat\n"
@@ -147,6 +147,7 @@ static const MenuRow g_MainMenuItems[] =
{ "Edit Song Info", true, 0, { NULL } },
{ "Add/Edit BG Change", true, 0, { NULL } },
{ "Play preview music", true, 0, { NULL } },
{ "Preferences", true, 0, { NULL } },
{ "Exit (discards changes since last save)",true, 0, { NULL } },
{ NULL, true, 0, { NULL } }
};
@@ -222,6 +223,13 @@ static const MenuRow g_BGChangeItems[] =
};
static Menu g_BGChange( "Background Change", g_BGChangeItems );
static const MenuRow g_PrefsItems[] =
{
{ "Show BGChanges during Play/Record", true, 0, { "NO","YES" } },
{ NULL, true, 0, { NULL } }
};
static Menu g_Prefs( "Preferences", g_PrefsItems );
static const MenuRow g_InsertAttackItems[] =
{
{ "Duration seconds", true, 3, { "5","10","15","20","25","30","35","40","45" } },
@@ -442,6 +450,12 @@ void ScreenEdit::Update( float fDeltaTime )
if( m_EditMode == MODE_RECORDING || m_EditMode == MODE_PLAYING )
{
if( PREFSMAN->m_bEditorShowBGChangesPlay )
{
m_Background.Update( fDeltaTime );
m_Foreground.Update( fDeltaTime );
}
// check for end of playback/record
if( GAMESTATE->m_fSongBeat > m_NoteFieldEdit.m_fEndMarker + 4 ) // give a one measure lead out
@@ -585,12 +599,24 @@ void ScreenEdit::DrawPrimitives()
}
break;
case MODE_RECORDING:
m_BGAnimation.Draw();
if( PREFSMAN->m_bEditorShowBGChangesPlay )
m_Background.Draw();
else
m_BGAnimation.Draw();
m_NoteFieldRecord.Draw();
if( PREFSMAN->m_bEditorShowBGChangesPlay )
m_Foreground.Draw();
break;
case MODE_PLAYING:
m_BGAnimation.Draw();
if( PREFSMAN->m_bEditorShowBGChangesPlay )
m_Background.Draw();
else
m_BGAnimation.Draw();
m_Player.Draw();
if( PREFSMAN->m_bEditorShowBGChangesPlay )
m_Foreground.Draw();
break;
default:
ASSERT(0);
@@ -1206,6 +1232,10 @@ void ScreenEdit::InputPlay( const DeviceInput& DeviceI, const InputEventType typ
/* Switch to editing. */
void ScreenEdit::TransitionToEdit()
{
/* Important: people will stop playing, change the BG and start again; make sure we reload */
m_Background.Unload();
m_Foreground.Unload();
m_EditMode = MODE_EDITING;
m_soundMusic.StopPlaying();
m_soundAssistTick.StopPlaying(); /* Stop any queued assist ticks. */
@@ -1262,6 +1292,10 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
case SM_BackFromBGChange:
HandleBGChangeChoice( (BGChangeChoice)ScreenMiniMenu::s_iLastLine, ScreenMiniMenu::s_iLastAnswers );
break;
case SM_BackFromPrefs:
PREFSMAN->m_bEditorShowBGChangesPlay = !!ScreenMiniMenu::s_iLastAnswers[pref_show_bgs_play];
PREFSMAN->SaveGlobalPrefsToDisk();
break;
case SM_BackFromPlayerOptions:
case SM_BackFromSongOptions:
// coming back from PlayerOptions or SongOptions
@@ -1499,6 +1533,12 @@ void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, int* iAnswers )
SCREENMAN->MiniMenu( &g_BGChange, SM_BackFromBGChange );
}
break;
case preferences:
g_Prefs.rows[pref_show_bgs_play].defaultChoice = PREFSMAN->m_bEditorShowBGChangesPlay;
SCREENMAN->MiniMenu( &g_Prefs, SM_BackFromPrefs );
break;
case play_preview_music:
PlayPreviewMusic();
break;
@@ -1701,6 +1741,22 @@ void ScreenEdit::HandleAreaMenuChoice( AreaMenuChoice c, int* iAnswers )
const float fStartSeconds = m_pSong->GetElapsedTimeFromBeat(GAMESTATE->m_fSongBeat) ;
LOG->Trace( "Starting playback at %f", fStartSeconds );
if( PREFSMAN->m_bEditorShowBGChangesPlay )
{
/* FirstBeat affects backgrounds, so commit changes to memory (not to disk)
* and recalc it. */
Steps* pNotes = GAMESTATE->m_pCurNotes[PLAYER_1];
ASSERT( pNotes );
pNotes->SetNoteData( &m_NoteFieldEdit );
m_pSong->ReCalculateRadarValuesAndLastBeat();
m_Background.Unload();
m_Background.LoadFromSong( m_pSong );
m_Foreground.Unload();
m_Foreground.LoadFromSong( m_pSong );
}
m_soundMusic.SetPlaybackRate( GAMESTATE->m_SongOptions.m_fMusicRate );
m_soundMusic.SetPositionSeconds( fStartSeconds );
m_soundMusic.StartPlaying();
stepmania/src/ScreenEdit.h
+10
View File
@@ -17,6 +17,8 @@
#include "RageSound.h"
#include "BGAnimation.h"
#include "SnapDisplay.h"
#include "Background.h"
#include "Foreground.h"
const int NUM_ACTION_MENU_ITEMS = 23;
@@ -87,6 +89,8 @@ protected:
// for MODE_PLAY
Player m_Player;
Background m_Background;
Foreground m_Foreground;
// for MODE_RECORD and MODE_PLAY
@@ -107,6 +111,7 @@ public:
edit_song_info,
edit_bg_change,
play_preview_music,
preferences,
exit,
NUM_MAIN_MENU_CHOICES
};
@@ -181,6 +186,11 @@ public:
delete_change,
NUM_BGCHANGE_CHOICES
};
enum PrefsChoice {
pref_show_bgs_play,
NUM_PREFS_CHOICES
};
void HandleBGChangeChoice( BGChangeChoice c, int* iAnswers );
};