From fac13bf3936d855815b672e8692e7988976b5961 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 1 Jan 2005 22:04:40 +0000 Subject: [PATCH] remove fadecolor --- stepmania/src/Actor.cpp | 3 --- stepmania/src/Actor.h | 2 -- 2 files changed, 5 deletions(-) diff --git a/stepmania/src/Actor.cpp b/stepmania/src/Actor.cpp index 6306bd8528..251b4b0f99 100644 --- a/stepmania/src/Actor.cpp +++ b/stepmania/src/Actor.cpp @@ -677,7 +677,6 @@ void Actor::HandleCommand( const Command &command ) else if( sName=="fadetop" ) SetFadeTop( fArg(1) ); else if( sName=="faderight" ) SetFadeRight( fArg(1) ); else if( sName=="fadebottom" ) SetFadeBottom( fArg(1) ); - else if( sName=="fadecolor" ) SetFadeDiffuseColor( cArg(1) ); else if( sName=="diffuse" ) SetDiffuse( cArg(1) ); else if( sName=="diffuseleftedge" ) SetDiffuseLeftEdge( cArg(1) ); else if( sName=="diffuserightedge" ) SetDiffuseRightEdge( cArg(1) ); @@ -841,7 +840,6 @@ void Actor::TweenState::Init() scale = RageVector3( 1, 1, 1 ); crop = RectF( 0,0,0,0 ); fade = RectF( 0,0,0,0 ); - fadecolor = RageColor( 1, 1, 1, 0 ); for(int i=0; i<4; i++) diffuse[i] = RageColor( 1, 1, 1, 1 ); glow = RageColor( 1, 1, 1, 0 ); @@ -864,7 +862,6 @@ void Actor::TweenState::MakeWeightedAverage( TweenState& average_out, const Twee average_out.fade.top = ts1.fade.top + (ts2.fade.top - ts1.fade.top )*fPercentBetween; average_out.fade.right = ts1.fade.right + (ts2.fade.right - ts1.fade.right )*fPercentBetween; average_out.fade.bottom = ts1.fade.bottom+ (ts2.fade.bottom - ts1.fade.bottom)*fPercentBetween; - average_out.fadecolor = ts1.fadecolor + (ts2.fadecolor - ts1.fadecolor )*fPercentBetween; for(int i=0; i<4; i++) average_out.diffuse[i] = ts1.diffuse[i]+ (ts2.diffuse[i] - ts1.diffuse[i])*fPercentBetween; diff --git a/stepmania/src/Actor.h b/stepmania/src/Actor.h index 4055e693e9..e7f44c3935 100644 --- a/stepmania/src/Actor.h +++ b/stepmania/src/Actor.h @@ -45,7 +45,6 @@ public: RageVector3 scale; RectF crop; // 0 = no cropping, 1 = fully cropped RectF fade; // 0 = no fade - RageColor fadecolor; RageColor diffuse[4]; RageColor glow; GlowMode glowmode; @@ -158,7 +157,6 @@ public: void SetFadeTop( float percent ) { DestTweenState().fade.top = percent; } void SetFadeRight( float percent ) { DestTweenState().fade.right = percent;} void SetFadeBottom( float percent ){ DestTweenState().fade.bottom = percent;} - void SetFadeDiffuseColor( const RageColor &c ) { DestTweenState().fadecolor = c; } void SetGlobalDiffuseColor( RageColor c ); void SetGlobalX( float x );