mirrors
/
raylib
mirror of https://github.com/raysan5/raylib
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Working in some bugs and screen transition 

Detected a VERY weird code behaviour... :(
This commit is contained in:
Ray San 2017-01-24 12:14:15 +01:00
parent 825eab37e2
commit 8a549c3fbe
1 changed files with 52 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
games/wave_collector/wave_collector.c
View File

@ -30,21 +30,24 @@ const int screenWidth = 1280;
const int screenHeight = 720; const int screenHeight = 720;
// Required variables to manage screen transitions (fade-in, fade-out) // Required variables to manage screen transitions (fade-in, fade-out)
float transAlpha = 0; static float transAlpha = 0.0f;
bool onTransition = false; static bool onTransition = false;
bool transFadeOut = false; static bool transFadeOut = false;
int transFromScreen = -1; static int transFromScreen = -1;
int transToScreen = -1; static int transToScreen = -1;
// NOTE: Some global variables that require to be visible for all screens,
// are defined in screens.h (i.e. currentScreen)
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
// Local Functions Declaration // Local Functions Declaration
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
void TransitionToScreen(int screen); static void TransitionToScreen(int screen);
void ChangeToScreen(int screen); // No transition effect static void ChangeToScreen(int screen); // No transition effect
void UpdateTransition(void); static void UpdateTransition(void);
void DrawTransition(void); static void DrawTransition(void);
void UpdateDrawFrame(void); // Update and Draw one frame static void UpdateDrawFrame(void); // Update and Draw one frame
//static const char *GetExtension(const char *fileName); //static const char *GetExtension(const char *fileName);
@ -115,7 +118,7 @@ int main(int argc, char *argv[])
UnloadSpriteFont(font); UnloadSpriteFont(font);
UnloadMusicStream(music); UnloadMusicStream(music);
CloseAudioDevice(); CloseAudioDevice(); // Close audio context
CloseWindow(); // Close window and OpenGL context CloseWindow(); // Close window and OpenGL context
//-------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------
@ -123,15 +126,24 @@ int main(int argc, char *argv[])
return 0; return 0;
} }
void TransitionToScreen(int screen) //----------------------------------------------------------------------------------
// Module specific Functions Definition
//----------------------------------------------------------------------------------
// Define transition to next screen
static void TransitionToScreen(int screen)
{ {
onTransition = true; onTransition = true;
transFadeOut = false;
transFromScreen = currentScreen; transFromScreen = currentScreen;
transToScreen = screen; transToScreen = screen;
transAlpha = 0.0f;
} }
// Change to next screen, no transition
void ChangeToScreen(int screen) void ChangeToScreen(int screen)
{ {
// Unload current screen
switch (currentScreen) switch (currentScreen)
{ {
case LOGO: UnloadLogoScreen(); break; case LOGO: UnloadLogoScreen(); break;
@ -141,6 +153,7 @@ void ChangeToScreen(int screen)
default: break; default: break;
} }
// Init next screen
switch (screen) switch (screen)
{ {
case LOGO: InitLogoScreen(); break; case LOGO: InitLogoScreen(); break;
@ -153,16 +166,23 @@ void ChangeToScreen(int screen)
currentScreen = screen; currentScreen = screen;
} }
// Update transition effect
void UpdateTransition(void) void UpdateTransition(void)
{ {
if (!transFadeOut) if (!transFadeOut)
{ {
transAlpha += 0.05f; transAlpha += 0.05f;
if (transAlpha >= 1.0) printf("transAlpha: %f\n", transAlpha);
{
transAlpha = 1.0;
// TODO: Investigate this! SO WEIRD! Comparing with 1.0f does not work! Compiler optimization???
if (transAlpha > 1.00001f) // Make sure alpha is greater than 1.0, to avoid last frame loading stop
{
printf("alpha on change: %e\n", transAlpha);
transAlpha = 1.0f;
// Unload current screen
switch (transFromScreen) switch (transFromScreen)
{ {
case LOGO: UnloadLogoScreen(); break; case LOGO: UnloadLogoScreen(); break;
@ -172,31 +192,19 @@ void UpdateTransition(void)
default: break; default: break;
} }
// Load next screen
switch (transToScreen) switch (transToScreen)
{ {
case LOGO: case LOGO: InitLogoScreen(); break;
{ case TITLE: InitTitleScreen(); break;
InitLogoScreen(); case GAMEPLAY: InitGameplayScreen(); break;
currentScreen = LOGO; case ENDING: InitEndingScreen(); break;
} break;
case TITLE:
{
InitTitleScreen();
currentScreen = TITLE;
} break;
case GAMEPLAY:
{
InitGameplayScreen();
currentScreen = GAMEPLAY;
} break;
case ENDING:
{
InitEndingScreen();
currentScreen = ENDING;
} break;
default: break; default: break;
} }
currentScreen = transToScreen;
// Activate fade out effect to next loaded screen
transFadeOut = true; transFadeOut = true;
} }
} }
@ -204,9 +212,9 @@ void UpdateTransition(void)
{ {
transAlpha -= 0.05f; transAlpha -= 0.05f;
if (transAlpha <= 0) if (transAlpha <= 0.0f)
{ {
transAlpha = 0; transAlpha = 0.0f;
transFadeOut = false; transFadeOut = false;
onTransition = false; onTransition = false;
transFromScreen = -1; transFromScreen = -1;
@ -215,6 +223,7 @@ void UpdateTransition(void)
} }
} }
// Draw transition effect (full-screen rectangle)
void DrawTransition(void) void DrawTransition(void)
{ {
DrawRectangle(0, 0, GetScreenWidth(), GetScreenHeight(), Fade(RAYWHITE, transAlpha)); DrawRectangle(0, 0, GetScreenWidth(), GetScreenHeight(), Fade(RAYWHITE, transAlpha));
@ -240,11 +249,7 @@ void UpdateDrawFrame(void)
{ {
UpdateTitleScreen(); UpdateTitleScreen();
if (FinishTitleScreen() == 1) if (FinishTitleScreen() == 1) TransitionToScreen(GAMEPLAY);
{
StopMusicStream(music);
TransitionToScreen(GAMEPLAY);
}
} break; } break;
case GAMEPLAY: case GAMEPLAY:
@ -265,12 +270,9 @@ void UpdateDrawFrame(void)
default: break; default: break;
} }
} }
else else UpdateTransition(); // Update transition (fade-in, fade-out)
{
// Update transition (fade-in, fade-out)
UpdateTransition();
}
// TODO: Review! It breaks the game sometimes!!!
if (currentScreen != ENDING) UpdateMusicStream(music); if (currentScreen != ENDING) UpdateMusicStream(music);
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
@ -289,6 +291,7 @@ void UpdateDrawFrame(void)
default: break; default: break;
} }
// Draw full screen rectangle in front of everything
if (onTransition) DrawTransition(); if (onTransition) DrawTransition();
//DrawFPS(10, 10); //DrawFPS(10, 10);