[Banner, FadingBanner] Various changes:
* Removed (now unused) All Music banner.
* Fixed swapped ScrollRandom and ScrollRoulette metrics.
* Added GetScrolling(), GetPercentScrolling() and SetScrolling(bool,float)
Lua bindings.
This commit is contained in:
@@ -22,6 +22,11 @@ sm-ssc v1.2 | 201012xx
|
|||||||
* Changed Steps picking logic in ScreenGameplaySyncMachine; now playable Steps
|
* Changed Steps picking logic in ScreenGameplaySyncMachine; now playable Steps
|
||||||
are chosen, instead of whatever NoteData happens to be first.
|
are chosen, instead of whatever NoteData happens to be first.
|
||||||
Also added pump-single data to ScreenGameplaySyncMachine music.sm. [freem]
|
Also added pump-single data to ScreenGameplaySyncMachine music.sm. [freem]
|
||||||
|
* [Banner, FadingBanner] Various changes: [freem]
|
||||||
|
* Removed (now unused) All Music banner.
|
||||||
|
* Fixed swapped ScrollRandom and ScrollRoulette metrics.
|
||||||
|
* Added GetScrolling(), GetPercentScrolling() and SetScrolling(bool,float)
|
||||||
|
Lua bindings.
|
||||||
|
|
||||||
20101225
|
20101225
|
||||||
--------
|
--------
|
||||||
|
|||||||
+7
-10
@@ -24,7 +24,7 @@ Banner::Banner()
|
|||||||
m_fPercentScrolling = 0;
|
m_fPercentScrolling = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Ugly: if sIsBanner is false, we're actually loading something other than a banner. */
|
// Ugly: if sIsBanner is false, we're actually loading something other than a banner.
|
||||||
void Banner::Load( RageTextureID ID, bool bIsBanner )
|
void Banner::Load( RageTextureID ID, bool bIsBanner )
|
||||||
{
|
{
|
||||||
if( ID.filename == "" )
|
if( ID.filename == "" )
|
||||||
@@ -100,7 +100,7 @@ void Banner::SetScrolling( bool bScroll, float Percent)
|
|||||||
m_bScrolling = bScroll;
|
m_bScrolling = bScroll;
|
||||||
m_fPercentScrolling = Percent;
|
m_fPercentScrolling = Percent;
|
||||||
|
|
||||||
/* Set up the texture coord rects for the current state. */
|
// Set up the texture coord rects for the current state.
|
||||||
Update(0);
|
Update(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -113,12 +113,6 @@ void Banner::LoadFromSong( Song* pSong ) // NULL means no song
|
|||||||
m_bScrolling = false;
|
m_bScrolling = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Banner::LoadAllMusic()
|
|
||||||
{
|
|
||||||
Load( THEME->GetPathG("Banner","All") );
|
|
||||||
m_bScrolling = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
void Banner::LoadMode()
|
void Banner::LoadMode()
|
||||||
{
|
{
|
||||||
Load( THEME->GetPathG("Banner","Mode") );
|
Load( THEME->GetPathG("Banner","Mode") );
|
||||||
@@ -211,13 +205,13 @@ void Banner::LoadFallbackCharacterIcon()
|
|||||||
void Banner::LoadRoulette()
|
void Banner::LoadRoulette()
|
||||||
{
|
{
|
||||||
Load( THEME->GetPathG("Banner","roulette") );
|
Load( THEME->GetPathG("Banner","roulette") );
|
||||||
m_bScrolling = (bool)SCROLL_RANDOM;
|
m_bScrolling = (bool)SCROLL_ROULETTE;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Banner::LoadRandom()
|
void Banner::LoadRandom()
|
||||||
{
|
{
|
||||||
Load( THEME->GetPathG("Banner","random") );
|
Load( THEME->GetPathG("Banner","random") );
|
||||||
m_bScrolling = (bool)SCROLL_ROULETTE;
|
m_bScrolling = (bool)SCROLL_RANDOM;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Banner::LoadFromSortOrder( SortOrder so )
|
void Banner::LoadFromSortOrder( SortOrder so )
|
||||||
@@ -298,6 +292,9 @@ public:
|
|||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
static int GetScrolling( T* p, lua_State *L ){ lua_pushboolean( L, p->GetScrolling() ); return 1; }
|
||||||
|
static int GetPercentScrolling( T* p, lua_State *L ){ lua_pushnumber( L, p->ScrollingPercent() ); return 1; }
|
||||||
|
static int SetScrolling( T* p, lua_State *L ){ p->SetScrolling( BArg(1), FArg(2) ); return 0; }
|
||||||
|
|
||||||
LunaBanner()
|
LunaBanner()
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -25,7 +25,6 @@ public:
|
|||||||
virtual void Update( float fDeltaTime );
|
virtual void Update( float fDeltaTime );
|
||||||
|
|
||||||
void LoadFromSong( Song* pSong ); // NULL means no song
|
void LoadFromSong( Song* pSong ); // NULL means no song
|
||||||
void LoadAllMusic();
|
|
||||||
void LoadMode();
|
void LoadMode();
|
||||||
void LoadFromSongGroup( RString sSongGroup );
|
void LoadFromSongGroup( RString sSongGroup );
|
||||||
void LoadFromCourse( const Course *pCourse );
|
void LoadFromCourse( const Course *pCourse );
|
||||||
@@ -42,6 +41,7 @@ public:
|
|||||||
void LoadFallbackCharacterIcon();
|
void LoadFallbackCharacterIcon();
|
||||||
|
|
||||||
void SetScrolling( bool bScroll, float Percent = 0 );
|
void SetScrolling( bool bScroll, float Percent = 0 );
|
||||||
|
void GetScrolling() const { return m_bScrolling; }
|
||||||
float ScrollingPercent() const { return m_fPercentScrolling; }
|
float ScrollingPercent() const { return m_fPercentScrolling; }
|
||||||
|
|
||||||
// Lua
|
// Lua
|
||||||
|
|||||||
@@ -181,12 +181,6 @@ void FadingBanner::LoadFromSong( const Song* pSong )
|
|||||||
LoadFromCachedBanner( sPath );
|
LoadFromCachedBanner( sPath );
|
||||||
}
|
}
|
||||||
|
|
||||||
void FadingBanner::LoadAllMusic()
|
|
||||||
{
|
|
||||||
BeforeChange();
|
|
||||||
m_Banner[m_iIndexLatest].LoadAllMusic();
|
|
||||||
}
|
|
||||||
|
|
||||||
void FadingBanner::LoadMode()
|
void FadingBanner::LoadMode()
|
||||||
{
|
{
|
||||||
BeforeChange();
|
BeforeChange();
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ public:
|
|||||||
* resolution banner, set bLowResToHighRes to true. */
|
* resolution banner, set bLowResToHighRes to true. */
|
||||||
void Load( RageTextureID ID, bool bLowResToHighRes=false );
|
void Load( RageTextureID ID, bool bLowResToHighRes=false );
|
||||||
void LoadFromSong( const Song* pSong ); // NULL means no song
|
void LoadFromSong( const Song* pSong ); // NULL means no song
|
||||||
void LoadAllMusic();
|
|
||||||
void LoadMode();
|
void LoadMode();
|
||||||
void LoadFromSongGroup( RString sSongGroup );
|
void LoadFromSongGroup( RString sSongGroup );
|
||||||
void LoadFromCourse( const Course* pCourse );
|
void LoadFromCourse( const Course* pCourse );
|
||||||
|
|||||||
Reference in New Issue
Block a user