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

PositionItem -> TransformItem

Browse Source
This commit is contained in:
Chris Danford
2008-03-22 02:17:08 +00:00
parent 4d183a1229
commit c0cc1d4065
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ActorScroller.cpp
+3 -3
View File
@@ -234,10 +234,10 @@ void ActorScroller::PositionItemsAndDrawPrimitives( bool bDrawPrimitives )
float fPositionFullyOffScreenTop = -(fNumItemsToDraw)/2.f; float fPositionFullyOffScreenTop = -(fNumItemsToDraw)/2.f;
float fPositionFullyOffScreenBottom = (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(); 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(); if( bDrawPrimitives ) m_quadMask.Draw();
} }
@@ -281,7 +281,7 @@ void ActorScroller::PositionItemsAndDrawPrimitives( bool bDrawPrimitives )
if( !m_bFunctionDependsOnItemIndex ) if( !m_bFunctionDependsOnItemIndex )
iItem = 0; 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( bDrawPrimitives )
{ {
if( bDelayedDraw ) if( bDelayedDraw )
stepmania/src/LuaExpressionTransform.cpp
+1 -1
View File
@@ -40,7 +40,7 @@ const Actor::TweenState &LuaExpressionTransform::GetPosition( float fPositionOff
return m_mapPositionToTweenStateCache[key] = a.DestTweenState(); 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 fInterval = 1.0f / m_iNumSubdivisions;
float fFloor = QuantizeDown( fPositionOffsetFromCenter, fInterval ); float fFloor = QuantizeDown( fPositionOffsetFromCenter, fInterval );
stepmania/src/LuaExpressionTransform.h
+1 -1
View File
@@ -16,7 +16,7 @@ public:
void SetFromReference( const LuaReference &ref ); void SetFromReference( const LuaReference &ref );
void SetNumSubdivisions( int iNumSubdivisions ) { ASSERT( iNumSubdivisions > 0 ); m_iNumSubdivisions = iNumSubdivisions; } 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; const Actor::TweenState &GetPosition( float fPositionOffsetFromCenter, int iItemIndex, int iNumItems ) const;
void ClearCache() { m_mapPositionToTweenStateCache.clear(); } void ClearCache() { m_mapPositionToTweenStateCache.clear(); }
stepmania/src/StreamDisplay.cpp
+1 -1
View File
@@ -40,7 +40,7 @@ void StreamDisplay::Load( const RString &_sMetricsGroup )
Sprite *pSpr = new Sprite; Sprite *pSpr = new Sprite;
pSpr->Load( THEME->GetPathG(sMetricsGroup,StreamTypeToString(st)) ); pSpr->Load( THEME->GetPathG(sMetricsGroup,StreamTypeToString(st)) );
m_vpSprPill[st].push_back( pSpr ); m_vpSprPill[st].push_back( pSpr );
m_transformPill.PositionItem( pSpr, -1, i, iNumPills ); m_transformPill.TransformItem( pSpr, -1, i, iNumPills );
float f = 1 / fTextureCoordScaleX; float f = 1 / fTextureCoordScaleX;
pSpr->SetCustomTextureRect( RectF(f*i,0,f*(i+1),1) ); pSpr->SetCustomTextureRect( RectF(f*i,0,f*(i+1),1) );