refactor: settings.h to menusettings.h

include/app.h

@@ -11,7 +11,6 @@
 #include "logo.h"
 #include "menu.h"
 #include "game.h"
-#include "settings.h"
 
 typedef struct {
     Config config;
@@ -22,7 +21,6 @@ typedef struct {
     LogoState logo;	
     MenuState menu;
     GameState game;
-	SettingsState settings;
 } App;
 
 void ConfigApp(App* app){
@@ -40,7 +38,6 @@ void InitApp(App *app){
     InitLogo(&app->logo);
     InitMenu(&app->menu);
     InitGame(&app->game,&app->window);
-	InitSettings(&app->settings);
 }
 
 void UpdateApp(App *app){
@@ -67,11 +64,6 @@ void UpdateApp(App *app){
                 UpdateGame(&app->game, &app->state, &app->flags);
                 RenderGame(&app->game, &app->state, &app->flags);
             }break;
-			case SETTINGS:
-			{
-				UpdateSettings(&app->settings, &app->state, &app->flags); 
-				RenderSettings(&app->settings, &app->flags);
-			}
             default: break;
         } 
     }

include/menu.h

@@ -1,221 +1,62 @@
 #ifndef MENU_H
 #define MENU_H
 
-#include <gui.h>
+#include <menuview.h>
-#include <asset.h>
+#include <menusettings.h>
-#include <gamegui.h>
+#include <menumain.h>
-#include <input.h>
-#include <soundtrack.h>
-
-#include "menuassets.h"
-#include "colors.h"
-#include "background.h"
 
 typedef struct
 {
-    Assets assets;
+	MenuView menuView;
-    Mouse mouse;
+	MenuMain menuMain;	
-    Texture2D textures[MENU_TEX_COUNT];
+	MenuSettings menuSettings;
-    Sound sounds[MENU_SOUND_COUNT];
-    Soundtrack soundtracks[MENU_SOUNDTRACK_COUNT];
-    ImageElement board;
-    ImageButton playButton;
-    ImageButton quitButton;
-	ImageButton settingsButton;
-    int menuScale;
-    Background background;
-    Background midground;
-    Background foreground;
 } MenuState;
 
 void InitMenu(MenuState *m)
 {
-
+	m->menuView = MAIN;
-    m->assets = (Assets){
+	InitMenuSettings(&m->menuSettings);
-        .textureAssets = menuTextureAssets,
+	InitMenuMain(&m->menuMain);
-        .soundAssets = menuSoundAssets,
-        .soundtrackAssets = menuSoundtrackAssets};
-
-    for (int i = 0; i < MENU_TEX_COUNT; i++)
-    {
-        m->textures[i] = LoadTexture(m->assets.textureAssets[i].path);
-    }
-
-    for (int i = 0; i < MENU_SOUND_COUNT; i++)
-    {
-        m->sounds[i] = LoadSound(m->assets.soundAssets[i].path);
-    }
-
-    for (int i = 0; i < MENU_SOUNDTRACK_COUNT; i++)
-    {
-        m->soundtracks[i] = LoadSoundtrack(m->assets.soundtrackAssets[i].path);
-    }
-
-    InitBackground(0.1f, &m->background, &m->textures[MENU_CLOUD_BACKGROUND], &m->assets.textureAssets[MENU_CLOUD_BACKGROUND]);
-    InitBackground(0.2f, &m->midground, &m->textures[MENU_CLOUD_MIDGROUND], &m->assets.textureAssets[MENU_CLOUD_MIDGROUND]);
-    InitBackground(0.3f, &m->foreground, &m->textures[MENU_CLOUD_FOREGROUND], &m->assets.textureAssets[MENU_CLOUD_FOREGROUND]);
-
-    m->mouse = CreateMouse(0.10f, 5.0f, 10.0f, &m->textures[MENU_CURSOR_TEX]);
-
-    m->menuScale = 4;
-    int windowWidth = GetScreenWidth();
-    int windowHeight = GetScreenHeight();
-    Vector2 windowCenter = {windowWidth / 2, windowHeight / 2};
-
-    int boardWidth = windowWidth / m->menuScale * 2.5f;
-    float boardScaleFactor = (float)boardWidth / m->assets.textureAssets[MENU_BOARD_TEX].frameWidth;
-    int boardHeight = (int)(m->assets.textureAssets[MENU_BOARD_TEX].frameHeight * boardScaleFactor);
-
-    Vector2 boardSource = {128.0f, 0.0f};
-    Rectangle boardDestRec = {
-        .x = windowCenter.x - (boardWidth / 2),
-        .y = windowCenter.y - (boardHeight / 2),
-        .width = boardWidth,
-        .height = boardHeight};
-
-    m->board = CreateImageElement(&m->textures[MENU_BOARD_TEX], &m->assets.textureAssets[MENU_BOARD_TEX], &boardSource, &boardDestRec);
-
-    int buttonWidth = windowWidth / m->menuScale;
-    float buttonScaleFactor = (float)buttonWidth / m->assets.textureAssets[MENU_BIG_BUTTONS_TEX].frameWidth;
-    int buttonHeight = (int)(m->assets.textureAssets[MENU_BIG_BUTTONS_TEX].frameHeight * buttonScaleFactor);
-    int buttonSpacing = buttonHeight;
-
-
-	//Button texture dimensions
-	float menuButtonWidth = m->assets.textureAssets[MENU_BIG_BUTTONS_TEX].frameWidth;
-	float menuButtonHeight = m->assets.textureAssets[MENU_BIG_BUTTONS_TEX].frameHeight;
-
-	//Quit Button
-    Vector2 quitButtonNotPressed = {0.0f, 0.0f};
-    Vector2 quitButtonHover = {menuButtonWidth, 0.0f};
-    Vector2 quitButtonPressed = {menuButtonWidth * 2, 0.0f};
-
-    Rectangle quitButtonDestRec = {
-        .x = windowCenter.x - (buttonWidth / 2),
-        .y = windowCenter.y - (buttonHeight / 2) + buttonSpacing,
-        .width = buttonWidth,
-        .height = buttonHeight
-	};
-
-    m->quitButton = CreateImageButton(NOT_CLICKED, &m->textures[MENU_BIG_BUTTONS_TEX], &m->assets.textureAssets[MENU_BIG_BUTTONS_TEX], &quitButtonNotPressed, &quitButtonPressed, &quitButtonHover, &quitButtonDestRec);
-
-	//Play Button
-    Vector2 playButtonNotPressed = {0.0f, menuButtonHeight};
-    Vector2 playButtonHover = {menuButtonWidth, menuButtonHeight};
-    Vector2 playButtonPressed = {menuButtonWidth * 2, menuButtonHeight};
-
-    Rectangle playButtonDestRec = {
-        .x = windowCenter.x - (buttonWidth / 2),
-        .y = windowCenter.y - (buttonHeight / 2),
-        .width = buttonWidth,
-        .height = buttonHeight
-	};
-
-	m->playButton = CreateImageButton(NOT_CLICKED, &m->textures[MENU_BIG_BUTTONS_TEX], &m->assets.textureAssets[MENU_BIG_BUTTONS_TEX], &playButtonNotPressed, &playButtonPressed, &playButtonHover, &playButtonDestRec);
-
-	//Settings Button
-	Vector2 settingsButtonNotPressed = {0.0f, menuButtonHeight * 2};
-	Vector2 settingsButtonHover = {menuButtonWidth, menuButtonHeight * 2};
-	Vector2 settingsButtonPressed = {menuButtonWidth * 2, menuButtonHeight * 2};
-
-	Rectangle settingsButtonDestRec = {
-		.x = windowCenter.x - (buttonWidth / 2),
-		.y = windowCenter.y - (buttonHeight / 2) + buttonSpacing * 2,
-		.width = buttonWidth,
-		.height = buttonHeight
-	};
-
-	m->settingsButton = CreateImageButton(NOT_CLICKED, &m->textures[MENU_BIG_BUTTONS_TEX], &m->assets.textureAssets[MENU_BIG_BUTTONS_TEX], &settingsButtonNotPressed, &settingsButtonPressed, &settingsButtonHover, &settingsButtonDestRec);
 }
 
 void UpdateMenu(MenuState *m, State *state, Flags *flags)
 {
-
+	switch (m->menuView)
-    for (int i = 0; i < MENU_SOUNDTRACK_COUNT; i++)
-    {
-		UpdateSoundtrack(&m->soundtracks[i], flags->soundtrackOn);
-	}
-
-    if (GetFPS() >= 60)
-    {
-        SetTargetFPS(60);
-    }
-
-    if (isImageButtonClicked(&m->playButton, m->sounds[HOVER_SOUND], m->sounds[CLICK_SOUND]))
-    {
-        state->running = true;
-        state->currentView = GAMEPLAY;
-    }
-
-	if (IsKeyPressed(KEY_ESCAPE) && state->gameStarted)
 	{
-		state->currentView = GAMEPLAY;
+		case MAIN:
+		{
+			UpdateMenuMain(&m->menuMain, state, flags, &m->menuView);
+		}break;
+
+		case SETTINGS:
+		{
+			UpdateMenuSettings(&m->menuSettings, &m->menuView,  flags);
+		}break;
+		default: break;
 	}
 
-	if (isImageButtonClicked(&m->settingsButton, m->sounds[HOVER_SOUND], m->sounds[CLICK_SOUND]))
-	{
-		state->currentView = SETTINGS;
-	}
-
-    if (isImageButtonClicked(&m->quitButton, m->sounds[HOVER_SOUND], m->sounds[CLICK_SOUND]) || (WindowShouldClose() && !IsKeyPressed(KEY_ESCAPE)))
-    {
-        state->running = false;
-    }
-	
-
-    UpdateBackground(&m->background);
-    UpdateBackground(&m->midground);
-    UpdateBackground(&m->foreground);
-    UpdateMouseScreen(&m->mouse);
-
 }
 
 void RenderMenu(MenuState *m, Font *font, const char *title, Flags *flags)
 {
-    BeginDrawing();
+	switch (m->menuView)
-    ClearBackground(WHITE);
+	{
-    RenderBackground(&m->background);
+		case MAIN:
-    RenderBackground(&m->midground);
+		{
-    RenderBackground(&m->foreground);
+			RenderMenuMain(&m->menuMain, font, title, flags);
-    renderImageElement(&m->board);
+		}break;
-    renderImageButton(&m->playButton);
-    renderImageButton(&m->quitButton);
-	renderImageButton(&m->settingsButton);
-    int textWidth = MeasureText(title, font->baseSize);
-    DrawTextEx(*font, title, (Vector2){GetScreenWidth() / 2 - textWidth / 2, textWidth / 4}, (float)font->baseSize, 2, WHITE);
-    DrawTexturePro(
-        m->mouse.cursorTexture,
-        (Rectangle){0, 0, m->mouse.cursorTexture.width, m->mouse.cursorTexture.height},
-        (Rectangle){m->mouse.screenPosition.x, m->mouse.screenPosition.y, m->mouse.cursorTexture.width, m->mouse.cursorTexture.height},
-        (Vector2){0.0f, 0.0f},
-        0.0f,
-        WHITE);
 
-    if (flags->showFPS)
+		case SETTINGS:
-    {
+		{
-        DrawFPS(10, 10);
+			RenderMenuSettings(&m->menuSettings, flags);
-    }
+		}
-
+		default: break;
-    EndDrawing();
+	} 
 }
 
 void CleanupMenu(MenuState *m)
 {
-    for (int i = 0; i < MENU_SOUND_COUNT; i++)
+	CleanupMenuMain(&m->menuMain);
-    {
-        UnloadSound(m->sounds[i]);
-    }
-    for (int i = 0; i < MENU_TEX_COUNT; i++)
-    {
-        if (m->textures[i].id > 0)
-        {
-            UnloadTexture(m->textures[i]);
-        }
-    }
-    for (int i = 0; i < MENU_SOUNDTRACK_COUNT; i++)
-    {
-        UnloadMusicStream(m->soundtracks[i].music);
-    }
 }
 
 #endif // MENU_H

include/menumain.h

@@ -0,0 +1,218 @@
+#ifndef MENUMAIN_H
+#define MENUMAIN_H
+
+#include <gui.h>
+#include <asset.h>
+#include <gamegui.h>
+#include <input.h>
+#include <soundtrack.h>
+#include "menuassets.h"
+#include "menuview.h"
+#include "colors.h"
+#include "background.h"
+
+
+typedef struct {
+    Assets assets;
+    Mouse mouse;
+    Texture2D textures[MENU_TEX_COUNT];
+    Sound sounds[MENU_SOUND_COUNT];
+    Soundtrack soundtracks[MENU_SOUNDTRACK_COUNT];
+    ImageElement board;
+    ImageButton playButton;
+    ImageButton quitButton;
+	ImageButton settingsButton;
+    int menuScale;
+    Background background;
+    Background midground;
+    Background foreground;
+} MenuMain;
+
+void InitMenuMain(MenuMain *m){
+		
+    m->assets = (Assets){
+        .textureAssets = menuTextureAssets,
+        .soundAssets = menuSoundAssets,
+        .soundtrackAssets = menuSoundtrackAssets};
+
+    for (int i = 0; i < MENU_TEX_COUNT; i++)
+    {
+        m->textures[i] = LoadTexture(m->assets.textureAssets[i].path);
+    }
+
+    for (int i = 0; i < MENU_SOUND_COUNT; i++)
+    {
+        m->sounds[i] = LoadSound(m->assets.soundAssets[i].path);
+    }
+
+    for (int i = 0; i < MENU_SOUNDTRACK_COUNT; i++)
+    {
+        m->soundtracks[i] = LoadSoundtrack(m->assets.soundtrackAssets[i].path);
+    }
+
+    InitBackground(0.1f, &m->background, &m->textures[MENU_CLOUD_BACKGROUND], &m->assets.textureAssets[MENU_CLOUD_BACKGROUND]);
+    InitBackground(0.2f, &m->midground, &m->textures[MENU_CLOUD_MIDGROUND], &m->assets.textureAssets[MENU_CLOUD_MIDGROUND]);
+    InitBackground(0.3f, &m->foreground, &m->textures[MENU_CLOUD_FOREGROUND], &m->assets.textureAssets[MENU_CLOUD_FOREGROUND]);
+
+    m->mouse = CreateMouse(0.10f, 5.0f, 10.0f, &m->textures[MENU_CURSOR_TEX]);
+
+    m->menuScale = 4;
+    int windowWidth = GetScreenWidth();
+    int windowHeight = GetScreenHeight();
+    Vector2 windowCenter = {windowWidth / 2, windowHeight / 2};
+
+    int boardWidth = windowWidth / m->menuScale * 2.5f;
+    float boardScaleFactor = (float)boardWidth / m->assets.textureAssets[MENU_BOARD_TEX].frameWidth;
+    int boardHeight = (int)(m->assets.textureAssets[MENU_BOARD_TEX].frameHeight * boardScaleFactor);
+
+    Vector2 boardSource = {128.0f, 0.0f};
+    Rectangle boardDestRec = {
+        .x = windowCenter.x - (boardWidth / 2),
+        .y = windowCenter.y - (boardHeight / 2),
+        .width = boardWidth,
+        .height = boardHeight};
+
+    m->board = CreateImageElement(&m->textures[MENU_BOARD_TEX], &m->assets.textureAssets[MENU_BOARD_TEX], &boardSource, &boardDestRec);
+
+    int buttonWidth = windowWidth / m->menuScale;
+    float buttonScaleFactor = (float)buttonWidth / m->assets.textureAssets[MENU_BIG_BUTTONS_TEX].frameWidth;
+    int buttonHeight = (int)(m->assets.textureAssets[MENU_BIG_BUTTONS_TEX].frameHeight * buttonScaleFactor);
+    int buttonSpacing = buttonHeight;
+
+
+	//Button texture dimensions
+	float menuButtonWidth = m->assets.textureAssets[MENU_BIG_BUTTONS_TEX].frameWidth;
+	float menuButtonHeight = m->assets.textureAssets[MENU_BIG_BUTTONS_TEX].frameHeight;
+
+	//Quit Button
+    Vector2 quitButtonNotPressed = {0.0f, 0.0f};
+    Vector2 quitButtonHover = {menuButtonWidth, 0.0f};
+    Vector2 quitButtonPressed = {menuButtonWidth * 2, 0.0f};
+
+    Rectangle quitButtonDestRec = {
+        .x = windowCenter.x - (buttonWidth / 2),
+        .y = windowCenter.y - (buttonHeight / 2) + buttonSpacing,
+        .width = buttonWidth,
+        .height = buttonHeight
+	};
+
+    m->quitButton = CreateImageButton(NOT_CLICKED, &m->textures[MENU_BIG_BUTTONS_TEX], &m->assets.textureAssets[MENU_BIG_BUTTONS_TEX], &quitButtonNotPressed, &quitButtonPressed, &quitButtonHover, &quitButtonDestRec);
+
+	//Play Button
+    Vector2 playButtonNotPressed = {0.0f, menuButtonHeight};
+    Vector2 playButtonHover = {menuButtonWidth, menuButtonHeight};
+    Vector2 playButtonPressed = {menuButtonWidth * 2, menuButtonHeight};
+
+    Rectangle playButtonDestRec = {
+        .x = windowCenter.x - (buttonWidth / 2),
+        .y = windowCenter.y - (buttonHeight / 2),
+        .width = buttonWidth,
+        .height = buttonHeight
+	};
+
+	m->playButton = CreateImageButton(NOT_CLICKED, &m->textures[MENU_BIG_BUTTONS_TEX], &m->assets.textureAssets[MENU_BIG_BUTTONS_TEX], &playButtonNotPressed, &playButtonPressed, &playButtonHover, &playButtonDestRec);
+
+	//Settings Button
+	Vector2 settingsButtonNotPressed = {0.0f, menuButtonHeight * 2};
+	Vector2 settingsButtonHover = {menuButtonWidth, menuButtonHeight * 2};
+	Vector2 settingsButtonPressed = {menuButtonWidth * 2, menuButtonHeight * 2};
+
+	Rectangle settingsButtonDestRec = {
+		.x = windowCenter.x - (buttonWidth / 2),
+		.y = windowCenter.y - (buttonHeight / 2) + buttonSpacing * 2,
+		.width = buttonWidth,
+		.height = buttonHeight
+	};
+
+	m->settingsButton = CreateImageButton(NOT_CLICKED, &m->textures[MENU_BIG_BUTTONS_TEX], &m->assets.textureAssets[MENU_BIG_BUTTONS_TEX], &settingsButtonNotPressed, &settingsButtonPressed, &settingsButtonHover, &settingsButtonDestRec);
+	
+}
+
+void UpdateMenuMain(MenuMain *m, State *state, Flags *flags, MenuView *menuView){
+	for (int i = 0; i < MENU_SOUNDTRACK_COUNT; i++)
+	{
+		UpdateSoundtrack(&m->soundtracks[i], flags->soundtrackOn);
+	}
+
+	if (GetFPS() >= 60)
+	{
+		SetTargetFPS(60);
+	}
+
+	if (isImageButtonClicked(&m->playButton, m->sounds[HOVER_SOUND], m->sounds[CLICK_SOUND]))
+	{
+		state->running = true;
+		state->currentView = GAMEPLAY;
+	}
+
+	if (IsKeyPressed(KEY_ESCAPE) && state->gameStarted)
+	{
+		state->currentView = GAMEPLAY;
+	}
+
+	if (isImageButtonClicked(&m->settingsButton, m->sounds[HOVER_SOUND], m->sounds[CLICK_SOUND]))
+	{
+		*menuView = SETTINGS;
+	}
+
+	if (isImageButtonClicked(&m->quitButton, m->sounds[HOVER_SOUND], m->sounds[CLICK_SOUND]) || (WindowShouldClose() && !IsKeyPressed(KEY_ESCAPE)))
+	{
+		state->running = false;
+	}
+	
+
+	UpdateBackground(&m->background);
+	UpdateBackground(&m->midground);
+	UpdateBackground(&m->foreground);
+	UpdateMouseScreen(&m->mouse);
+	
+}
+
+void RenderMenuMain(MenuMain *m, Font *font, const char *title, Flags *flags){
+	BeginDrawing();
+	ClearBackground(WHITE);
+	RenderBackground(&m->background);
+	RenderBackground(&m->midground);
+	RenderBackground(&m->foreground);
+	renderImageElement(&m->board);
+	renderImageButton(&m->playButton);
+	renderImageButton(&m->quitButton);
+	renderImageButton(&m->settingsButton);
+	int textWidth = MeasureText(title, font->baseSize);
+	DrawTextEx(*font, title, (Vector2){GetScreenWidth() / 2 - textWidth / 2, textWidth / 4}, (float)font->baseSize, 2, WHITE);
+	DrawTexturePro(
+		m->mouse.cursorTexture,
+		(Rectangle){0, 0, m->mouse.cursorTexture.width, m->mouse.cursorTexture.height},
+		(Rectangle){m->mouse.screenPosition.x, m->mouse.screenPosition.y, m->mouse.cursorTexture.width, m->mouse.cursorTexture.height},
+		(Vector2){0.0f, 0.0f},
+		0.0f,
+		WHITE);
+
+	if (flags->showFPS)
+	{
+		DrawFPS(10, 10);
+	}
+
+	EndDrawing();
+
+}
+
+void CleanupMenuMain(MenuMain *m){
+    for (int i = 0; i < MENU_SOUND_COUNT; i++)
+    {
+        UnloadSound(m->sounds[i]);
+    }
+    for (int i = 0; i < MENU_TEX_COUNT; i++)
+    {
+        if (m->textures[i].id > 0)
+        {
+            UnloadTexture(m->textures[i]);
+        }
+    }
+    for (int i = 0; i < MENU_SOUNDTRACK_COUNT; i++)
+    {
+        UnloadMusicStream(m->soundtracks[i].music);
+    }
+}
+
+#endif //MENUMAIN_H

include/menusettings.h

@@ -4,15 +4,16 @@
 #include <gui.h>
 #include <input.h>
 #include <flags.h>
+#include "menuview.h"
 
 typedef struct 
 {
 	Button showFPS;
 	Button soundtrackOn;
 
-} SettingsState;
+} MenuSettings;
 
