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

avoid global ThemeMetric<apActorCommands>

Browse Source
This commit is contained in:
Glenn Maynard
2006-08-21 21:33:00 +00:00
parent 0c975dd32f
commit 74e9540ce7
3 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+8 -8
View File
@@ -2644,16 +2644,16 @@ BrightnessFadeCommand=
ClampOutputPercent=0 ClampOutputPercent=0
[Judgment] [Judgment]
W1Command=shadowlength,0;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.8;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0;glowblink;effectperiod,0.05;effectcolor1,1,1,1,0;effectcolor2,1,1,1,0.8 JudgmentW1Command=shadowlength,0;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.8;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0;glowblink;effectperiod,0.05;effectcolor1,1,1,1,0;effectcolor2,1,1,1,0.8
W2Command=shadowlength,0;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.8;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0 JudgmentW2Command=shadowlength,0;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.8;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0
W3Command=shadowlength,0;diffusealpha,1;zoom,1.2;linear,0.05;zoom,1;sleep,0.8;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0; JudgmentW3Command=shadowlength,0;diffusealpha,1;zoom,1.2;linear,0.05;zoom,1;sleep,0.8;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0;
W4Command=shadowlength,0;diffusealpha,1;zoom,1.1;linear,0.05;zoom,1;sleep,0.8;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0; JudgmentW4Command=shadowlength,0;diffusealpha,1;zoom,1.1;linear,0.05;zoom,1;sleep,0.8;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0;
W5Command=shadowlength,0;diffusealpha,1;zoom,1.0;vibrate;effectmagnitude,4,8,8;sleep,0.8;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0 JudgmentW5Command=shadowlength,0;diffusealpha,1;zoom,1.0;vibrate;effectmagnitude,4,8,8;sleep,0.8;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0
MissCommand=shadowlength,0;diffusealpha,1;zoom,1;y,-20;linear,0.8;y,20;sleep,0.8;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0 JudgmentMissCommand=shadowlength,0;diffusealpha,1;zoom,1;y,-20;linear,0.8;y,20;sleep,0.8;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0
[HoldJudgment] [HoldJudgment]
LetGoCommand=shadowlength,0;diffusealpha,1;zoom,1;y,-10;linear,0.8;y,10;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0 HoldJudgmentLetGoCommand=shadowlength,0;diffusealpha,1;zoom,1;y,-10;linear,0.8;y,10;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0
HeldCommand=shadowlength,0;diffusealpha,1;zoom,1.25;linear,0.3;zoomx,1;zoomy,1;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0 HoldJudgmentHeldCommand=shadowlength,0;diffusealpha,1;zoom,1.25;linear,0.3;zoomx,1;zoomy,1;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0
[Combo] [Combo]
ShowComboAt=2 ShowComboAt=2
stepmania/src/HoldJudgment.cpp
+4 -5
View File
@@ -8,9 +8,6 @@
#include "StatsManager.h" #include "StatsManager.h"
#include "XmlFile.h" #include "XmlFile.h"
static ThemeMetric<apActorCommands> HELD_COMMAND ("HoldJudgment","HeldCommand");
static ThemeMetric<apActorCommands> LET_GO_COMMAND ("HoldJudgment","LetGoCommand");
REGISTER_ACTOR_CLASS( HoldJudgment ) REGISTER_ACTOR_CLASS( HoldJudgment )
HoldJudgment::HoldJudgment() HoldJudgment::HoldJudgment()
@@ -22,6 +19,8 @@ void HoldJudgment::Load( const RString &sPath )
{ {
m_sprJudgment.Load( sPath ); m_sprJudgment.Load( sPath );
m_sprJudgment->StopAnimating(); m_sprJudgment->StopAnimating();
m_sprJudgment->SetName( "HoldJudgment" );
ActorUtil::LoadAllCommands( *m_sprJudgment, "HoldJudgment" );
ResetAnimation(); ResetAnimation();
this->AddChild( m_sprJudgment ); this->AddChild( m_sprJudgment );
} }
@@ -64,11 +63,11 @@ void HoldJudgment::SetHoldJudgment( HoldNoteScore hns )
ASSERT(0); ASSERT(0);
case HNS_Held: case HNS_Held:
m_sprJudgment->SetState( 0 ); m_sprJudgment->SetState( 0 );
m_sprJudgment->RunCommands( HELD_COMMAND ); m_sprJudgment->PlayCommand( "Held" );
break; break;
case HNS_LetGo: case HNS_LetGo:
m_sprJudgment->SetState( 1 ); m_sprJudgment->SetState( 1 );
m_sprJudgment->RunCommands( LET_GO_COMMAND ); m_sprJudgment->PlayCommand( "LetGo" );
break; break;
default: default:
ASSERT(0); ASSERT(0);
stepmania/src/Judgment.cpp
+8 -13
View File
@@ -9,13 +9,6 @@
#include "StatsManager.h" #include "StatsManager.h"
#include "XmlFile.h" #include "XmlFile.h"
static ThemeMetric<apActorCommands> W1_COMMAND ("Judgment","W1Command");
static ThemeMetric<apActorCommands> W2_COMMAND ("Judgment","W2Command");
static ThemeMetric<apActorCommands> W3_COMMAND ("Judgment","W3Command");
static ThemeMetric<apActorCommands> W4_COMMAND ("Judgment","W4Command");
static ThemeMetric<apActorCommands> W5_COMMAND ("Judgment","W5Command");
static ThemeMetric<apActorCommands> MISS_COMMAND ("Judgment","MissCommand");
REGISTER_ACTOR_CLASS( Judgment ) REGISTER_ACTOR_CLASS( Judgment )
Judgment::Judgment() Judgment::Judgment()
@@ -54,6 +47,8 @@ void Judgment::LoadNormal( const RString &sPath )
m_sprJudgment.Load( sPath ); m_sprJudgment.Load( sPath );
ASSERT( m_sprJudgment.GetNumStates() == 6 || m_sprJudgment.GetNumStates() == 12 ); ASSERT( m_sprJudgment.GetNumStates() == 6 || m_sprJudgment.GetNumStates() == 12 );
m_sprJudgment.StopAnimating(); m_sprJudgment.StopAnimating();
m_sprJudgment.SetName( "Judgment" );
ActorUtil::LoadAllCommands( m_sprJudgment, "Judgment" );
Reset(); Reset();
this->AddChild( &m_sprJudgment ); this->AddChild( &m_sprJudgment );
} }
@@ -81,27 +76,27 @@ void Judgment::SetJudgment( TapNoteScore score, bool bEarly )
{ {
case TNS_W1: case TNS_W1:
m_sprJudgment.SetState( 0 * iStateMult + iStateAdd ); m_sprJudgment.SetState( 0 * iStateMult + iStateAdd );
m_sprJudgment.RunCommands( W1_COMMAND ); m_sprJudgment.PlayCommand( "W1" );
break; break;
case TNS_W2: case TNS_W2:
m_sprJudgment.SetState( 1 * iStateMult + iStateAdd ); m_sprJudgment.SetState( 1 * iStateMult + iStateAdd );
m_sprJudgment.RunCommands( W2_COMMAND ); m_sprJudgment.PlayCommand( "W2" );
break; break;
case TNS_W3: case TNS_W3:
m_sprJudgment.SetState( 2 * iStateMult + iStateAdd ); m_sprJudgment.SetState( 2 * iStateMult + iStateAdd );
m_sprJudgment.RunCommands( W3_COMMAND ); m_sprJudgment.PlayCommand( "W3" );
break; break;
case TNS_W4: case TNS_W4:
m_sprJudgment.SetState( 3 * iStateMult + iStateAdd ); m_sprJudgment.SetState( 3 * iStateMult + iStateAdd );
m_sprJudgment.RunCommands( W4_COMMAND ); m_sprJudgment.PlayCommand( "W4" );
break; break;
case TNS_W5: case TNS_W5:
m_sprJudgment.SetState( 4 * iStateMult + iStateAdd ); m_sprJudgment.SetState( 4 * iStateMult + iStateAdd );
m_sprJudgment.RunCommands( W5_COMMAND ); m_sprJudgment.PlayCommand( "W5" );
break; break;
case TNS_Miss: case TNS_Miss:
m_sprJudgment.SetState( 5 * iStateMult + iStateAdd ); m_sprJudgment.SetState( 5 * iStateMult + iStateAdd );
m_sprJudgment.RunCommands( MISS_COMMAND ); m_sprJudgment.PlayCommand( "Miss" );
break; break;
default: default:
ASSERT(0); ASSERT(0);