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

revert to fix selected color

Browse Source
This commit is contained in:
Chris Danford
2005-02-14 18:21:58 +00:00
parent 874ee9fd1b
commit 93d31aa38a
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenOptions.cpp
+10 -9
View File
@@ -825,22 +825,20 @@ void ScreenOptions::UpdateEnabledDisabled()
const float DiffuseAlpha = row.m_bHidden? 0.0f:1.0f; const float DiffuseAlpha = row.m_bHidden? 0.0f:1.0f;
bool bNeedsUpdate =
row.m_sprBullet.GetDestY() != row.m_fY ||
row.m_sprBullet.DestTweenState().diffuse[0].a != DiffuseAlpha ||
IsFirstUpdate();
if( !bNeedsUpdate )
continue;
/* Don't tween selection colors at all. */ /* Don't tween selection colors at all. */
const RageColor color = bThisRowIsSelected? colorSelected:colorNotSelected; const RageColor color = bThisRowIsSelected? colorSelected:colorNotSelected;
row.m_sprBullet.SetGlobalDiffuseColor( color ); row.m_sprBullet.SetGlobalDiffuseColor( color );
row.m_textTitle.SetGlobalDiffuseColor( color ); row.m_textTitle.SetGlobalDiffuseColor( color );
for( unsigned j=0; j<row.m_textItems.size(); j++ ) for( unsigned j=0; j<row.m_textItems.size(); j++ )
{
row.m_textItems[j]->SetGlobalDiffuseColor( color ); row.m_textItems[j]->SetGlobalDiffuseColor( color );
for( unsigned j=0; j<row.m_textItems.size(); j++ )
{
if( row.m_textItems[j]->GetDestY() == row.m_fY &&
row.m_textItems[j]->DestTweenState().diffuse[0][3] == DiffuseAlpha )
continue;
row.m_textItems[j]->StopTweening(); row.m_textItems[j]->StopTweening();
row.m_textItems[j]->BeginTweening( TWEEN_SECONDS ); row.m_textItems[j]->BeginTweening( TWEEN_SECONDS );
row.m_textItems[j]->SetDiffuseAlpha( DiffuseAlpha ); row.m_textItems[j]->SetDiffuseAlpha( DiffuseAlpha );
@@ -860,6 +858,8 @@ void ScreenOptions::UpdateEnabledDisabled()
row.m_textItems[0]->SetEffectNone(); row.m_textItems[0]->SetEffectNone();
} }
if( row.m_sprBullet.GetDestY() != row.m_fY )
{
row.m_sprBullet.StopTweening(); row.m_sprBullet.StopTweening();
row.m_textTitle.StopTweening(); row.m_textTitle.StopTweening();
row.m_sprBullet.BeginTweening( TWEEN_SECONDS ); row.m_sprBullet.BeginTweening( TWEEN_SECONDS );
@@ -869,6 +869,7 @@ void ScreenOptions::UpdateEnabledDisabled()
row.m_sprBullet.SetY( row.m_fY ); row.m_sprBullet.SetY( row.m_fY );
row.m_textTitle.SetY( row.m_fY ); row.m_textTitle.SetY( row.m_fY );
} }
}
} }
void ScreenOptions::Update( float fDeltaTime ) void ScreenOptions::Update( float fDeltaTime )