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

prefer random backgrounds in /<GroupName>

Browse Source
This commit is contained in:
Chris Danford
2005-03-02 03:20:12 +00:00
parent e4ec896cd7
commit 78d7035b02
2 changed files with 44 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Background.cpp
+42 -30
View File
@@ -213,8 +213,11 @@ Actor *Background::CreateSongBGA( CString sBGName ) const
return NULL; return NULL;
} }
CString Background::CreateRandomBGA() CString Background::CreateRandomBGA( CString sPreferredSubDir )
{ {
if( sPreferredSubDir.Right(1) != "/" )
sPreferredSubDir += '/';
if( PREFSMAN->m_iBackgroundMode == PrefsManager::BGMODE_OFF ) if( PREFSMAN->m_iBackgroundMode == PrefsManager::BGMODE_OFF )
return ""; return "";
@@ -230,34 +233,43 @@ CString Background::CreateRandomBGA()
} }
CStringArray arrayPaths; CStringArray arrayPaths;
switch( PREFSMAN->m_iBackgroundMode ) for( int i=0; i<2; i++ )
{ {
default: switch( PREFSMAN->m_iBackgroundMode )
FAIL_M( ssprintf("Invalid BackgroundMode: %i", (int)PREFSMAN->m_iBackgroundMode) ); {
break; default:
FAIL_M( ssprintf("Invalid BackgroundMode: %i", (int)PREFSMAN->m_iBackgroundMode) );
break;
case PrefsManager::BGMODE_ANIMATIONS: case PrefsManager::BGMODE_ANIMATIONS:
GetDirListing( BG_ANIMS_DIR+"*", arrayPaths, true, true ); GetDirListing( BG_ANIMS_DIR + sPreferredSubDir + "*", arrayPaths, true, true );
break; break;
case PrefsManager::BGMODE_MOVIEVIS: case PrefsManager::BGMODE_MOVIEVIS:
GetDirListing( VISUALIZATIONS_DIR + "*.avi", arrayPaths, false, true ); GetDirListing( VISUALIZATIONS_DIR + sPreferredSubDir + "*.avi", arrayPaths, false, true );
GetDirListing( VISUALIZATIONS_DIR + "*.mpg", arrayPaths, false, true ); GetDirListing( VISUALIZATIONS_DIR + sPreferredSubDir + "*.mpg", arrayPaths, false, true );
GetDirListing( VISUALIZATIONS_DIR + "*.mpeg", arrayPaths, false, true ); GetDirListing( VISUALIZATIONS_DIR + sPreferredSubDir + "*.mpeg", arrayPaths, false, true );
break; break;
case PrefsManager::BGMODE_RANDOMMOVIES: case PrefsManager::BGMODE_RANDOMMOVIES:
GetDirListing( RANDOMMOVIES_DIR + "*.avi", arrayPaths, false, true ); GetDirListing( RANDOMMOVIES_DIR + sPreferredSubDir + "*.avi", arrayPaths, false, true );
GetDirListing( RANDOMMOVIES_DIR + "*.mpg", arrayPaths, false, true ); GetDirListing( RANDOMMOVIES_DIR + sPreferredSubDir + "*.mpg", arrayPaths, false, true );
GetDirListing( RANDOMMOVIES_DIR + "*.mpeg", arrayPaths, false, true ); GetDirListing( RANDOMMOVIES_DIR + sPreferredSubDir + "*.mpeg", arrayPaths, false, true );
break; break;
}
// strip out "cvs"
for( int j=arrayPaths.size()-1; j>=0; j-- )
if( Basename(arrayPaths[j]).CompareNoCase("cvs")==0 )
arrayPaths.erase( arrayPaths.begin()+j, arrayPaths.begin()+j+1 );
if( !arrayPaths.empty() ) // found one
break;
// now search without a subdir
sPreferredSubDir = "";
} }
// strip out "cvs"
for( int j=arrayPaths.size()-1; j>=0; j-- )
if( !Basename(arrayPaths[j]).CompareNoCase("cvs") )
arrayPaths.erase( arrayPaths.begin()+j, arrayPaths.begin()+j+1 );
if( arrayPaths.empty() ) if( arrayPaths.empty() )
return ""; return "";
@@ -300,7 +312,7 @@ CString Background::CreateRandomBGA()
return file; return file;
} }
void Background::LoadFromRandom( float fFirstBeat, float fLastBeat, const TimingData &timing ) void Background::LoadFromRandom( float fFirstBeat, float fLastBeat, const TimingData &timing, CString sPreferredSubDir )
{ {
// change BG every 4 bars // change BG every 4 bars
for( float f=fFirstBeat; f<fLastBeat; f+=BEATS_PER_MEASURE*4 ) for( float f=fFirstBeat; f<fLastBeat; f+=BEATS_PER_MEASURE*4 )
@@ -311,7 +323,7 @@ void Background::LoadFromRandom( float fFirstBeat, float fLastBeat, const Timing
//bool bFade = PREFSMAN->m_BackgroundMode==PrefsManager::BGMODE_RANDOMMOVIES || //bool bFade = PREFSMAN->m_BackgroundMode==PrefsManager::BGMODE_RANDOMMOVIES ||
// PREFSMAN->m_BackgroundMode==PrefsManager::BGMODE_MOVIEVIS; // PREFSMAN->m_BackgroundMode==PrefsManager::BGMODE_MOVIEVIS;
CString sBGName = CreateRandomBGA(); CString sBGName = CreateRandomBGA( sPreferredSubDir );
if( sBGName != "" ) if( sBGName != "" )
m_aBGChanges.push_back( BackgroundChange(f,sBGName,1.f,bFade) ); m_aBGChanges.push_back( BackgroundChange(f,sBGName,1.f,bFade) );
} }
@@ -329,7 +341,7 @@ void Background::LoadFromRandom( float fFirstBeat, float fLastBeat, const Timing
if( bpmseg.m_iStartIndex < iStartIndex || bpmseg.m_iStartIndex > iEndIndex ) if( bpmseg.m_iStartIndex < iStartIndex || bpmseg.m_iStartIndex > iEndIndex )
continue; // skip continue; // skip
CString sBGName = CreateRandomBGA(); CString sBGName = CreateRandomBGA( sPreferredSubDir );
if( sBGName != "" ) if( sBGName != "" )
m_aBGChanges.push_back( BackgroundChange(NoteRowToBeat(bpmseg.m_iStartIndex),sBGName) ); m_aBGChanges.push_back( BackgroundChange(NoteRowToBeat(bpmseg.m_iStartIndex),sBGName) );
} }
@@ -368,7 +380,7 @@ void Background::LoadFromSong( const Song* pSong )
bool bIsAlreadyLoaded = m_BGAnimations.find(sBGName) != m_BGAnimations.end(); bool bIsAlreadyLoaded = m_BGAnimations.find(sBGName) != m_BGAnimations.end();
if( sBGName.CompareNoCase("-random-") && !bIsAlreadyLoaded ) if( sBGName.CompareNoCase("-random-")!=0 && !bIsAlreadyLoaded )
{ {
Actor *pTempBGA = CreateSongBGA( sBGName ); Actor *pTempBGA = CreateSongBGA( sBGName );
if( pTempBGA ) if( pTempBGA )
@@ -377,7 +389,7 @@ void Background::LoadFromSong( const Song* pSong )
} }
else // the background was not found. Use a random one instead else // the background was not found. Use a random one instead
{ {
sBGName = CreateRandomBGA(); sBGName = CreateRandomBGA( pSong->m_sGroupName );
if( sBGName == "" ) if( sBGName == "" )
sBGName = STATIC_BACKGROUND; sBGName = STATIC_BACKGROUND;
} }
@@ -388,7 +400,7 @@ void Background::LoadFromSong( const Song* pSong )
} }
else // pSong doesn't have an animation plan else // pSong doesn't have an animation plan
{ {
LoadFromRandom( pSong->m_fFirstBeat, pSong->m_fLastBeat, pSong->m_Timing ); LoadFromRandom( pSong->m_fFirstBeat, pSong->m_fLastBeat, pSong->m_Timing, pSong->m_sGroupName );
// end showing the static song background // end showing the static song background
m_aBGChanges.push_back( BackgroundChange(pSong->m_fLastBeat,STATIC_BACKGROUND) ); m_aBGChanges.push_back( BackgroundChange(pSong->m_fLastBeat,STATIC_BACKGROUND) );
@@ -432,7 +444,7 @@ void Background::LoadFromSong( const Song* pSong )
m_aBGChanges.erase( m_aBGChanges.begin()+i ); m_aBGChanges.erase( m_aBGChanges.begin()+i );
--i; --i;
LoadFromRandom( fStartBeat, fLastBeat, pSong->m_Timing ); LoadFromRandom( fStartBeat, fLastBeat, pSong->m_Timing, pSong->m_sGroupName );
} }
// At this point, we shouldn't have any BGChanges to "". "" is an invalid name. // At this point, we shouldn't have any BGChanges to "". "" is an invalid name.
stepmania/src/Background.h
+2 -2
View File
@@ -48,7 +48,7 @@ public:
protected: protected:
const Song *m_pSong; const Song *m_pSong;
void LoadFromRandom( float fFirstBeat, float fLastBeat, const TimingData &timing ); void LoadFromRandom( float fFirstBeat, float fLastBeat, const TimingData &timing, CString sPreferredSubDir );
int FindBGSegmentForBeat( float fBeat ) const; int FindBGSegmentForBeat( float fBeat ) const;
bool IsDangerPlayerVisible( PlayerNumber pn ); bool IsDangerPlayerVisible( PlayerNumber pn );
@@ -65,7 +65,7 @@ protected:
BGAnimation m_DeadPlayer[NUM_PLAYERS]; BGAnimation m_DeadPlayer[NUM_PLAYERS];
Actor *CreateSongBGA( CString sBGName ) const; Actor *CreateSongBGA( CString sBGName ) const;
CString CreateRandomBGA(); CString CreateRandomBGA( CString sPreferredSubDir );
map<CString,Actor*> m_BGAnimations; map<CString,Actor*> m_BGAnimations;
deque<CString> m_RandomBGAnimations; deque<CString> m_RandomBGAnimations;