WIP: Settings up settings menu

> TODO: Fix broken behaiour in the refacto process

CMakeLists.txt

@@ -71,6 +71,7 @@ set(SRC_CXX_FILES	"./src/main.cpp"
                   "./src/world.cpp"
                   "./src/render.cpp"
                   "./src/control_menu.cpp"
+                  "./src/settings_menu.cpp"
                   "${rlImGui_SOURCE_DIR}/rlImGui.cpp"
                   "${imgui_SOURCE_DIR}/imgui.cpp"
                   "${imgui_SOURCE_DIR}/imgui_draw.cpp"

includes/context.hpp

@@ -2,7 +2,7 @@
 * File name: context.hpp
 * Author: lejulien
 * Date created: 01-01-1970 00:59:59
-// Date modified: 12-01-2026 20:31:50
+// Date modified: 12-01-2026 21:30:10
 * ------
 */
 
@@ -14,12 +14,16 @@
 
 class World;
 class Rules;
+class Render;
 
 namespace gol {
+class SettingsMenu;
 
 typedef struct ctx {
   std::shared_ptr<World> world = nullptr;
   std::shared_ptr<Rules> rules = nullptr;
+  std::shared_ptr<Render> render = nullptr;
+  std::shared_ptr<SettingsMenu> settings_menu = nullptr;
   nlohmann::json config_json;
 } ctx;
 

includes/control_menu.hpp

@@ -2,7 +2,7 @@
 * File name: control_menu.hpp
 * Author: lejulien
 * Date created: 10-01-2026 22:00:33
-// Date modified: 10-01-2026 22:45:10
+// Date modified: 12-01-2026 20:50:02
 * ------
 */
 
@@ -23,20 +23,13 @@ private:
   ctx context_;
 public: // Keep those public for easy access
   MenuState menu_state_ = MenuState::NONE;
-  int fps_ctrl_ = false;
-  int cell_size_ctrl_ = false;
   bool play_ctrl_ = true;
   bool step_ctrl_ = false;
   bool step_back_ctrl_ = false;
   bool rand_ctrl_ = false;
   bool edit_ctrl_ = false;
   bool clear_ctrl_ = false;
-  bool settings_window_ = false;
   bool paterns_ctrl_ = false;
-  int width_ctrl_ = false;
-  int height_ctrl_ = false;
-  bool dark_theme_ctrl_ = false;
-  bool apply_ctrl_ = false;
 };
 
 } // namespace gol

includes/settings_menu.hpp

@@ -0,0 +1,44 @@
+/*
+* File name: settings_menu.hpp
+* Author: lejulien
+* Date created: 01-01-1970 00:59:59
+// Date modified: 12-01-2026 21:28:03
+* ------
+*/
+
+#pragma once
+
+#include <context.hpp>
+
+namespace gol {
+
+class SettingsMenu {
+public:
+  SettingsMenu(ctx &context);
+  ~SettingsMenu() = default;
+  void update();
+  void display();
+  bool isOpen();
+  void Toogle();
+  // Getter/Setters
+  int getFPS();
+  void setFPS(int);
+  int getCellSize();
+  void setCellSize(int);
+  int getWidth();
+  void setWidth(int);
+  int getHeight();
+  void setHeight(int);
+private:
+  ctx context_;
+  int fps_ctrl_ = false;
+  int cell_size_ctrl_ = false;
+  bool settings_window_ = false;
+  int width_ctrl_ = false;
+  int height_ctrl_ = false;
+  bool dark_theme_ctrl_ = false;
+  bool apply_ctrl_ = false;
+};
+
+
+} // namespace gol

src/control_menu.cpp

@@ -2,7 +2,7 @@
 * File name: control_menu.cpp
 * Author: lejulien
 * Date created: 10-01-2026 22:12:44
-// Date modified: 12-01-2026 20:36:39
+// Date modified: 12-01-2026 21:26:33
 * ------
 */
 
@@ -11,26 +11,20 @@
 #include <rlImGui.h>
 
 #include <control_menu.hpp>
