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

remove fadecolor

Browse Source
This commit is contained in:
Glenn Maynard
2005-01-01 22:04:40 +00:00
parent 35c718b990
commit fac13bf393
2 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Actor.cpp
-3
View File
@@ -677,7 +677,6 @@ void Actor::HandleCommand( const Command &command )
else if( sName=="fadetop" ) SetFadeTop( fArg(1) ); else if( sName=="fadetop" ) SetFadeTop( fArg(1) );
else if( sName=="faderight" ) SetFadeRight( fArg(1) ); else if( sName=="faderight" ) SetFadeRight( fArg(1) );
else if( sName=="fadebottom" ) SetFadeBottom( 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=="diffuse" ) SetDiffuse( cArg(1) );
else if( sName=="diffuseleftedge" ) SetDiffuseLeftEdge( cArg(1) ); else if( sName=="diffuseleftedge" ) SetDiffuseLeftEdge( cArg(1) );
else if( sName=="diffuserightedge" ) SetDiffuseRightEdge( cArg(1) ); else if( sName=="diffuserightedge" ) SetDiffuseRightEdge( cArg(1) );
@@ -841,7 +840,6 @@ void Actor::TweenState::Init()
scale = RageVector3( 1, 1, 1 ); scale = RageVector3( 1, 1, 1 );
crop = RectF( 0,0,0,0 ); crop = RectF( 0,0,0,0 );
fade = RectF( 0,0,0,0 ); fade = RectF( 0,0,0,0 );
fadecolor = RageColor( 1, 1, 1, 0 );
for(int i=0; i<4; i++) for(int i=0; i<4; i++)
diffuse[i] = RageColor( 1, 1, 1, 1 ); diffuse[i] = RageColor( 1, 1, 1, 1 );
glow = RageColor( 1, 1, 1, 0 ); 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.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.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.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++) for(int i=0; i<4; i++)
average_out.diffuse[i] = ts1.diffuse[i]+ (ts2.diffuse[i] - ts1.diffuse[i])*fPercentBetween; average_out.diffuse[i] = ts1.diffuse[i]+ (ts2.diffuse[i] - ts1.diffuse[i])*fPercentBetween;
stepmania/src/Actor.h
-2
View File
@@ -45,7 +45,6 @@ public:
RageVector3 scale; RageVector3 scale;
RectF crop; // 0 = no cropping, 1 = fully cropped RectF crop; // 0 = no cropping, 1 = fully cropped
RectF fade; // 0 = no fade RectF fade; // 0 = no fade
RageColor fadecolor;
RageColor diffuse[4]; RageColor diffuse[4];
RageColor glow; RageColor glow;
GlowMode glowmode; GlowMode glowmode;
@@ -158,7 +157,6 @@ public:
void SetFadeTop( float percent ) { DestTweenState().fade.top = percent; } void SetFadeTop( float percent ) { DestTweenState().fade.top = percent; }
void SetFadeRight( float percent ) { DestTweenState().fade.right = percent;} void SetFadeRight( float percent ) { DestTweenState().fade.right = percent;}
void SetFadeBottom( float percent ){ DestTweenState().fade.bottom = percent;} void SetFadeBottom( float percent ){ DestTweenState().fade.bottom = percent;}
void SetFadeDiffuseColor( const RageColor &c ) { DestTweenState().fadecolor = c; }
void SetGlobalDiffuseColor( RageColor c ); void SetGlobalDiffuseColor( RageColor c );
void SetGlobalX( float x ); void SetGlobalX( float x );