Using ActorScroller adds too many metrics. Prefer to set parameters

that aren't needed for initialization and aren't always used via
commands, not load-time parameters.
This commit is contained in:
Glenn Maynard
2005-12-06 03:29:16 +00:00
parent 569f3055db
commit abeead164e
5 changed files with 1 additions and 9 deletions
+1 -4
View File
@@ -43,14 +43,13 @@ void ActorScroller::Load2(
float fItemHeight,
bool bLoop )
{
Load3( fSecondsPerItem, fNumItemsToDraw, false,
Load3( fSecondsPerItem, fNumItemsToDraw,
ssprintf("function(self,offset,itemIndex,numItems) self:y(%f*offset) end",fItemHeight), 1, bLoop );
}
void ActorScroller::Load3(
float fSecondsPerItem,
float fNumItemsToDraw,
bool bFastCatchup,
const CString &sTransformFunction,
int iSubdivisions,
bool bLoop
@@ -58,7 +57,6 @@ void ActorScroller::Load3(
{
m_fSecondsPerItem = fSecondsPerItem;
m_fNumItemsToDraw = fNumItemsToDraw;
m_bFastCatchup = bFastCatchup;
m_exprTransformFunction.SetFromExpression( sTransformFunction, iSubdivisions );
m_bLoop = bLoop;
m_iNumItems = m_SubActors.size();
@@ -122,7 +120,6 @@ void ActorScroller::LoadFromNode( const CString &sDir, const XNode *pNode )
Load3(
fSecondsPerItem,
fNumItemsToDraw,
false,
sTransformFunction,
iSubdivisions,
false );
-1
View File
@@ -22,7 +22,6 @@ public:
void Load3(
float fSecondsPerItem,
float fNumItemsToDraw,
bool bFastCatchup,
const CString &sTransformFunction,
int iSubdivisions,
bool bLoop );
@@ -118,7 +118,6 @@ void HighScoreWheel::Load( const HighScoreList& hsl, int iIndexToFocus )
ActorScroller::Load3(
0.2f,
10.5,
false,
sTransformFunction,
1,
false );
-2
View File
@@ -39,7 +39,6 @@ ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sCl
WRAP_CURSOR(m_sName,"WrapCursor"),
WRAP_SCROLLER(m_sName,"WrapScroller"),
LOOP_SCROLLER(m_sName,"LoopScroller"),
SCROLLER_FAST_CATCHUP(m_sName,"ScrollerFastCatchup"),
ALLOW_REPEATING_INPUT(m_sName,"AllowRepeatingInput"),
SCROLLER_SECONDS_PER_ITEM(m_sName,"ScrollerSecondsPerItem"),
SCROLLER_NUM_ITEMS_TO_DRAW(m_sName,"ScrollerNumItemsToDraw"),
@@ -132,7 +131,6 @@ void ScreenSelectMaster::Init()
m_Scroller[*p].Load3(
SCROLLER_SECONDS_PER_ITEM,
SCROLLER_NUM_ITEMS_TO_DRAW,
SCROLLER_FAST_CATCHUP,
SCROLLER_TRANSFORM,
SCROLLER_SUBDIVISIONS,
LOOP_SCROLLER );
-1
View File
@@ -48,7 +48,6 @@ protected:
ThemeMetric<bool> WRAP_CURSOR;
ThemeMetric<bool> WRAP_SCROLLER;
ThemeMetric<bool> LOOP_SCROLLER;
ThemeMetric<bool> SCROLLER_FAST_CATCHUP;
ThemeMetric<bool> ALLOW_REPEATING_INPUT;
ThemeMetric<float> SCROLLER_SECONDS_PER_ITEM;
ThemeMetric<float> SCROLLER_NUM_ITEMS_TO_DRAW;