various overload fixes for using BGAnimation as a generic actor
This commit is contained in:
@@ -183,6 +183,7 @@ void BGAnimation::Update( float fDeltaTime )
|
|||||||
{
|
{
|
||||||
for( unsigned i=0; i<m_Layers.size(); i++ )
|
for( unsigned i=0; i<m_Layers.size(); i++ )
|
||||||
m_Layers[i]->Update( fDeltaTime );
|
m_Layers[i]->Update( fDeltaTime );
|
||||||
|
ActorFrame::Update( fDeltaTime );
|
||||||
}
|
}
|
||||||
|
|
||||||
void BGAnimation::DrawPrimitives()
|
void BGAnimation::DrawPrimitives()
|
||||||
@@ -209,22 +210,24 @@ void BGAnimation::SetDiffuse( const RageColor &c )
|
|||||||
{
|
{
|
||||||
for( unsigned i=0; i<m_Layers.size(); i++ )
|
for( unsigned i=0; i<m_Layers.size(); i++ )
|
||||||
m_Layers[i]->SetDiffuse(c);
|
m_Layers[i]->SetDiffuse(c);
|
||||||
|
ActorFrame::SetDiffuse( c );
|
||||||
}
|
}
|
||||||
|
|
||||||
float BGAnimation::GetTweenTimeLeft() const
|
float BGAnimation::GetTweenTimeLeft() const
|
||||||
{
|
{
|
||||||
float tot = 0;
|
float ret = 0;
|
||||||
|
|
||||||
for( unsigned i=0; i<m_Layers.size(); ++i )
|
for( unsigned i=0; i<m_Layers.size(); ++i )
|
||||||
tot += m_Layers[i]->GetMaxTweenTimeLeft();
|
ret = max( ret, m_Layers[i]->GetMaxTweenTimeLeft() );
|
||||||
|
|
||||||
return tot;
|
return max( ret, Actor::GetTweenTimeLeft() );
|
||||||
}
|
}
|
||||||
|
|
||||||
void BGAnimation::FinishTweening()
|
void BGAnimation::FinishTweening()
|
||||||
{
|
{
|
||||||
for( unsigned i=0; i<m_Layers.size(); i++ )
|
for( unsigned i=0; i<m_Layers.size(); i++ )
|
||||||
m_Layers[i]->FinishTweening();
|
m_Layers[i]->FinishTweening();
|
||||||
|
ActorFrame::FinishTweening();
|
||||||
}
|
}
|
||||||
|
|
||||||
void BGAnimation::PlayCommand( const CString &cmd )
|
void BGAnimation::PlayCommand( const CString &cmd )
|
||||||
|
|||||||
Reference in New Issue
Block a user