Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

J :

Browse Source 
* Dude, try Triangle.
This commit is contained in:
jean.chalard
2008-11-18 14:10:06 +00:00
parent b08bd5a8c3
commit 2434571fa2
1 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
projects/mtg/include/GameStateMenu.h
View File

@@ -55,7 +55,8 @@ class GameStateMenu: public GameState, public JGuiListener
int mReadConf; int mReadConf;
float timeIndex; float timeIndex;
float angleMultiplier; float angleMultiplier;
float angleW;
float yW;
public: public:
GameStateMenu(GameApp* parent): GameState(parent) GameStateMenu(GameApp* parent): GameState(parent)
@@ -65,7 +66,8 @@ class GameStateMenu: public GameState, public JGuiListener
mIconsTexture = NULL; mIconsTexture = NULL;
bgMusic = NULL; bgMusic = NULL;
timeIndex = 0; timeIndex = 0;
angleMultiplier = 0.4; angleMultiplier = MIN_ANGLE_MULTIPLIER;
yW = 55;
} }
virtual ~GameStateMenu() virtual ~GameStateMenu()
@@ -270,10 +272,26 @@ class GameStateMenu: public GameState, public JGuiListener
} }
} }
if (currentState == STATE_WARNING && !ALPHA_WARNING) currentState = STATE_MENU; if (currentState == STATE_WARNING && !ALPHA_WARNING) currentState = STATE_MENU;
if (mEngine->GetButtonState(PSP_CTRL_SQUARE)) angleMultiplier += STEP_ANGLE_MULTIPLIER; if (yW <= 55)
else angleMultiplier *= 0.9999; {
if (angleMultiplier > MAX_ANGLE_MULTIPLIER) angleMultiplier = MAX_ANGLE_MULTIPLIER; if (mEngine->GetButtonState(PSP_CTRL_SQUARE)) angleMultiplier += STEP_ANGLE_MULTIPLIER;
else if (angleMultiplier < MIN_ANGLE_MULTIPLIER) angleMultiplier = MIN_ANGLE_MULTIPLIER; else angleMultiplier *= 0.9999;
if (angleMultiplier > MAX_ANGLE_MULTIPLIER) angleMultiplier = MAX_ANGLE_MULTIPLIER;
else if (angleMultiplier < MIN_ANGLE_MULTIPLIER) angleMultiplier = MIN_ANGLE_MULTIPLIER;
if (mEngine->GetButtonState(PSP_CTRL_TRIANGLE) && (dt != 0))
{
angleMultiplier = (cos(timeIndex)*angleMultiplier - M_PI/3 - 0.1 - angleW) / dt;
yW = yW + 0.001 + (yW - 55) / 1000;
}
else
angleW = cos(timeIndex)*angleMultiplier - M_PI/3 - 0.1;
}
else
{
angleW += angleMultiplier * dt;
yW = yW + 0.001 + (yW - 55) / 1000;
}
} }
void createUsersFirstDeck(int setId){ void createUsersFirstDeck(int setId){
@@ -348,7 +366,7 @@ class GameStateMenu: public GameState, public JGuiListener
renderer->FillRect(0,0,SCREEN_WIDTH,SCREEN_HEIGHT,colors); renderer->FillRect(0,0,SCREEN_WIDTH,SCREEN_HEIGHT,colors);
renderer->RenderQuad(mBg, SCREEN_WIDTH/2, 50); renderer->RenderQuad(mBg, SCREEN_WIDTH/2, 50);
renderer->RenderQuad(mMovingW, SCREEN_WIDTH/2 - 10, 55, cos(timeIndex)*angleMultiplier - M_PI/3 - 0.1); if (yW < 2*SCREEN_HEIGHT) renderer->RenderQuad(mMovingW, SCREEN_WIDTH/2 - 10, yW, angleW);
if (mGuiController!=NULL) if (mGuiController!=NULL)
mGuiController->Render(); mGuiController->Render();