J :
* Fix rotation to take over-one-ratios into account.
This commit is contained in:
@@ -371,13 +371,24 @@ class GameStateDeckViewer: public GameState, public JGuiListener
|
|||||||
//mAlpha = 128;
|
//mAlpha = 128;
|
||||||
if (mStage == STAGE_TRANSITION_RIGHT){
|
if (mStage == STAGE_TRANSITION_RIGHT){
|
||||||
mRotation -= dt * scrollSpeed;
|
mRotation -= dt * scrollSpeed;
|
||||||
|
if (mRotation < -1.0f){
|
||||||
|
do {
|
||||||
|
rotateCards(mStage);
|
||||||
|
mRotation += 1;
|
||||||
|
} while (mRotation < -1.0f);
|
||||||
|
mStage = STAGE_WAITING;
|
||||||
|
mRotation = 0;
|
||||||
|
}
|
||||||
}else if(mStage == STAGE_TRANSITION_LEFT){
|
}else if(mStage == STAGE_TRANSITION_LEFT){
|
||||||
mRotation += dt * scrollSpeed;
|
mRotation += dt * scrollSpeed;
|
||||||
}
|
if (mRotation > 1.0f){
|
||||||
while (fabs(mRotation) > 1.0f){
|
do {
|
||||||
rotateCards(mStage);
|
rotateCards(mStage);
|
||||||
mRotation = 0;
|
mRotation -= 1;
|
||||||
mStage = STAGE_WAITING;
|
} while (mRotation > 1.0f);
|
||||||
|
mStage = STAGE_WAITING;
|
||||||
|
mRotation = 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} if (mStage == STAGE_TRANSITION_DOWN || mStage == STAGE_TRANSITION_UP){
|
} if (mStage == STAGE_TRANSITION_DOWN || mStage == STAGE_TRANSITION_UP){
|
||||||
if (mStage == STAGE_TRANSITION_DOWN){
|
if (mStage == STAGE_TRANSITION_DOWN){
|
||||||
|
|||||||
Reference in New Issue
Block a user