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

split SetNumSubdivisions

Browse Source
This commit is contained in:
Glenn Maynard
2005-12-07 04:16:11 +00:00
parent 12ff6ff4da
commit 7b646dc6b1
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
+2 -1
View File
@@ -54,7 +54,8 @@ void ActorScroller::Load3(
) )
{ {
m_fNumItemsToDraw = fNumItemsToDraw; m_fNumItemsToDraw = fNumItemsToDraw;
m_exprTransformFunction.SetFromExpression( sTransformFunction, iSubdivisions ); m_exprTransformFunction.SetFromExpression( sTransformFunction );
m_exprTransformFunction.SetNumSubdivisions( iSubdivisions );
m_bLoop = bLoop; m_bLoop = bLoop;
m_iNumItems = m_SubActors.size(); m_iNumItems = m_SubActors.size();
} }
stepmania/src/LuaExpressionTransform.cpp
+1 -3
View File
@@ -10,11 +10,9 @@ LuaExpressionTransform::LuaExpressionTransform()
m_iNumSubdivisions = 1; m_iNumSubdivisions = 1;
} }
void LuaExpressionTransform::SetFromExpression( const CString &sExpression, int iNumSubdivisions ) void LuaExpressionTransform::SetFromExpression( const CString &sExpression )
{ {
ASSERT( iNumSubdivisions > 0 );
m_pexprTransformFunction->SetFromExpression( sExpression ); m_pexprTransformFunction->SetFromExpression( sExpression );
m_iNumSubdivisions = iNumSubdivisions;
} }
const Actor::TweenState &LuaExpressionTransform::GetPosition( float fPositionOffsetFromCenter, int iItemIndex, int iNumItems ) const const Actor::TweenState &LuaExpressionTransform::GetPosition( float fPositionOffsetFromCenter, int iItemIndex, int iNumItems ) const
stepmania/src/LuaExpressionTransform.h
+2 -1
View File
@@ -12,7 +12,8 @@ class LuaExpressionTransform
public: public:
LuaExpressionTransform(); LuaExpressionTransform();
void SetFromExpression( const CString &sExpression, int iNumSubdivisions ); void SetFromExpression( const CString &sExpression );
void SetNumSubdivisions( int iNumSubdivisions ) { ASSERT( iNumSubdivisions > 0 ); m_iNumSubdivisions = iNumSubdivisions; }
void PositionItem( Actor *pActor, float fPositionOffsetFromCenter, int iItemIndex, int iNumItems ); void PositionItem( 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;
stepmania/src/ScreenOptions.cpp
+1 -1
View File
@@ -104,7 +104,7 @@ ScreenOptions::ScreenOptions( CString sClassName ) : ScreenWithMenuElements(sCla
m_OptionsNavigation = PREFSMAN->m_bArcadeOptionsNavigation? NAV_THREE_KEY:NAV_FIVE_KEY; m_OptionsNavigation = PREFSMAN->m_bArcadeOptionsNavigation? NAV_THREE_KEY:NAV_FIVE_KEY;
m_InputMode = INPUTMODE_SHARE_CURSOR; m_InputMode = INPUTMODE_SHARE_CURSOR;
m_exprRowPositionTransformFunction .SetFromExpression( THEME->GetMetric(m_sName,"RowPositionTransformFunction"), 1 ); m_exprRowPositionTransformFunction.SetFromExpression( THEME->GetMetric(m_sName,"RowPositionTransformFunction") );
} }