+#include <settings_menu.hpp>
 #include <world.hpp>
 #include <rules.hpp>
 
 namespace gol {
 
 ControlMenu::ControlMenu(ctx context):context_(context) {
-  fps_ctrl_ = context.config_json["fps"].get<int>();
-  cell_size_ctrl_ = context.config_json["cell_size"].get<int>();
   play_ctrl_ = true;
   step_ctrl_ = false;
   step_back_ctrl_ = false;
   rand_ctrl_ = false;
   edit_ctrl_ = false;
   clear_ctrl_ = false;
-  settings_window_ = false;
   paterns_ctrl_ = false;
-  width_ctrl_ = context.config_json["screen_width"].get<int>();
-  height_ctrl_ = context.config_json["screen_height"].get<int>();
-  dark_theme_ctrl_ = context.config_json["dark_theme"].get<bool>();
-  apply_ctrl_ = false;
 }
 
 void ControlMenu::update() {
@@ -91,8 +85,8 @@ void ControlMenu::display() {
     if (ImGui::Button((paterns_ctrl_) ? "Hide paterns" : "Show paterns")) {
       paterns_ctrl_ = !paterns_ctrl_;
     }
-    if (ImGui::Button((settings_window_) ? "Hide settings" : "Show settings")) {
+    if (ImGui::Button((context_.settings_menu->isOpen()) ? "Hide settings" : "Show settings")) {
-      settings_window_ = !settings_window_;
+      context_.settings_menu->Toogle();
     }
     ImGui::Text("Generation: %zu", context_.world->getCycle());
     ImGui::End();}

src/main.cpp

@@ -2,7 +2,7 @@
 * File name: main.cpp
 * Author: lejulien
 * Date created: 10-01-2026 21:59:32
-// Date modified: 12-01-2026 20:34:37
+// Date modified: 12-01-2026 21:33:13
 * ------
 */
 
@@ -22,6 +22,7 @@
 #include <types.hpp>
 #include <context.hpp>
 #include <control_menu.hpp>
+#include <settings_menu.hpp>
 
 Vector2 snapToGrid(Vector2 screen, int cell_size) {
   return {static_cast<float>(round(screen.x / cell_size) * cell_size),
@@ -102,7 +103,8 @@ int main(int ac, char **av) {
   // Initialize objects
   context.world = std::make_shared<World>(context);
   context.rules = std::make_shared<Rules>();
-  Render render(context.config_json["cell_size"]);
+  context.settings_menu = std::make_shared<gol::SettingsMenu>(context);
+  context.render = std::make_shared<Render>(context.settings_menu->getCellSize());
 
   // Imgui control menu
   gol::ControlMenu control_menu(context);
@@ -127,7 +129,7 @@ int main(int ac, char **av) {
   while (!WindowShouldClose()) {
     // Frames shinenigans
     float deltaTime = GetFrameTime();
-    sim_speed = control_menu.fps_ctrl_ / 10.0f;
+    sim_speed = context.settings_menu->getFPS() / 10.0f;
     timePerUpdate = (1.0f / 10.0f) / sim_speed;
 
     control_menu.update();
@@ -142,15 +144,15 @@ int main(int ac, char **av) {
     }
 
     // Selection behaviour
-    if (!control_menu.edit_ctrl_ && !control_menu.play_ctrl_ && !control_menu.paterns_ctrl_ && !control_menu.settings_window_) {
+    if (!control_menu.edit_ctrl_ && !control_menu.play_ctrl_ && !control_menu.paterns_ctrl_ && !context.settings_menu->isOpen()) {
       if (gesture == GESTURE_TAP && !ImGui::IsWindowHovered(ImGuiHoveredFlags_AnyWindow)) {
-        sel_pos = snapToGrid(mousePos, control_menu.cell_size_ctrl_);
+        sel_pos = snapToGrid(mousePos, context.settings_menu->getCellSize());
         selecting = true;
       }
-      if (ImGui::IsMouseReleased(0) && selecting == true && mousePos.x >=0 && mousePos.x < control_menu.width_ctrl_ && mousePos.y >=0 && mousePos.y < control_menu.height_ctrl_ ) {
+      if (ImGui::IsMouseReleased(0) && selecting == true && mousePos.x >=0 && mousePos.x < context.settings_menu->getWidth() && mousePos.y >=0 && mousePos.y < context.settings_menu->getHeight() ) {
         selecting = false;
-        Vector2i p1 = screenToGrid(sel_pos, control_menu.cell_size_ctrl_);
+        Vector2i p1 = screenToGrid(sel_pos, context.settings_menu->getCellSize());
-        Vector2i p2 = screenToGrid(mousePos, control_menu.cell_size_ctrl_);
+        Vector2i p2 = screenToGrid(mousePos, context.settings_menu->getCellSize());
         // Get origin
         Vector2i orig = {
           (p1.x < p2.x)?p1.x:p2.x,
@@ -171,35 +173,7 @@ int main(int ac, char **av) {
     if (!sel_ctrl) {
       patern_name[0] = '\0';
     }
-
+    context.settings_menu->update();
-    if (control_menu.apply_ctrl_) {
-      bool resize_needed = false;
-      context.config_json["fps"] = control_menu.fps_ctrl_;
-      if (context.config_json["screen_width"].get<int>() != control_menu.width_ctrl_ ||
-          context.config_json["screen_height"].get<int>() != control_menu.height_ctrl_) {
-        context.config_json["screen_width"] = control_menu.width_ctrl_;
-        context.config_json["screen_height"] = control_menu.height_ctrl_;
-        rlImGuiShutdown();
-        SetWindowSize(control_menu.width_ctrl_, control_menu.height_ctrl_);
-        rlImGuiSetup(control_menu.dark_theme_ctrl_);
-        resize_needed = true;
-      }
-      if (control_menu.cell_size_ctrl_ != context.config_json["cell_size"].get<int>() ||
-          resize_needed) {
-        context.world->resize(context.config_json["screen_width"].get<int>() / control_menu.cell_size_ctrl_,
-                     context.config_json["screen_height"].get<int>() / control_menu.cell_size_ctrl_);
-        render.updateCellSize(control_menu.cell_size_ctrl_);
-        context.rules->newWorld(&(*context.world));
-        context.config_json["cell_size"] = control_menu.cell_size_ctrl_;
-      }
-      if (control_menu.dark_theme_ctrl_ != context.config_json["dark_theme"]) {
-        rlImGuiShutdown();
-        rlImGuiSetup(control_menu.dark_theme_ctrl_);
-        context.config_json["dark_theme"] = control_menu.dark_theme_ctrl_;
-      }
-      control_menu.apply_ctrl_ = false;
-      control_menu.settings_window_ = false;
-    }
 
     // Accumulate time and update simulation at the adjusted speed
     deltaTimeAccumulator += deltaTime;
@@ -214,9 +188,9 @@ int main(int ac, char **av) {
     }
     BeginDrawing();
     ClearBackground(BLACK);
-    render.display(&(*context.world));
+    context.render->display(&(*context.world));
     if (selecting) {
-      auto grid_mouse = snapToGrid(mousePos, control_menu.cell_size_ctrl_);
+      auto grid_mouse = snapToGrid(mousePos, context.settings_menu->getCellSize());
       bool sel_x_less = (sel_pos.x < grid_mouse.x);
       bool sel_y_less = (sel_pos.y < grid_mouse.y);
       DrawRectangleLines(((sel_x_less)? sel_pos.x: grid_mouse.x), ((sel_y_less)? sel_pos.y: grid_mouse.y),
@@ -235,20 +209,7 @@ int main(int ac, char **av) {
       ImGui::Button("refresh");
       ImGui::End();
     }
-    if (control_menu.settings_window_) {
+    context.settings_menu->display();
-      ImGuiWindowFlags settings_flags =
-          ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoResize;
-      ImGui::Begin("Settings", &control_menu.settings_window_, settings_flags);
-      ImGui::SliderInt("Window Width", &control_menu.width_ctrl_, 800, 1920);
-      ImGui::SliderInt("Window Height", &control_menu.height_ctrl_, 600, 1200);
-      ImGui::SliderInt("FPS", &control_menu.fps_ctrl_, 0, 30);
-      ImGui::SliderInt("Cell Size", &control_menu.cell_size_ctrl_, 4, 100);
-      ImGui::Checkbox("Dark Theme", &control_menu.dark_theme_ctrl_);
-      if (ImGui::Button("Save & Apply")) {
-        control_menu.apply_ctrl_ = true;
-      }
-      ImGui::End();
-    }
     if (sel_ctrl) {
       BeginTextureMode(selectionTexture);
       ClearBackground(BLACK);

src/settings_menu.cpp

@@ -0,0 +1,121 @@
+/*
+* File name: settings_menu.cpp
+* Author: lejulien
+* Date created: 01-01-1970 00:59:59
+// Date modified: 12-01-2026 21:31:20
+* ------
+*/
+#include <nlohmann/json.hpp>
+
+#include <imgui.h>
+#include <raylib.h>
+#include <rlImGui.h>
+
+#include <settings_menu.hpp>
+#include <context.hpp>
+#include <world.hpp>
+#include <rules.hpp>
+#include <render.hpp>
+
+namespace gol {
+
+SettingsMenu::SettingsMenu(ctx &context): context_(context) {
+  fps_ctrl_ = context.config_json["fps"].get<int>();
+  cell_size_ctrl_ = context.config_json["cell_size"].get<int>();
+  settings_window_ = false;
+  width_ctrl_ = context.config_json["screen_width"].get<int>();
+  height_ctrl_ = context.config_json["screen_height"].get<int>();
+  dark_theme_ctrl_ = context.config_json["dark_theme"].get<bool>();
+  apply_ctrl_ = false;
+}
+
+void SettingsMenu::update() {
+  if (apply_ctrl_) {
+    bool resize_needed = false;
+    context_.config_json["fps"] = fps_ctrl_;
+    if (context_.config_json["screen_width"].get<int>() != width_ctrl_ ||
+        context_.config_json["screen_height"].get<int>() != height_ctrl_) {
+      context_.config_json["screen_width"] = width_ctrl_;
+      context_.config_json["screen_height"] = height_ctrl_;
+      rlImGuiShutdown();
+      SetWindowSize(width_ctrl_, height_ctrl_);
+      rlImGuiSetup(dark_theme_ctrl_);
+      resize_needed = true;
+    }
+    if (cell_size_ctrl_ != context_.config_json["cell_size"].get<int>() ||
+        resize_needed) {
+      context_.world->resize(context_.config_json["screen_width"].get<int>() / cell_size_ctrl_,
+                   context_.config_json["screen_height"].get<int>() / cell_size_ctrl_);
+      context_.render->updateCellSize(cell_size_ctrl_);
+      context_.rules->newWorld(&(*context_.world));
+      context_.config_json["cell_size"] = cell_size_ctrl_;
+    }
+    if (dark_theme_ctrl_ != context_.config_json["dark_theme"]) {
+      rlImGuiShutdown();
+      rlImGuiSetup(dark_theme_ctrl_);
+      context_.config_json["dark_theme"] = dark_theme_ctrl_;
+    }
+    apply_ctrl_ = false;
+    settings_window_ = false;
+  }
+}
+
+void SettingsMenu::display() {
+  if (settings_window_) {
+    ImGuiWindowFlags settings_flags =
+        ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoResize;
+    ImGui::Begin("Settings", &settings_window_, settings_flags);
+    ImGui::SliderInt("Window Width", &width_ctrl_, 800, 1920);
+    ImGui::SliderInt("Window Height", &height_ctrl_, 600, 1200);
+    ImGui::SliderInt("FPS", &fps_ctrl_, 0, 30);
+    ImGui::SliderInt("Cell Size", &cell_size_ctrl_, 4, 100);
+    ImGui::Checkbox("Dark Theme", &dark_theme_ctrl_);
+    if (ImGui::Button("Save & Apply")) {
+      apply_ctrl_ = true;
+    }
+    ImGui::End();
+  }
+}
+
+bool SettingsMenu::isOpen() {
+  return settings_window_;
+}
+
+void SettingsMenu::Toogle() {
+  settings_window_ = !settings_window_;
+}
+
+// Getters/Setters
+int SettingsMenu::getFPS() {
+  return fps_ctrl_;
+}
+
+void SettingsMenu::setFPS(int new_fps) {
+  fps_ctrl_ = new_fps;
+}
+
+int SettingsMenu::getCellSize() {
+  return cell_size_ctrl_;
+}
+
+void SettingsMenu::setCellSize(int new_cell_size) {
+  cell_size_ctrl_ = new_cell_size;
+}
+
+int SettingsMenu::getWidth() {
+  return width_ctrl_;
+}
+
+void SettingsMenu::setWidth(int new_width) {
+  width_ctrl_ = new_width;
+}
+
+int SettingsMenu::getHeight() {
+  return height_ctrl_;
+}
+
+void SettingsMenu::setHeight(int new_height) {
+  height_ctrl_ = new_height;
+}
+
+} // namespace gol