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

Merge pull request #269 from sigatrev/ActorFrame_diffuse

Browse Source 
fix ActorFrame diffusing and glowing children
This commit is contained in:
Colby Klein
2014-08-16 21:12:09 -07:00
parent 79276a635a 02922aa5c0
commit 479f93c807
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ActorFrame.cpp
+7 -4
View File
@@ -248,6 +248,9 @@ void ActorFrame::DrawPrimitives()
return;
}
RageColor diffuse = m_pTempState->diffuse[0];
RageColor glow = m_pTempState->glow;
// draw all sub-ActorFrames while we're in the ActorFrame's local coordinate space
if( m_bDrawByZPosition )
{
@@ -255,8 +258,8 @@ void ActorFrame::DrawPrimitives()
ActorUtil::SortByZPosition( subs );
for( unsigned i=0; i<subs.size(); i++ )
{
subs[i]->SetInternalDiffuse(m_pTempState->diffuse[0]);
subs[i]->SetInternalGlow(m_pTempState->glow);
subs[i]->SetInternalDiffuse( diffuse );
subs[i]->SetInternalGlow( glow );
subs[i]->Draw();
}
}
@@ -264,8 +267,8 @@ void ActorFrame::DrawPrimitives()
{
for( unsigned i=0; i<m_SubActors.size(); i++ )
{
m_SubActors[i]->SetInternalDiffuse(m_pTempState->diffuse[0]);
m_SubActors[i]->SetInternalGlow(m_pTempState->glow);
m_SubActors[i]->SetInternalDiffuse( diffuse );
m_SubActors[i]->SetInternalGlow( glow );
m_SubActors[i]->Draw();
}
}