Lvl display and classes for menus

mimumi2005 · mimumi2005 · commit 2b205664c638 · 2024-11-20T13:37:43.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -99,7 +99,17 @@ set(PROJECT_FILES
         "src/game/entities/Error.cpp"
         "src/game/entities/Error.h"
         "src/game/weapons/projectile/WeaponSniper.cpp"
-        "src/game/weapons/projectile/WeaponSniper.h")
+        "src/game/weapons/projectile/WeaponSniper.h"
+        "src/game/interface/MainMenu.cpp"
+        "src/game/interface/MainMenu.h"
+        "src/game/interface/GameSelectMenu.cpp"
+        "src/game/interface/GameSelectMenu.h"
+        "src/game/interface/PauseMenu.cpp"
+        "src/game/interface/PauseMenu.h"
+        "src/game/interface/SettingsMenu.cpp"
+        "src/game/interface/SettingsMenu.h"
+        
+        )
 
 # Add executable
 add_executable(${PROJECT_NAME} ${PROJECT_FILES})
diff --git a/src/game/GameWorld.cpp b/src/game/GameWorld.cpp
@@ -179,18 +179,18 @@ Entity *GameWorld::AddEntity(Entity *entity)
         m_Last = entity;
     }
 
-    if (entity->GetType() == ENTTYPE_CHARACTER || entity->GetType() == ENTTYPE_CRATE) {
-        if (!m_FirstShootable) {
-            m_FirstShootable = entity;
-            m_LastShootable = entity;
-            entity->m_PrevShootable = nullptr;
-            entity->m_NextShootable = nullptr;
-        } else {
-            m_LastShootable->m_NextShootable = entity;
-            entity->m_PrevShootable = m_LastShootable;
-            m_LastShootable = entity;
-        }
-    }
+    // if (entity->GetType() == ENTTYPE_CHARACTER || entity->GetType() == ENTTYPE_CRATE) {
+    //     if (!m_FirstShootable) {
+    //         m_FirstShootable = entity;
+    //         m_LastShootable = entity;
+    //         entity->m_PrevShootable = nullptr;
+    //         entity->m_NextShootable = nullptr;
+    //     } else {
+    //         m_LastShootable->m_NextShootable = entity;
+    //         entity->m_PrevShootable = m_LastShootable;
+    //         m_LastShootable = entity;
+    //     }
+    // }
 
     return entity;
 }
diff --git a/src/game/GameWorld.h b/src/game/GameWorld.h
@@ -54,7 +54,6 @@ class GameWorld {
     [[nodiscard]] double GetWidth() const { return m_Width; }
     [[nodiscard]] double GetHeight() const { return m_Height; }
     [[nodiscard]] double GetNamesShown() const { return m_ShowNamesVisibility < 0.1 ? 0.0 : m_ShowNamesVisibility; }
-    [[nodiscard]] bool GetPaused() const { return m_Paused; }
     [[nodiscard]] bool GameOver() const { return m_GameOver; }
     [[nodiscard]] unsigned long long GetTick() const { return m_CurrentTick; }
     [[nodiscard]] unsigned int GetNextPlayerIndex() const;
diff --git a/src/game/entities/Crate.cpp b/src/game/entities/Crate.cpp
@@ -76,12 +76,14 @@ void Crate::Tick() {
 }
 
 void Crate::Draw() {
+    
     Drawing* Render = m_World->GameWindow()->Render();
 
     SDL_FRect DrawRect = { float(m_Core.Pos.x) - float(m_Core.Size.x / 2.0),
                            float(m_Core.Pos.y) - float(m_Core.Size.y / 2.0),
                            float(m_Core.Size.x),
                            float(m_Core.Size.y) };
 
+std::cout << "render crates" << std::endl;
     Render->RenderTextureFCamera((*m_Texture)->SDLTexture(), nullptr, DrawRect);
 }
diff --git a/src/game/entities/characters/CharacterNPC.h b/src/game/entities/characters/CharacterNPC.h
@@ -33,4 +33,5 @@ class CharacterNPC : public Character {
                  bool is_boss);
     ~CharacterNPC();
     void UpdateAttacker(Player* attacker);
+    void GetBoss();
 };
