half-finished codes, options icons, and two new modifiers.

This commit is contained in:
Chris Danford
2002-09-02 21:59:58 +00:00
parent d7e6f59b3b
commit 7d4cf73000
87 changed files with 1313 additions and 1109 deletions
+45 -39
View File
@@ -93,7 +93,7 @@ ScreenSelectDifficulty::ScreenSelectDifficulty()
THEME->GetPathTo("Graphics","select difficulty top edge"),
HELP_TEXT, true, TIMER_SECONDS
);
this->AddSubActor( &m_Menu );
this->AddChild( &m_Menu );
for( int d=0; d<NUM_DIFFICULTY_ITEMS; d++ )
@@ -112,26 +112,26 @@ ScreenSelectDifficulty::ScreenSelectDifficulty()
m_sprPicture[d].SetXY( ITEM_X(d), ITEM_Y(d) );
m_sprPicture[d].SetVertAlign( align_bottom );
m_sprPicture[d].TurnShadowOff();
m_framePages.AddSubActor( &m_sprPicture[d] );
m_framePages.AddChild( &m_sprPicture[d] );
m_sprHeader[d].Load( THEME->GetPathTo("Graphics",sHeaderFile) );
m_sprHeader[d].SetXY( ITEM_X(d), ITEM_Y(d) );
m_sprHeader[d].SetVertAlign( align_top );
m_sprHeader[d].TurnShadowOff();
m_framePages.AddSubActor( &m_sprHeader[d] );
m_framePages.AddChild( &m_sprHeader[d] );
}
for( p=0; p<NUM_PAGES; p++ )
{
m_sprMoreArrows[p].Load( THEME->GetPathTo("Graphics", p==0 ? "select difficulty more page1" : "select difficulty more page2" ) );
m_sprMoreArrows[p].SetXY( MORE_X(p), MORE_Y(p) );
m_framePages.AddSubActor( &m_sprMoreArrows[p] );
m_framePages.AddChild( &m_sprMoreArrows[p] );
m_sprExplanation[p].Load( THEME->GetPathTo("Graphics", "select difficulty explanation") );
m_sprExplanation[p].SetXY( EXPLANATION_X(p), EXPLANATION_Y(p) );
m_sprExplanation[p].StopAnimating();
m_sprExplanation[p].SetState( p );
m_framePages.AddSubActor( &m_sprExplanation[p] );
m_framePages.AddChild( &m_sprExplanation[p] );
}
@@ -147,21 +147,21 @@ ScreenSelectDifficulty::ScreenSelectDifficulty()
m_sprCursorShadow[p].StopAnimating();
m_sprCursorShadow[p].SetState( p );
m_sprCursorShadow[p].TurnShadowOff();
m_sprCursorShadow[p].SetDiffuseColor( D3DXCOLOR(0,0,0,0.6f) );
m_framePages.AddSubActor( &m_sprCursorShadow[p] );
m_sprCursorShadow[p].SetDiffuse( D3DXCOLOR(0,0,0,0.6f) );
m_framePages.AddChild( &m_sprCursorShadow[p] );
m_sprCursor[p].Load( THEME->GetPathTo("Graphics", "select difficulty cursor 2x1") );
m_sprCursor[p].StopAnimating();
m_sprCursor[p].SetState( p );
m_sprCursor[p].TurnShadowOff();
m_sprCursor[p].SetEffectGlowing();
m_framePages.AddSubActor( &m_sprCursor[p] );
m_framePages.AddChild( &m_sprCursor[p] );
m_sprOK[p].Load( THEME->GetPathTo("Graphics", "select difficulty ok 2x1") );
m_framePages.AddSubActor( &m_sprOK[p] );
m_framePages.AddChild( &m_sprOK[p] );
}
this->AddSubActor( &m_framePages );
this->AddChild( &m_framePages );
m_soundChange.Load( THEME->GetPathTo("Sounds", "select difficulty change") );
m_soundSelect.Load( THEME->GetPathTo("Sounds", "menu start") );
@@ -351,6 +351,7 @@ void ScreenSelectDifficulty::ChangeTo( PlayerNumber pn, int iSelectionWas, int i
if( bChangedPagesFrom1To2 || bChangedPagesFrom2To1 )
{
m_framePages.StopTweening();
m_framePages.BeginTweening( 0.2f );
m_framePages.SetTweenX( bSelectedSomethingOnPage1 ? 0.0f : -SCREEN_WIDTH );
}
@@ -359,10 +360,12 @@ void ScreenSelectDifficulty::ChangeTo( PlayerNumber pn, int iSelectionWas, int i
{
if( bSelectedSomethingOnPage2 || bChangedPagesFrom2To1 || p==pn )
{
m_sprCursor[p].StopTweening();
m_sprCursor[p].BeginTweening( 0.2f, bChangedPages ? TWEEN_LINEAR : TWEEN_BIAS_BEGIN );
m_sprCursor[p].SetTweenX( CURSOR_X(m_iSelection[p],(PlayerNumber)p) - CURSOR_SHADOW_LENGTH_X );
m_sprCursor[p].SetTweenY( CURSOR_Y(m_iSelection[p],(PlayerNumber)p) - CURSOR_SHADOW_LENGTH_Y );
m_sprCursorShadow[p].StopTweening();
m_sprCursorShadow[p].BeginTweening( 0.2f, bChangedPages ? TWEEN_LINEAR : TWEEN_BIAS_BEGIN );
m_sprCursorShadow[p].SetTweenX( CURSOR_X(m_iSelection[p],(PlayerNumber)p) );
m_sprCursorShadow[p].SetTweenY( CURSOR_Y(m_iSelection[p],(PlayerNumber)p) );
@@ -402,23 +405,23 @@ void ScreenSelectDifficulty::MenuStart( PlayerNumber pn )
}
}
m_sprCursor[pn].BeginTweeningQueued( 0.2f );
m_sprCursor[pn].BeginTweeningQueued( 0.2f );
m_sprCursor[pn].BeginTweening( 0.2f );
m_sprCursor[pn].BeginTweening( 0.2f );
m_sprCursor[pn].SetTweenX( CURSOR_X(iSelection, pn) );
m_sprCursor[pn].SetTweenY( CURSOR_Y(iSelection, pn) );
m_sprOK[pn].SetX( CURSOR_X(iSelection, pn) );
m_sprOK[pn].SetY( CURSOR_Y(iSelection, pn) );
m_sprOK[pn].SetDiffuseColor( D3DXCOLOR(1,1,1,0) );
m_sprOK[pn].SetDiffuse( D3DXCOLOR(1,1,1,0) );
m_sprOK[pn].SetZoom( 2 );
m_sprOK[pn].BeginTweening( 0.2f );
m_sprOK[pn].SetTweenZoom( 1 );
m_sprOK[pn].SetTweenDiffuseColor( D3DXCOLOR(1,1,1,1) );
m_sprOK[pn].SetTweenDiffuse( D3DXCOLOR(1,1,1,1) );
m_sprCursorShadow[pn].BeginTweeningQueued( 0.2f );
m_sprCursorShadow[pn].BeginTweeningQueued( 0.2f );
m_sprCursorShadow[pn].SetDiffuseColor( D3DXCOLOR(0,0,0,0) );
m_sprCursorShadow[pn].BeginTweening( 0.2f );
m_sprCursorShadow[pn].BeginTweening( 0.2f );
m_sprCursorShadow[pn].SetDiffuse( D3DXCOLOR(0,0,0,0) );
// check to see if everyone has chosen
@@ -450,7 +453,7 @@ void ScreenSelectDifficulty::TweenOffScreen()
m_sprExplanation[p].SetTweenXY( EXPLANATION_X(p)+700, EXPLANATION_Y(p) );
m_sprMoreArrows[p].BeginTweening( 0.5 );
m_sprMoreArrows[p].SetTweenDiffuseColor( D3DXCOLOR(1,1,1,0) );
m_sprMoreArrows[p].SetTweenDiffuse( D3DXCOLOR(1,1,1,0) );
}
for( p=0; p<NUM_PLAYERS; p++ )
@@ -464,8 +467,8 @@ void ScreenSelectDifficulty::TweenOffScreen()
m_sprOK[p].BeginTweening( 0.3f );
m_sprOK[p].SetTweenZoom( 0 );
m_sprCursorShadow[p].BeginTweeningQueued( 0.3f );
m_sprCursorShadow[p].SetTweenDiffuseColor( D3DXCOLOR(0,0,0,0) );
m_sprCursorShadow[p].BeginTweening( 0.3f );
m_sprCursorShadow[p].SetTweenDiffuse( D3DXCOLOR(0,0,0,0) );
}
for( int d=0; d<NUM_DIFFICULTY_ITEMS; d++ )
@@ -476,21 +479,21 @@ void ScreenSelectDifficulty::TweenOffScreen()
const float fPauseTime = d*0.2f;
// pause
m_sprHeader[d].BeginTweeningQueued( fPauseTime );
m_sprHeader[d].BeginTweening( fPauseTime );
m_sprPicture[d].BeginTweeningQueued( fPauseTime );
m_sprPicture[d].BeginTweening( fPauseTime );
// roll up
m_sprHeader[d].BeginTweeningQueued( 0.3f, TWEEN_BOUNCE_BEGIN );
m_sprHeader[d].BeginTweening( 0.3f, TWEEN_BOUNCE_BEGIN );
m_sprPicture[d].BeginTweeningQueued( 0.3f, TWEEN_BOUNCE_BEGIN );
m_sprPicture[d].BeginTweening( 0.3f, TWEEN_BOUNCE_BEGIN );
m_sprPicture[d].SetTweenZoomY( 0 );
// fly off
m_sprHeader[d].BeginTweeningQueued( 0.4f, TWEEN_BIAS_END );
m_sprHeader[d].BeginTweening( 0.4f, TWEEN_BIAS_END );
m_sprHeader[d].SetTweenXY( ITEM_X(d)-700, ITEM_Y(d) );
m_sprPicture[d].BeginTweeningQueued( 0.4f, TWEEN_BIAS_END );
m_sprPicture[d].BeginTweening( 0.4f, TWEEN_BIAS_END );
m_sprPicture[d].SetTweenXY( ITEM_X(d)-700, ITEM_Y(d) );
}
}
@@ -505,9 +508,9 @@ void ScreenSelectDifficulty::TweenOnScreen()
m_sprExplanation[p].BeginTweening( 0.3f, Actor::TWEEN_BOUNCE_END );
m_sprExplanation[p].SetTweenXY( EXPLANATION_X(p), EXPLANATION_Y(p) );
m_sprMoreArrows[p].SetDiffuseColor( D3DXCOLOR(1,1,1,0) );
m_sprMoreArrows[p].SetDiffuse( D3DXCOLOR(1,1,1,0) );
m_sprMoreArrows[p].BeginTweening( 0.5 );
m_sprMoreArrows[p].SetTweenDiffuseColor( D3DXCOLOR(1,1,1,1) );
m_sprMoreArrows[p].SetTweenDiffuse( D3DXCOLOR(1,1,1,1) );
}
for( p=0; p<NUM_PLAYERS; p++ )
@@ -518,19 +521,22 @@ void ScreenSelectDifficulty::TweenOnScreen()
int iSelection = m_iSelection[p];
m_sprCursor[p].SetXY( CURSOR_X(iSelection,(PlayerNumber)p), CURSOR_Y(iSelection,(PlayerNumber)p) );
m_sprCursor[p].SetDiffuseColor( D3DXCOLOR(1,1,1,0) );
/*
m_sprCursor[p].SetDiffuse( D3DXCOLOR(1,1,1,0) );
m_sprCursor[p].SetRotation( D3DX_PI );
m_sprCursor[p].SetZoom( 2 );
m_sprCursor[p].BeginTweening( 0.3f );
m_sprCursor[p].SetTweenDiffuseColor( D3DXCOLOR(1,1,1,1) );
m_sprCursor[p].SetTweenDiffuse( D3DXCOLOR(1,1,1,1) );
m_sprCursor[p].SetTweenRotationZ( 0 );
m_sprCursor[p].SetTweenZoom( 1 );
*/
m_sprCursor[p].FadeOntoScreen( 0, "SpinZ ZoomX ZoomY Fade", 0.3f );
m_sprCursorShadow[p].SetXY( CURSOR_X(iSelection,(PlayerNumber)p), CURSOR_Y(iSelection,(PlayerNumber)p) );
D3DXCOLOR colorOriginal = m_sprCursorShadow[p].GetDiffuseColor();
m_sprCursorShadow[p].SetDiffuseColor( D3DXCOLOR(0,0,0,0) );
D3DXCOLOR colorOriginal = m_sprCursorShadow[p].GetDiffuse();
m_sprCursorShadow[p].SetDiffuse( D3DXCOLOR(0,0,0,0) );
m_sprCursorShadow[p].BeginTweening( 0.3f );
m_sprCursorShadow[p].SetTweenDiffuseColor( colorOriginal );
m_sprCursorShadow[p].SetTweenDiffuse( colorOriginal );
}
for( int d=0; d<NUM_DIFFICULTY_ITEMS; d++ )
@@ -547,21 +553,21 @@ void ScreenSelectDifficulty::TweenOnScreen()
m_sprPicture[d].SetZoomY( 0 );
// pause
m_sprHeader[d].BeginTweeningQueued( fPauseTime );
m_sprHeader[d].BeginTweening( fPauseTime );
m_sprPicture[d].BeginTweeningQueued( fPauseTime );
m_sprPicture[d].BeginTweening( fPauseTime );
// fly on
m_sprHeader[d].BeginTweeningQueued( 0.5f, TWEEN_BIAS_BEGIN );
m_sprHeader[d].BeginTweening( 0.5f, TWEEN_BIAS_BEGIN );
m_sprHeader[d].SetTweenXY( ITEM_X(d), ITEM_Y(d) );
m_sprPicture[d].BeginTweeningQueued( 0.5f, TWEEN_BIAS_BEGIN );
m_sprPicture[d].BeginTweening( 0.5f, TWEEN_BIAS_BEGIN );
m_sprPicture[d].SetTweenXY( ITEM_X(d), ITEM_Y(d) );
// roll down
m_sprHeader[d].BeginTweeningQueued( 0.3f, TWEEN_BOUNCE_END );
m_sprHeader[d].BeginTweening( 0.3f, TWEEN_BOUNCE_END );
m_sprPicture[d].BeginTweeningQueued( 0.3f, TWEEN_BOUNCE_END );
m_sprPicture[d].BeginTweening( 0.3f, TWEEN_BOUNCE_END );
m_sprPicture[d].SetTweenZoomY( 1 );
}