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

add timerglobal

Browse Source
This commit is contained in:
Glenn Maynard
2007-05-03 22:59:14 +00:00
parent 1823bac0ad
commit 0b3db98d00
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Actor.cpp
+9
View File
@@ -626,6 +626,14 @@ void Actor::UpdateInternal( float fDeltaTime )
m_fSecsIntoEffect -= GetEffectPeriod();
break;
case CLOCK_TIMER_GLOBAL:
{
float fTime = RageTimer::GetTimeSinceStartFast();
m_fEffectDelta = fTime - m_fSecsIntoEffect;
m_fSecsIntoEffect = fTime;
break;
}
case CLOCK_BGM_BEAT:
m_fEffectDelta = g_fCurrentBGMBeat - m_fSecsIntoEffect;
m_fSecsIntoEffect = g_fCurrentBGMBeat;
@@ -760,6 +768,7 @@ void Actor::ScaleTo( const RectF &rect, StretchType st )
void Actor::SetEffectClockString( const RString &s )
{
if (s.EqualsNoCase("timer")) this->SetEffectClock( CLOCK_TIMER );
if (s.EqualsNoCase("timerglobal")) this->SetEffectClock( CLOCK_TIMER_GLOBAL );
else if(s.EqualsNoCase("beat")) this->SetEffectClock( CLOCK_BGM_BEAT );
else if(s.EqualsNoCase("music")) this->SetEffectClock( CLOCK_BGM_TIME );
else if(s.EqualsNoCase("bgm")) this->SetEffectClock( CLOCK_BGM_BEAT ); // compat, deprecated
stepmania/src/Actor.h
+1
View File
@@ -94,6 +94,7 @@ public:
enum EffectClock
{
CLOCK_TIMER,
CLOCK_TIMER_GLOBAL,
CLOCK_BGM_TIME,
CLOCK_BGM_BEAT,
CLOCK_LIGHT_1 = 1000,