diff --git a/src/game/entities/characters/character/Character.cpp b/src/game/entities/characters/character/Character.cpp
@@ -1058,27 +1058,26 @@ void Character::DrawHook()
 }
 
 void Character::DrawHealthbar()
-{
+{   
     if (m_NPC)
         return;
 
     Drawing *Render = m_World->GameWindow()->Render();
 
     // Render health bar
-    if (m_Health != m_MaxHealth)
-    {
         m_HealthBar.SetColor(m_HealthbarColor.r, m_HealthbarColor.g, m_HealthbarColor.b, m_HealthbarColor.a);
         Texture *HealthPlate = ConfusingHP ? m_HealthBar.GetTexture() : m_HealthBar.UpdateTexture();
 
-        int HealthBarW = HealthPlate->GetWidth();
+        int HealthBarW = HealthPlate->GetWidth() - 20; // Make the health bar slightly smaller
         int HealthBarH = HealthPlate->GetHeight();
-        SDL_Rect HealthplateRect = {int(m_Core.Pos.x - HealthBarW / 2.0),
+        SDL_Rect HealthplateRect = {int(m_Core.Pos.x - HealthBarW / 2.0) + 10, // Adjust position to the right
                                     int(m_Core.Pos.y + m_Core.Size.y / 2.0),
                                     HealthBarW, HealthBarH};
 
         if (m_HealthInt->GetFlaggedForUpdate())
         {
             std::string HealthText;
+
             if (!ConfusingHP)
                 HealthText = FString("%i/%i", int(m_Health), int(m_MaxHealth));
             else
@@ -1090,14 +1089,26 @@ void Character::DrawHealthbar()
         Texture *HealthTexture = m_HealthInt->RequestUpdate();
         double HealthTextureW = HealthTexture->GetWidth();
         double HealthTextureH = HealthTexture->GetHeight();
-        SDL_Rect HealthIntRect = {int(m_Core.Pos.x - HealthTextureW / 4.0),
+        SDL_Rect HealthIntRect = {int(m_Core.Pos.x - HealthTextureW / 4.0) + 10, // Adjust position to the right
                                   int(m_Core.Pos.y + m_Core.Size.y / 2.0 + HealthTextureH / 4.0),
                                   int(HealthTextureW / 2.0),
                                   int(HealthTextureH / 2.0)};
 
         Render->RenderTextureCamera(HealthPlate->SDLTexture(), nullptr, HealthplateRect);
         Render->RenderTextureCamera(HealthTexture->SDLTexture(), nullptr, HealthIntRect);
-    }
+
+        // Draw level indicator
+        TTF_Font* SmallFont = m_World->GameWindow()->Assets()->TextHandler()->LoadFont("assets/fonts/Minecraft.ttf", 10); // Load a smaller font
+        std::string LevelText = FString("LVL %i", m_Player->GetLevel()); // Use the level value directly
+        TextSurface LevelSurface(m_World->GameWindow()->Assets(), SmallFont, LevelText, {255, 255, 255});
+        Texture *LevelTexture = LevelSurface.RequestUpdate();
+        int LevelTextureW = LevelTexture->GetWidth();
+        int LevelTextureH = LevelTexture->GetHeight();
+        SDL_Rect LevelRect = {int(m_Core.Pos.x - HealthBarW / 2.0) - LevelTextureW +5, // Position to the left of the health bar
+                              int(m_Core.Pos.y + m_Core.Size.y / 2.0) +3,
+                              LevelTextureW, LevelTextureH};
+
+        Render->RenderTextureCamera(LevelTexture->SDLTexture(), nullptr, LevelRect);
 }
 
 void Character::DrawHands()
@@ -1185,6 +1196,7 @@ void Character::DrawNameplate()
     SDL_SetTextureAlphaMod(NamePlateTexture->SDLTexture(), Opacity);
     Render->RenderTextureCamera(NamePlateTexture->SDLTexture(), nullptr, NamePlateRect);
 
+
     auto CoordinateText = FString("%ix, %iy", int(m_Core.Pos.x), int(m_Core.Pos.y));
     m_CoordinatePlate->SetText(CoordinateText);
     m_CoordinatePlate->SetColor(m_NameplateColor);
diff --git a/src/game/interface/GameSelectMenu.cpp b/src/game/interface/GameSelectMenu.cpp
diff --git a/src/game/interface/GameSelectMenu.h b/src/game/interface/GameSelectMenu.h
diff --git a/src/game/interface/MainMenu.cpp b/src/game/interface/MainMenu.cpp
@@ -0,0 +1,81 @@
+// src/game/interface/MainMenu.cpp
+
+#include "MainMenu.h"
+
+MainMenu::MainMenu(GameReference* gameWindow)
+    : m_GameWindow(gameWindow) {
+    AssetsManager* assetsHandler = m_GameWindow->Assets();
+    ImageManager* imageHandler = assetsHandler->ImageHandler();
+
+    m_MenuTexture = imageHandler->LoadTexture("assets/images/interface/Menu.png", true);
+    m_TexturePlay = imageHandler->LoadTexture("assets/images/interface/PlayButton.png", true);
+    m_TextureExit = imageHandler->LoadTexture("assets/images/interface/Exit.png", true);
+
+    m_PlayButtonRect = {int(m_GameWindow->GetWidth2()) - 180, int(m_GameWindow->GetHeight2()) - 40, 360, 80};
+    m_ExitButtonRect = {int(m_GameWindow->GetWidth2()) - 180, int(m_GameWindow->GetHeight2()) + 121, 360, 80};
+}
+
+MainMenu::~MainMenu() {
+    // Clean up textures if necessary
+}
+
+void MainMenu::Show() {
+    bool running = true;
+    bool menuOpen = true;
+
+    while (menuOpen) {
+        Render();
+        SDL_ShowCursor(1);
+        SDL_Event currentEvent;
+        while (SDL_PollEvent(&currentEvent)) {
+            m_GameWindow->Event(currentEvent);
+            HandleEvent(currentEvent, running, menuOpen);
+        }
+        m_GameWindow->Render()->UpdateWindow();
+    }
+}
+
+void MainMenu::HandleEvent(const SDL_Event& event, bool& running, bool& menuOpen) {
+    SoundManager* soundHandler = m_GameWindow->Assets()->SoundHandler();
+    Sound* quitSound = soundHandler->LoadSound("assets/sounds/Quit.wav", true);
+    Sound* lowUISound = soundHandler->LoadSound("assets/sounds/LowUI.wav", true);
+
+    switch (event.type) {
+        case SDL_QUIT:
+            menuOpen = false;
+            running = false;
+            m_GameWindow->Deinitialize(true);
+            break;
+        case SDL_MOUSEBUTTONDOWN:
+            if (event.button.button == SDL_BUTTON_LEFT) {
+                int x = event.button.x;
+                int y = event.button.y;
+                if (x >= m_PlayButtonRect.x && x < m_PlayButtonRect.x + m_PlayButtonRect.w &&
+                    y >= m_PlayButtonRect.y && y < m_PlayButtonRect.y + m_PlayButtonRect.h) {
+                    menuOpen = false;
+                    soundHandler->PlaySound(lowUISound);
+                }
+                if (x >= m_ExitButtonRect.x && x < m_ExitButtonRect.x + m_ExitButtonRect.w &&
+                    y >= m_ExitButtonRect.y && y < m_ExitButtonRect.y + m_ExitButtonRect.h) {
+                    soundHandler->PlaySound(quitSound);
+                    m_GameWindow->Deinitialize(true);
+                    running = false;
+                    menuOpen = false;
+                }
+            }
+            break;
+        case SDL_WINDOWEVENT:
+            if (event.window.event == SDL_WINDOWEVENT_RESIZED) {
+                m_PlayButtonRect = {int(m_GameWindow->GetWidth2()) - 180, int(m_GameWindow->GetHeight2()) - 40, 360, 80};
+                m_ExitButtonRect = {int(m_GameWindow->GetWidth2()) - 180, int(m_GameWindow->GetHeight2()) + 121, 360, 80};
+            }
+            break;
+    }
+}
+
+void MainMenu::Render() {
+    Drawing* render = m_GameWindow->Render();
+    render->RenderTextureFullscreen(m_MenuTexture->SDLTexture(), nullptr);
+    render->RenderTexture(m_TexturePlay->SDLTexture(), nullptr, m_PlayButtonRect);
+    render->RenderTexture(m_TextureExit->SDLTexture(), nullptr, m_ExitButtonRect);
+}
diff --git a/src/game/interface/MainMenu.h b/src/game/interface/MainMenu.h
@@ -0,0 +1,24 @@
+// src/game/interface/MainMenu.h
+
+#pragma once
+
+#include "../../GameReference.h"
+#include <SDL.h>
+
+class MainMenu {
+private:
+    GameReference* m_GameWindow;
+    Texture* m_MenuTexture;
+    Texture* m_TexturePlay;
+    Texture* m_TextureExit;
+    SDL_Rect m_PlayButtonRect;
+    SDL_Rect m_ExitButtonRect;
+
+public:
+    MainMenu(GameReference* gameWindow);
+    ~MainMenu();
+
+    void Show();
+    void HandleEvent(const SDL_Event& event, bool& running, bool& menuOpen);
+    void Render();
+};
diff --git a/src/game/interface/PauseMenu.cpp b/src/game/interface/PauseMenu.cpp
@@ -0,0 +1,100 @@
+// src/game/interface/PauseMenu.cpp
+
+#include "PauseMenu.h"
+
+PauseMenu::PauseMenu(GameReference *gameWindow, MainMenu *mainMenu)
+    : m_GameWindow(gameWindow), m_MainMenu(mainMenu)
+{
+    AssetsManager *assetsHandler = m_GameWindow->Assets();
+    ImageManager *imageHandler = assetsHandler->ImageHandler();
+
+    m_TextureResume = imageHandler->LoadTexture("assets/images/interface/Resume.png", true);
+    m_TextureBack = imageHandler->LoadTexture("assets/images/interface/Back.png", true);
+
+    m_ResumeButtonRect = {int(m_GameWindow->GetWidth2()) - 100, int(m_GameWindow->GetHeight2()) - 150, 200, 70};
+    m_BackToMenuButtonRect = {int(m_GameWindow->GetWidth2()) - 100, int(m_GameWindow->GetHeight2()) + 50, 200, 70};
+}
+
+PauseMenu::~PauseMenu()
+{
+    // Clean up textures if necessary
+}
+
+void PauseMenu::Show()
+{
+    bool running = true;
+    bool pauseMenu = true;
+
+    while (pauseMenu)
+    {
+        Render();
+        SDL_ShowCursor(1);
+        SDL_Event currentEvent;
+        while (SDL_PollEvent(&currentEvent))
+        {
+            m_GameWindow->Event(currentEvent);
+            HandleEvent(currentEvent, running, pauseMenu);
+        }
+        m_GameWindow->Render()->UpdateWindow();
+    }
+}
+
+void PauseMenu::HandleEvent(const SDL_Event &event, bool &running, bool &pauseMenu)
+{
+    SoundManager *soundHandler = m_GameWindow->Assets()->SoundHandler();
+    Sound *lowUISound = soundHandler->LoadSound("assets/sounds/LowUI.wav", true);
+    Sound *midUISound = soundHandler->LoadSound("assets/sounds/MidUI.wav", true);
+
+    switch (event.type)
+    {
+    case SDL_QUIT:
+        pauseMenu = false;
+        running = false;
+        m_GameWindow->Deinitialize(true);
+        break;
+    case SDL_MOUSEBUTTONDOWN:
+        if (event.button.button == SDL_BUTTON_LEFT)
+        {
+            int x = event.button.x;
+            int y = event.button.y;
+            if (x >= m_ResumeButtonRect.x && x < m_ResumeButtonRect.x + m_ResumeButtonRect.w &&
+                y >= m_ResumeButtonRect.y && y < m_ResumeButtonRect.y + m_ResumeButtonRect.h)
+            {
+                soundHandler->PlaySound(lowUISound);
+                pauseMenu = false;
+            }
+            else if (x >= m_BackToMenuButtonRect.x && x < m_BackToMenuButtonRect.x + m_BackToMenuButtonRect.w &&
+                     y >= m_BackToMenuButtonRect.y && y < m_BackToMenuButtonRect.y + m_BackToMenuButtonRect.h)
+            {
+                soundHandler->PlaySound(midUISound);
+                pauseMenu = false;
+                running = false;
+                m_MainMenu->Show(); // Open the main menu
+            }
+        }
+        break;
+    case SDL_WINDOWEVENT:
+        if (event.window.event == SDL_WINDOWEVENT_RESIZED)
+        {
+            m_ResumeButtonRect = {int(m_GameWindow->GetWidth2()) - 100, int(m_GameWindow->GetHeight2()) - 150, 200, 70};
+            m_BackToMenuButtonRect = {int(m_GameWindow->GetWidth2()) - 100, int(m_GameWindow->GetHeight2()) + 50, 200, 70};
+        }
+        break;
+    case SDL_KEYDOWN:
+        SDL_Scancode ScancodeKey = event.key.keysym.scancode;
+        if (ScancodeKey == SDL_SCANCODE_ESCAPE)
+        {
+            soundHandler->PlaySound(lowUISound);
+            pauseMenu = false;
+        }
+        break;
+    }
+}
+
+void PauseMenu::Render()
+{
+    Drawing *render = m_GameWindow->Render();
+
+    render->RenderTexture(m_TextureResume->SDLTexture(), nullptr, m_ResumeButtonRect);
+    render->RenderTexture(m_TextureBack->SDLTexture(), nullptr, m_BackToMenuButtonRect);
+}
diff --git a/src/game/interface/PauseMenu.h b/src/game/interface/PauseMenu.h
@@ -0,0 +1,25 @@
+// src/game/interface/PauseMenu.h
+
+#pragma once
+
+#include "../../GameReference.h"
+#include "MainMenu.h"
+#include <SDL.h>
+
+class PauseMenu {
+private:
+    GameReference* m_GameWindow;
+    MainMenu* m_MainMenu;
+    Texture* m_TextureResume;
+    Texture* m_TextureBack;
+    SDL_Rect m_ResumeButtonRect;
+    SDL_Rect m_BackToMenuButtonRect;
+
+public:
+    PauseMenu(GameReference* gameWindow, MainMenu* mainMenu);
+    ~PauseMenu();
+
+    void Show();
+    void HandleEvent(const SDL_Event& event, bool& running, bool& menuOpen);
+    void Render();
+};
diff --git a/src/game/interface/SettingsMenu.cpp b/src/game/interface/SettingsMenu.cpp
diff --git a/src/game/interface/SettingsMenu.h b/src/game/interface/SettingsMenu.h
diff --git a/src/main.cpp b/src/main.cpp

Original file line number	Diff line number	Diff line change
`@@ -76,12 +76,14 @@ void Crate::Tick() {`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`void Crate::Draw() {`
	`79`	`+`
`79`	`80`	`Drawing* Render = m_World->GameWindow()->Render();`
`80`	`81`
`81`	`82`	`SDL_FRect DrawRect = { float(m_Core.Pos.x) - float(m_Core.Size.x / 2.0),`
`82`	`83`	`float(m_Core.Pos.y) - float(m_Core.Size.y / 2.0),`
`83`	`84`	`float(m_Core.Size.x),`
`84`	`85`	`float(m_Core.Size.y) };`
`85`	`86`
	`87`	`+std::cout << "render crates" << std::endl;`
`86`	`88`	`Render->RenderTextureFCamera((*m_Texture)->SDLTexture(), nullptr, DrawRect);`
`87`	`89`	`}`