diff --git a/stepmania/src/ActorScroller.cpp b/stepmania/src/ActorScroller.cpp index 5feae8c17e..e707634944 100644 --- a/stepmania/src/ActorScroller.cpp +++ b/stepmania/src/ActorScroller.cpp @@ -234,10 +234,10 @@ void ActorScroller::PositionItemsAndDrawPrimitives( bool bDrawPrimitives ) float fPositionFullyOffScreenTop = -(fNumItemsToDraw)/2.f; float fPositionFullyOffScreenBottom = (fNumItemsToDraw)/2.f; - m_exprTransformFunction.PositionItem( &m_quadMask, fPositionFullyOffScreenTop, -1, m_iNumItems ); + m_exprTransformFunction.TransformItem( &m_quadMask, fPositionFullyOffScreenTop, -1, m_iNumItems ); if( bDrawPrimitives ) m_quadMask.Draw(); - m_exprTransformFunction.PositionItem( &m_quadMask, fPositionFullyOffScreenBottom, m_iNumItems, m_iNumItems ); + m_exprTransformFunction.TransformItem( &m_quadMask, fPositionFullyOffScreenBottom, m_iNumItems, m_iNumItems ); if( bDrawPrimitives ) m_quadMask.Draw(); } @@ -281,7 +281,7 @@ void ActorScroller::PositionItemsAndDrawPrimitives( bool bDrawPrimitives ) if( !m_bFunctionDependsOnItemIndex ) iItem = 0; - m_exprTransformFunction.PositionItem( m_SubActors[iIndex], fPosition, iItem, m_iNumItems ); + m_exprTransformFunction.TransformItem( m_SubActors[iIndex], fPosition, iItem, m_iNumItems ); if( bDrawPrimitives ) { if( bDelayedDraw ) diff --git a/stepmania/src/LuaExpressionTransform.cpp b/stepmania/src/LuaExpressionTransform.cpp index bbebae30e3..93009e6288 100644 --- a/stepmania/src/LuaExpressionTransform.cpp +++ b/stepmania/src/LuaExpressionTransform.cpp @@ -40,7 +40,7 @@ const Actor::TweenState &LuaExpressionTransform::GetPosition( float fPositionOff return m_mapPositionToTweenStateCache[key] = a.DestTweenState(); } -void LuaExpressionTransform::PositionItem( Actor *pActor, float fPositionOffsetFromCenter, int iItemIndex, int iNumItems ) +void LuaExpressionTransform::TransformItem( Actor *pActor, float fPositionOffsetFromCenter, int iItemIndex, int iNumItems ) { float fInterval = 1.0f / m_iNumSubdivisions; float fFloor = QuantizeDown( fPositionOffsetFromCenter, fInterval ); diff --git a/stepmania/src/LuaExpressionTransform.h b/stepmania/src/LuaExpressionTransform.h index 07698a0268..cb143e0eeb 100644 --- a/stepmania/src/LuaExpressionTransform.h +++ b/stepmania/src/LuaExpressionTransform.h @@ -16,7 +16,7 @@ public: void SetFromReference( const LuaReference &ref ); void SetNumSubdivisions( int iNumSubdivisions ) { ASSERT( iNumSubdivisions > 0 ); m_iNumSubdivisions = iNumSubdivisions; } - void PositionItem( Actor *pActor, float fPositionOffsetFromCenter, int iItemIndex, int iNumItems ); + void TransformItem( Actor *pActor, float fPositionOffsetFromCenter, int iItemIndex, int iNumItems ); const Actor::TweenState &GetPosition( float fPositionOffsetFromCenter, int iItemIndex, int iNumItems ) const; void ClearCache() { m_mapPositionToTweenStateCache.clear(); } diff --git a/stepmania/src/StreamDisplay.cpp b/stepmania/src/StreamDisplay.cpp index 4dc5e9e9e8..3f4ab0b029 100644 --- a/stepmania/src/StreamDisplay.cpp +++ b/stepmania/src/StreamDisplay.cpp @@ -40,7 +40,7 @@ void StreamDisplay::Load( const RString &_sMetricsGroup ) Sprite *pSpr = new Sprite; pSpr->Load( THEME->GetPathG(sMetricsGroup,StreamTypeToString(st)) ); m_vpSprPill[st].push_back( pSpr ); - m_transformPill.PositionItem( pSpr, -1, i, iNumPills ); + m_transformPill.TransformItem( pSpr, -1, i, iNumPills ); float f = 1 / fTextureCoordScaleX; pSpr->SetCustomTextureRect( RectF(f*i,0,f*(i+1),1) );