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

remove special position transforms and feed the main transform with special offset values

Browse Source
This commit is contained in:
Chris Danford
2005-12-06 04:17:37 +00:00
parent 5acbca107c
commit d057e2a488
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenOptions.cpp
+9 -9
View File
@@ -105,9 +105,6 @@ ScreenOptions::ScreenOptions( CString sClassName ) : ScreenWithMenuElements(sCla
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"), 1 );
m_exprRowOffScreenTopTransformFunction .SetFromExpression( THEME->GetMetric(m_sName,"RowOffScreenTopTransformFunction"), 1 );
m_exprRowOffScreenCenterTransformFunction .SetFromExpression( THEME->GetMetric(m_sName,"RowOffScreenCenterTransformFunction"), 1 );
m_exprRowOffScreenBottomTransformFunction .SetFromExpression( THEME->GetMetric(m_sName,"RowOffScreenBottomTransformFunction"), 1 );
} }
@@ -729,15 +726,18 @@ void ScreenOptions::PositionRows()
{ {
OptionRow &row = *Rows[i]; OptionRow &row = *Rows[i];
float fPos = pos;
LuaExpressionTransform *pExpr = NULL; LuaExpressionTransform *pExpr = NULL;
if( i < first_start ) pExpr = &m_exprRowOffScreenTopTransformFunction; pExpr = &m_exprRowPositionTransformFunction;
else if( i < first_end ) pExpr = &m_exprRowPositionTransformFunction;
else if( i < second_start ) pExpr = &m_exprRowOffScreenCenterTransformFunction;
else if( i < second_end ) pExpr = &m_exprRowPositionTransformFunction;
else pExpr = &m_exprRowOffScreenBottomTransformFunction;
row.m_tsDestination = pExpr->GetPosition( (float) pos, i, min( (int)Rows.size(), (int)NUM_ROWS_SHOWN ) ); if( i < first_start ) fPos = -0.5f;
else if( i < first_end ) ;
else if( i < second_start ) fPos = ((int)NUM_ROWS_SHOWN)/2-0.5f;
else if( i < second_end ) ;
else fPos = ((int)NUM_ROWS_SHOWN)-0.5f;
row.m_tsDestination = m_exprRowPositionTransformFunction.GetPosition( (float) fPos, i, min( (int)Rows.size(), (int)NUM_ROWS_SHOWN ) );
bool bHidden = bool bHidden =
i < first_start || i < first_start ||
stepmania/src/ScreenOptions.h
-3
View File
@@ -141,9 +141,6 @@ protected:
ThemeMetric<apActorCommands> ROW_ON_COMMAND; ThemeMetric<apActorCommands> ROW_ON_COMMAND;
ThemeMetric<apActorCommands> ROW_OFF_COMMAND; ThemeMetric<apActorCommands> ROW_OFF_COMMAND;
LuaExpressionTransform m_exprRowPositionTransformFunction; // params: self,positionIndex,itemIndex,numItems LuaExpressionTransform m_exprRowPositionTransformFunction; // params: self,positionIndex,itemIndex,numItems
LuaExpressionTransform m_exprRowOffScreenTopTransformFunction; // params: self,positionIndex,itemIndex,numItems
LuaExpressionTransform m_exprRowOffScreenCenterTransformFunction; // params: self,positionIndex,itemIndex,numItems
LuaExpressionTransform m_exprRowOffScreenBottomTransformFunction; // params: self,positionIndex,itemIndex,numItems
ThemeMetric1D<float> EXPLANATION_X; ThemeMetric1D<float> EXPLANATION_X;
ThemeMetric1D<float> EXPLANATION_Y; ThemeMetric1D<float> EXPLANATION_Y;
ThemeMetric1D<apActorCommands> EXPLANATION_ON_COMMAND; ThemeMetric1D<apActorCommands> EXPLANATION_ON_COMMAND;