Full interface working & super cool

Author: P0ulpy

.idea/cmake.xml

@@ -21,7 +21,7 @@ SET(GAME_SOURCES
         Map/TerrainGenerator.cpp
         Map/ChunkContainer.hpp
         Map/ChunkContainer.cpp
-    )
+        UISystem/UiText.cpp UISystem/UiText.hpp UISystem/UiButton.cpp UISystem/UiButton.hpp UISystem/UiInputInt.cpp UISystem/UiInputInt.hpp UISystem/UISliderFloat.cpp UISystem/UISliderFloat.hpp UISystem/UiSliderInt.cpp UISystem/UiSliderInt.hpp)
 
 # Packages
 find_package(GLEW REQUIRED)

Game/CMakeLists.txt

@@ -15,7 +15,7 @@ GameLoop* GameLoop::s_instance = nullptr;
 const sf::ContextSettings contextSettings = sf::ContextSettings(24, 8, 4, 4, 6);
 
 GameLoop::GameLoop()
-    : window(sf::VideoMode(1000, 800), "Game", sf::Style::Default, contextSettings)
+    : window(sf::VideoMode(1700, 1000), "Game", sf::Style::Default, contextSettings)
     // Dirty way to manage camera lifetime i will refactor it later
     , camera(new GameCamera(window))
 {
@@ -40,12 +40,12 @@ void GameLoop::Init()
 
     ImGui::SFML::Init(window);
 
-    //ImGui::GetIO().ConfigFlags |= ImGuiConfigFlags_DockingEnable;
-    //auto& io = ImGui::GetIO();
-
-    //io.ConfigWindowsMoveFromTitleBarOnly = false;
-    //io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;       // Enable Keyboard Controls
+    // Can't be used because of our dumb version of imgui & OpenGL
+    // ImGui::GetIO().ConfigFlags |= ImGuiConfigFlags_DockingEnable;
+    auto& io = ImGui::GetIO();
 
+    io.ConfigWindowsMoveFromTitleBarOnly = false;
+    io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;       // Enable Keyboard Controls
 
     m_scene->AddObject<GameCamera>(camera);
     m_scene->Init();

Game/GameLoop/GameLoop.cpp

@@ -10,6 +10,8 @@ void Scene::Update(float dt)
     {
         updatable->Update(dt);
     }
+
+    OnUpdate(dt);
 }
 
 void Scene::Render(Camera& camera)

Game/GameLoop/Scene.cpp

@@ -65,6 +65,9 @@ class Scene
         std::remove(m_objects.begin(), m_objects.end(), object);
     }
 
+protected:
+    virtual void OnUpdate(float deltaTime) {};
+
 protected:
     // Only purpose is to manage objects lifetime
     std::vector<std::unique_ptr<void, void(*)(void const*)>> m_objects;

Game/GameLoop/Scene.hpp

@@ -24,6 +24,7 @@ struct ChunkContainer
     const Chunk& operator()(int32_t x, int32_t z) const;
 
     [[nodiscard]] std::vector<Chunk*>& GetActiveChunks() { return m_activeChunks; }
+    [[nodiscard]] const std::vector<Chunk*>& GetActiveChunks() const { return m_activeChunks; }
     [[nodiscard]] std::map<ChunkContainerIndex, Chunk>& GetData() { return m_data; }
 
 private:

Game/Map/ChunkContainer.hpp

@@ -36,6 +36,7 @@ void TerrainGenerator::GenerateNewChunks(int32_t chunkX, int32_t chunkZ)
 
 void TerrainGenerator::GenerateAllChunks(int playerPosX, int playerPosZ)
 {
+    m_needToGenerateAllChunks = false;
     m_terrain->Cleanup();
 
     m_perlin.~PerlinNoise();

Game/Map/TerrainGenerator.cpp

@@ -22,6 +22,8 @@ class TerrainGenerator : public IUpdatable
     [[nodiscard]] int GetSeed() const { return m_seed; };
     void SetSeed(unsigned int seed);
 
+    bool IsNeedToGenerateAllChunks() const { return m_needToGenerateAllChunks; }
+    void SetNeedToGenerateAllChunks() { m_needToGenerateAllChunks = true; }
 public:
     int m_seed = 0;
 
@@ -46,4 +48,6 @@ class TerrainGenerator : public IUpdatable
     //Debug number of new chunks generated
     int m_newGeneratedChunks = 0;
     ChunkContainer::ChunkContainerIndex m_lastChunkIndex { 0, 0 };
+
+    bool m_needToGenerateAllChunks = false;
 };

Game/Map/TerrainGenerator.hpp

@@ -25,7 +25,8 @@ class Chunk : public IRenderable
     void Render(Camera& camera) override;
     void Cleanup() override;
 
-    bool IsGenerated() const { return m_generated; }
+    [[nodiscard]] bool IsGenerated() const { return m_generated; }
+    [[nodiscard]] size_t GetVerticesCount() const { return m_vertices.size() / 5; }
 
 private:
     bool m_generated = false;

Game/Renderer/Renderable/Terrain/Chunk.hpp

@@ -93,3 +93,13 @@ void Terrain::GenerateVertices()
         chunk.Load();
     }
 }
+
+size_t Terrain::GetTotalVertices() const
+{
+    size_t totalVertices = 0;
+
+    for (const auto *chunk: m_chunks.GetActiveChunks())
+        totalVertices += chunk->GetVerticesCount();
+
+    return totalVertices;
+}