Fixed "floating background". Fixed interaction between COLOR_NOTE, and APPEARANCE_*

This commit is contained in:
Chris Danford
2003-01-14 05:56:18 +00:00
parent 1f8f1766e6
commit 1258b0c22f
2 changed files with 17 additions and 15 deletions
+15 -13
View File
@@ -54,6 +54,21 @@ BGAnimationLayer::BGAnimationLayer()
m_bCycleColor = false; m_bCycleColor = false;
m_bCycleAlpha = false; m_bCycleAlpha = false;
m_Effect = EFFECT_STRETCH_STILL; m_Effect = EFFECT_STRETCH_STILL;
m_PosX = 0;
m_PosY = 0;
m_Zoom = 0;
m_Rot = 0;
m_ShowTime = 0;
m_HideTime = 0;
m_TweenStartTime = 0;
m_TweenX = 0.0;
m_TweenY = 0.0;
m_TweenSpeed = 0;
m_TweenState = 0;
m_TweenPassedX = 0;
m_TweenPassedY = 0;
} }
/* Static background layers are simple, uncomposited background images with nothing /* Static background layers are simple, uncomposited background images with nothing
@@ -92,19 +107,6 @@ void BGAnimationLayer::LoadFromVisualization( CString sMoviePath )
void BGAnimationLayer::LoadFromAniLayerFile( CString sPath, CString sSongBGPath ) void BGAnimationLayer::LoadFromAniLayerFile( CString sPath, CString sSongBGPath )
{ {
sPath.MakeLower(); sPath.MakeLower();
m_PosX = 0;
m_PosY = 0;
m_Zoom = 0;
m_Rot = 0;
m_ShowTime = 0;
m_HideTime = 0;
m_TweenStartTime = 0;
m_TweenX = 0.0;
m_TweenY = 0.0;
m_TweenSpeed = 0;
m_TweenState = 0;
m_TweenPassedX = 0;
m_TweenPassedY = 0;
if( sPath.Find("usesongbg") != -1 ) if( sPath.Find("usesongbg") != -1 )
{ {
+1 -1
View File
@@ -335,7 +335,7 @@ void NoteDisplay::DrawTap( const int iCol, const float fBeat, const bool bOnSame
diffuse.g *= noteColor.g; diffuse.g *= noteColor.g;
diffuse.b *= noteColor.b; diffuse.b *= noteColor.b;
glow = RageColor(1,1,1,1)*fGlow + noteColor*(1-fGlow)*0.5f; glow = RageColor(1,1,1,1)*fGlow + noteColor*(1-fGlow)*0.7f*fAlpha;
} }
if( bOnSameRowAsHoldStart && g_bDrawHoldHeadForTapsOnSameRow ) if( bOnSameRowAsHoldStart && g_bDrawHoldHeadForTapsOnSameRow )