-void InitSettings(SettingsState *s)
+void InitMenuSettings(MenuSettings *s)
 {
 	int windowWidth = GetScreenWidth();
 	int windowHeight = GetScreenHeight();
@@ -28,7 +29,7 @@ void InitSettings(SettingsState *s)
 	s->soundtrackOn = initButton("soundtrackOn", standardButtonDimensions, button2Pos);
 }
 
-void UpdateSettings(SettingsState *s, State *state,Flags *flags)
+void UpdateMenuSettings(MenuSettings *s, MenuView *menuView,Flags *flags)
 {
 	ShowCursor();
 
@@ -41,13 +42,13 @@ void UpdateSettings(SettingsState *s, State *state,Flags *flags)
 	}
 
 	if (IsKeyPressed(KEY_ESCAPE)){
-		state->currentView = MENU;
+		*menuView = MAIN;
 	}
 
 	
 }
 
-void RenderSettings(SettingsState *s, Flags *flags)
+void RenderMenuSettings(MenuSettings *s, Flags *flags)
 {
 	BeginDrawing();
 	ClearBackground(BLACK);
@@ -64,4 +65,8 @@ void RenderSettings(SettingsState *s, Flags *flags)
 	
 }
 
+void ClenupMenuSettings(MenuSettings *s){
+
+}
+
 #endif // SETTINGS_H

include/menuview.h

@@ -0,0 +1,10 @@
+#ifndef MENUVIEW_H
+#define MENUVIEW_H
+
+typedef enum MenuView {
+	MAIN = 0,
+	SETTINGS = 1
+} MenuView;
+
+#endif // MENUVIEW_H
+

include/view.h

@@ -4,8 +4,7 @@
 typedef enum View {
     LOGO = 0,
     MENU = 1,
-    GAMEPLAY = 2,
+    GAMEPLAY = 2
-	SETTINGS = 3
 } View;
 
 #endif // SCREEN_H