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

Merge pull request #74 from dguzek/ActorScroller-bLoop

Browse Source 
Allow ActorScrollers to use SetDrawByZPosition without turning off Loop
This commit is contained in:
Colby Klein
2014-04-14 18:49:00 -07:00
parent 509f725d7e 5f006ba119
commit 0263b11fc5
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ActorScroller.cpp
+2 -3
View File
@@ -257,7 +257,6 @@ void ActorScroller::PositionItemsAndDrawPrimitives( bool bDrawPrimitives )
iLastItemToDraw = clamp( iLastItemToDraw, 0, m_iNumItems ); iLastItemToDraw = clamp( iLastItemToDraw, 0, m_iNumItems );
} }
bool bDelayedDraw = m_bDrawByZPosition && !m_bLoop;
vector<Actor*> subs; vector<Actor*> subs;
{ {
@@ -291,14 +290,14 @@ void ActorScroller::PositionItemsAndDrawPrimitives( bool bDrawPrimitives )
m_exprTransformFunction.TransformItemCached( *m_SubActors[iIndex], fPosition, iItem, m_iNumItems ); m_exprTransformFunction.TransformItemCached( *m_SubActors[iIndex], fPosition, iItem, m_iNumItems );
if( bDrawPrimitives ) if( bDrawPrimitives )
{ {
if( bDelayedDraw ) if( m_bDrawByZPosition )
subs.push_back( m_SubActors[iIndex] ); subs.push_back( m_SubActors[iIndex] );
else else
m_SubActors[iIndex]->Draw(); m_SubActors[iIndex]->Draw();
} }
} }
if( bDelayedDraw ) if( m_bDrawByZPosition )
{ {
ActorUtil::SortByZPosition( subs ); ActorUtil::SortByZPosition( subs );
FOREACH( Actor*, subs, a ) FOREACH( Actor*, subs, a )