This commit is contained in:
Glenn Maynard
2005-09-26 23:01:24 +00:00
parent e3d5437031
commit 2436ef26db
+5 -12
View File
@@ -207,14 +207,12 @@ void ActorScroller::PositionItemsAndDrawPrimitives( bool bDrawPrimitives )
if( m_SubActors.empty() ) if( m_SubActors.empty() )
return; return;
float fFirstItemToDraw = 0; float fNumItemsToDraw = m_fNumItemsToDraw;
float fLastItemToDraw = 0;
if( !m_quadMask.GetHidden() ) if( !m_quadMask.GetHidden() )
{ {
// write to z buffer so that top and bottom are clipped // write to z buffer so that top and bottom are clipped
// Draw an extra item; this is the one that will be masked. // Draw an extra item; this is the one that will be masked.
float fNumItemsToDraw = m_fNumItemsToDraw+1; fNumItemsToDraw++;
float fPositionFullyOffScreenTop = -(fNumItemsToDraw)/2.f; float fPositionFullyOffScreenTop = -(fNumItemsToDraw)/2.f;
float fPositionFullyOffScreenBottom = (fNumItemsToDraw)/2.f; float fPositionFullyOffScreenBottom = (fNumItemsToDraw)/2.f;
@@ -223,15 +221,10 @@ void ActorScroller::PositionItemsAndDrawPrimitives( bool bDrawPrimitives )
m_exprTransformFunction.PositionItem( &m_quadMask, fPositionFullyOffScreenBottom, m_SubActors.size(), m_SubActors.size() ); m_exprTransformFunction.PositionItem( &m_quadMask, fPositionFullyOffScreenBottom, m_SubActors.size(), m_SubActors.size() );
if( bDrawPrimitives ) m_quadMask.Draw(); if( bDrawPrimitives ) m_quadMask.Draw();
}
fFirstItemToDraw = m_fCurrentItem - fNumItemsToDraw/2.f; float fFirstItemToDraw = m_fCurrentItem - fNumItemsToDraw/2.f;
fLastItemToDraw = m_fCurrentItem + fNumItemsToDraw/2.f; float fLastItemToDraw = m_fCurrentItem + fNumItemsToDraw/2.f;
}
else
{
fFirstItemToDraw = m_fCurrentItem - m_fNumItemsToDraw/2.f;
fLastItemToDraw = m_fCurrentItem + m_fNumItemsToDraw/2.f;
}
bool bDelayedDraw = m_bDrawByZPosition && !m_bLoop; bool bDelayedDraw = m_bDrawByZPosition && !m_bLoop;
vector<Actor*> subs; vector<Actor*> subs;