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

add edge fade commands

Browse Source
This commit is contained in:
Glenn Maynard
2003-11-08 19:23:40 +00:00
parent bce21fc1d2
commit 12d92a5be1
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Actor.cpp
+13
View File
@@ -741,6 +741,11 @@ void Actor::HandleCommand( const CStringArray &asTokens )
else if( sName=="croptop" ) SetCropTop( fParam(1) ); else if( sName=="croptop" ) SetCropTop( fParam(1) );
else if( sName=="cropright" ) SetCropRight( fParam(1) ); else if( sName=="cropright" ) SetCropRight( fParam(1) );
else if( sName=="cropbottom" ) SetCropBottom( fParam(1) ); else if( sName=="cropbottom" ) SetCropBottom( fParam(1) );
else if( sName=="fadeleft" ) SetFadeLeft( fParam(1) );
else if( sName=="fadetop" ) SetFadeTop( fParam(1) );
else if( sName=="faderight" ) SetFadeRight( fParam(1) );
else if( sName=="fadebottom" ) SetFadeBottom( fParam(1) );
else if( sName=="fadecolor" ) SetFadeDiffuseColor( RageColor(fParam(1),fParam(2),fParam(3),fParam(4)) );
else if( sName=="diffuse" ) SetDiffuse( RageColor(fParam(1),fParam(2),fParam(3),fParam(4)) ); else if( sName=="diffuse" ) SetDiffuse( RageColor(fParam(1),fParam(2),fParam(3),fParam(4)) );
else if( sName=="diffuseleftedge" ) SetDiffuseLeftEdge( RageColor(fParam(1),fParam(2),fParam(3),fParam(4)) ); else if( sName=="diffuseleftedge" ) SetDiffuseLeftEdge( RageColor(fParam(1),fParam(2),fParam(3),fParam(4)) );
else if( sName=="diffuserightedge" ) SetDiffuseRightEdge( RageColor(fParam(1),fParam(2),fParam(3),fParam(4)) ); else if( sName=="diffuserightedge" ) SetDiffuseRightEdge( RageColor(fParam(1),fParam(2),fParam(3),fParam(4)) );
@@ -867,6 +872,8 @@ void Actor::TweenState::Init()
quat = RageVector4( 0, 0, 0, 1 ); quat = RageVector4( 0, 0, 0, 1 );
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 );
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 );
@@ -885,6 +892,12 @@ void Actor::TweenState::MakeWeightedAverage( TweenState& average_out, const Twee
average_out.crop.right = ts1.crop.right + (ts2.crop.right - ts1.crop.right )*fPercentBetween; average_out.crop.right = ts1.crop.right + (ts2.crop.right - ts1.crop.right )*fPercentBetween;
average_out.crop.bottom = ts1.crop.bottom+ (ts2.crop.bottom - ts1.crop.bottom)*fPercentBetween; average_out.crop.bottom = ts1.crop.bottom+ (ts2.crop.bottom - ts1.crop.bottom)*fPercentBetween;
average_out.fade.left = ts1.fade.left + (ts2.fade.left - ts1.fade.left )*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.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;
average_out.glow = ts1.glow + (ts2.glow - ts1.glow )*fPercentBetween; average_out.glow = ts1.glow + (ts2.glow - ts1.glow )*fPercentBetween;
stepmania/src/Actor.h
+7
View File
@@ -44,6 +44,8 @@ public:
RageVector4 quat; RageVector4 quat;
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
RageColor fadecolor;
RageColor diffuse[4]; RageColor diffuse[4];
RageColor glow; RageColor glow;
GlowMode glowmode; GlowMode glowmode;
@@ -136,6 +138,11 @@ public:
virtual void SetCropRight( float percent ) { DestTweenState().crop.right = percent;} virtual void SetCropRight( float percent ) { DestTweenState().crop.right = percent;}
virtual void SetCropBottom( float percent ){ DestTweenState().crop.bottom = percent;} virtual void SetCropBottom( float percent ){ DestTweenState().crop.bottom = percent;}
virtual void SetFadeLeft( float percent ) { DestTweenState().fade.left = percent; }
virtual void SetFadeTop( float percent ) { DestTweenState().fade.top = percent; }
virtual void SetFadeRight( float percent ) { DestTweenState().fade.right = percent;}
virtual void SetFadeBottom( float percent ){ DestTweenState().fade.bottom = percent;}
virtual void SetFadeDiffuseColor( const RageColor &c ) { DestTweenState().fadecolor = c; }
virtual void SetGlobalDiffuseColor( RageColor c ); virtual void SetGlobalDiffuseColor( RageColor c );
virtual void SetGlobalX( float x ); virtual void SetGlobalX( float x );