add SetDiffuseAlpha

simplify

stepmania/src/ActorFrame.cpp

@@ -78,33 +78,21 @@ void ActorFrame::Update( float fDeltaTime )
 		(*it)->Update(fDeltaTime);
 }
 
+#define PropagateActorFrameCommand( cmd, type ) \
+	void ActorFrame::cmd( type f )		\
+	{									\
+		Actor::cmd( f );				\
+										\
+		/* set all sub-Actors */		\
+		for( unsigned i=0; i<m_SubActors.size(); i++ ) \
+			m_SubActors[i]->cmd( f );	\
+	}
 
-void ActorFrame::SetDiffuse( RageColor c )
+PropagateActorFrameCommand( SetDiffuse,			RageColor )
-{
+PropagateActorFrameCommand( SetDiffuseAlpha,	float )
-	Actor::SetDiffuse( c );
+PropagateActorFrameCommand( SetZTest,			bool )
-
+PropagateActorFrameCommand( SetZWrite,			bool )
-	// set all sub-Actors
+PropagateActorFrameCommand( HurryTweening,		float )
-	for( unsigned i=0; i<m_SubActors.size(); i++ )
-		m_SubActors[i]->SetDiffuse(c );
-}
-
-void ActorFrame::SetZTest( bool b )
-{
-	Actor::SetZTest( b );
-
-	// set all sub-Actors
-	for( unsigned i=0; i<m_SubActors.size(); i++ )
-		m_SubActors[i]->SetZTest( b );
-}
-
-void ActorFrame::SetZWrite( bool b )
-{
-	Actor::SetZWrite( b );
-
-	// set all sub-Actors
-	for( unsigned i=0; i<m_SubActors.size(); i++ )
-		m_SubActors[i]->SetZWrite( b );
-}
 
 void ActorFrame::FinishTweening()
 {
@@ -115,15 +103,6 @@ void ActorFrame::FinishTweening()
 		m_SubActors[i]->FinishTweening();
 }
 
-void ActorFrame::HurryTweening( float factor )
-{
-	Actor::HurryTweening( factor );
-
-	// set all sub-Actors
-	for( unsigned i=0; i<m_SubActors.size(); i++ )
-		m_SubActors[i]->HurryTweening( factor );
-}
-
 float ActorFrame::GetTweenTimeLeft() const
 {
 	float m = Actor::GetTweenTimeLeft();

stepmania/src/ActorFrame.h

@@ -27,6 +27,7 @@ public:
 	virtual void DrawPrimitives();
 
 	virtual void SetDiffuse( RageColor c );
+	virtual void SetDiffuseAlpha( float f );
 	
 	virtual void SetZTest( bool b );
 	virtual void SetZWrite( bool b );