hachem.wtf
aboutsummaryrefslogtreecommitdiff
path: root/src/states
diff options
context:
space:
mode:
authorhachem <im@hachem.wtf>2025-08-16 17:36:57 +0200
committerhachem <im@hachem.wtf>2025-08-16 17:36:57 +0200
commitf7334b82e8ab8b4a36847d7f9dd2a56f29dd0cbf (patch)
tree75cdf9b8bd802309ffc070a30af0fa72530b6d19 /src/states
parent8f906c3139a813b9a829821944b464b3facdad59 (diff)
feat: themes and better UI
Diffstat (limited to 'src/states')
-rw-r--r--src/states/config_state.cpp229
-rw-r--r--src/states/config_state.h25
-rw-r--r--src/states/simulation_state.cpp62
3 files changed, 288 insertions, 28 deletions
diff --git a/src/states/config_state.cpp b/src/states/config_state.cpp
index d29408b..8cf24ef 100644
--- a/src/states/config_state.cpp
+++ b/src/states/config_state.cpp
@@ -1,14 +1,20 @@
#include "config_state.h"
#include "rendering/renderer.h"
#include "core/application.h"
+#include "core/theme_manager.h"
#include <imgui.h>
+#include <imgui_internal.h>
+#include <glad/glad.h>
namespace Donut
{
void ConfigState::on_enter()
{
DONUT_INFO("Entering Config State");
+
+ m_selected_api = Renderer::get_api();
+ m_selected_theme = static_cast<int>(ThemeManager::get_current_theme());
}
void ConfigState::on_exit()
@@ -18,11 +24,20 @@ namespace Donut
void ConfigState::on_update(float delta_time)
{
+ if (m_show_restart_message)
+ {
+ m_restart_message_timer += delta_time;
+ if (m_restart_message_timer > 3.0f)
+ {
+ m_show_restart_message = false;
+ m_restart_message_timer = 0.0f;
+ }
+ }
}
void ConfigState::on_render()
{
- Renderer::set_clear_color({ 0.1f, 0.1f, 0.1f, 1.0f });
+ Renderer::set_clear_color({ 0.05f, 0.05f, 0.1f, 1.0f });
Renderer::clear();
}
@@ -32,10 +47,216 @@ namespace Donut
void ConfigState::on_im_ui_render()
{
- ImGui::Begin("Configuration");
- ImGui::Text("Configuration State");
- if (ImGui::Button("Start Simulation"))
+ ImGui::SetNextWindowSize(ImVec2(900, 700), ImGuiCond_FirstUseEver);
+ ImGui::SetNextWindowPos(ImVec2(ImGui::GetIO().DisplaySize.x * 0.5f, ImGui::GetIO().DisplaySize.y * 0.5f),
+ ImGuiCond_FirstUseEver, ImVec2(0.5f, 0.5f));
+
+ ImGui::Begin("Donut Configuration", nullptr, ImGuiWindowFlags_NoCollapse);
+
+ ImGui::PushFont(ImGui::GetIO().Fonts->Fonts[0]);
+ ImGui::TextColored(ImVec4(0.8f, 0.8f, 1.0f, 1.0f), "Donut Configuration");
+ ImGui::PopFont();
+ ImGui::Separator();
+
+ ImGui::Columns(2, "ConfigColumns", true);
+
+ float available_height = ImGui::GetWindowHeight() - 140;
+
+ ImGui::BeginChild("GraphicsSettings", ImVec2(0, available_height), true, ImGuiWindowFlags_AlwaysVerticalScrollbar);
+ ImGui::TextColored(ImVec4(0.9f, 0.9f, 1.0f, 1.0f), "Graphics Settings");
+ ImGui::Separator();
+
+ ImGui::Text("Render API:");
+ ImGui::SameLine();
+ ImGui::TextColored(ImVec4(0.7f, 0.7f, 0.7f, 1.0f), "(requires restart)");
+
+ const char* api_names[] = { "OpenGL", "Vulkan" };
+ static int current_api = (int)m_selected_api - 1;
+
+ if (ImGui::BeginCombo("##RenderAPI", api_names[current_api]))
+ {
+ for (int i = 0; i < IM_ARRAYSIZE(api_names); i++)
+ {
+ const bool is_selected = (current_api == i);
+ if (ImGui::Selectable(api_names[i], is_selected))
+ {
+ current_api = i;
+ m_selected_api = (RendererAPI::API)(i + 1);
+ m_show_restart_message = true;
+ m_restart_message_timer = 0.0f;
+ }
+
+ if (is_selected)
+ ImGui::SetItemDefaultFocus();
+ }
+ ImGui::EndCombo();
+ }
+
+ ImGui::Text("Current API: ");
+ ImGui::SameLine();
+ const char* current_api_name = (Renderer::get_api() == RendererAPI::API::OpenGL) ? "OpenGL" : "Vulkan";
+ ImGui::TextColored(ImVec4(0.3f, 0.8f, 0.3f, 1.0f), current_api_name);
+
+ ImGui::Spacing();
+
+ ImGui::Checkbox("Enable VSync", &m_v_sync_enabled);
+ ImGui::SameLine();
+ ImGui::TextColored(ImVec4(0.7f, 0.7f, 0.7f, 1.0f), "(recommended)");
+
+ ImGui::Spacing();
+
+ ImGui::TextColored(ImVec4(0.9f, 0.9f, 1.0f, 1.0f), "Display");
+ ImGui::Separator();
+
+ ImGui::Text("Window Size: 1280x720");
+ ImGui::TextColored(ImVec4(0.7f, 0.7f, 0.7f, 1.0f), "Fullscreen: Not implemented yet");
+
+ ImGui::Spacing();
+
+ ImGui::TextColored(ImVec4(0.9f, 0.9f, 1.0f, 1.0f), "System Info");
+ ImGui::Separator();
+
+ ImGui::Text("OpenGL Version: %s", glGetString(GL_VERSION));
+ ImGui::Text("GPU: %s", glGetString(GL_RENDERER));
+ ImGui::Text("Vendor: %s", glGetString(GL_VENDOR));
+
+ ImGui::Spacing();
+
+ ImGui::TextColored(ImVec4(0.9f, 0.9f, 1.0f, 1.0f), "Performance");
+ ImGui::Separator();
+
+ ImGui::SliderInt("Target FPS", &m_target_fps, 30, 120, "%d FPS");
+ if (ImGui::IsItemHovered())
+ ImGui::SetTooltip("Target frame rate for the simulation");
+
+ ImGui::Checkbox("Show FPS Counter", &m_show_fps);
+ if (ImGui::IsItemHovered())
+ ImGui::SetTooltip("Display current FPS in the simulation");
+
+ ImGui::Checkbox("Show Performance Metrics", &m_show_performance_metrics);
+ if (ImGui::IsItemHovered())
+ ImGui::SetTooltip("Show detailed performance information");
+
+ ImGui::Checkbox("Show Debug Info", &m_show_debug_info);
+ if (ImGui::IsItemHovered())
+ ImGui::SetTooltip("Display debug information and statistics");
+
+ ImGui::Checkbox("Enable Anti-Aliasing", &m_enable_anti_aliasing);
+ if (ImGui::IsItemHovered())
+ ImGui::SetTooltip("Enable anti-aliasing for smoother rendering");
+
+ ImGui::Spacing();
+
+ ImGui::TextColored(ImVec4(0.9f, 0.9f, 1.0f, 1.0f), "Theme");
+ ImGui::Separator();
+
+ const char* theme_names[] = { "Dark", "Light", "Blue" };
+ if (ImGui::Combo("UI Theme", &m_selected_theme, theme_names, IM_ARRAYSIZE(theme_names)))
+ ThemeManager::set_theme(static_cast<Theme>(m_selected_theme));
+ if (ImGui::IsItemHovered())
+ ImGui::SetTooltip("Choose the application theme");
+
+ ImGui::EndChild();
+
+ ImGui::NextColumn();
+
+ ImGui::BeginChild("SimulationSettings", ImVec2(0, available_height), true, ImGuiWindowFlags_AlwaysVerticalScrollbar);
+ ImGui::TextColored(ImVec4(0.9f, 0.9f, 1.0f, 1.0f), "Simulation Settings");
+ ImGui::Separator();
+
+ ImGui::TextColored(ImVec4(0.9f, 0.9f, 1.0f, 1.0f), "Quality");
+ ImGui::Separator();
+
+ ImGui::SliderInt("Compute Height", &m_compute_height, 64, 2048, "%d px");
+ if (ImGui::IsItemHovered())
+ ImGui::SetTooltip("Resolution of the compute shader. Higher values give better quality but lower performance.");
+ ImGui::TextColored(ImVec4(0.7f, 0.7f, 0.7f, 1.0f), "Higher = better quality, lower performance");
+
+ ImGui::SliderInt("Max Steps (Moving)", &m_max_steps_moving, 1000, 60000, "%d");
+ if (ImGui::IsItemHovered())
+ ImGui::SetTooltip("Maximum ray marching steps when camera is moving");
+
+ ImGui::SliderInt("Max Steps (Static)", &m_max_steps_static, 1000, 30000, "%d");
+ if (ImGui::IsItemHovered())
+ ImGui::SetTooltip("Maximum ray marching steps when camera is stationary");
+
+ ImGui::SliderFloat("Early Exit Distance", &m_early_exit_distance, 1e11f, 1e13f, "%.2e");
+ if (ImGui::IsItemHovered())
+ ImGui::SetTooltip("Distance at which ray marching stops to improve performance");
+ ImGui::TextColored(ImVec4(0.7f, 0.7f, 0.7f, 1.0f), "Distance at which ray marching stops");
+
+ ImGui::Spacing();
+
+ ImGui::TextColored(ImVec4(0.9f, 0.9f, 1.0f, 1.0f), "Physics");
+ ImGui::Separator();
+
+ ImGui::Checkbox("Enable Gravity", &m_gravity_enabled);
+
+ ImGui::EndChild();
+
+ ImGui::Columns(1);
+
+ ImGui::Spacing();
+ ImGui::Separator();
+ ImGui::Spacing();
+
+ float button_width = (ImGui::GetWindowWidth() - 80) / 4.0f;
+
+ if (ImGui::Button("Start Simulation", ImVec2(button_width, 35)))
+ {
+ apply_settings();
Application::get().get_state_manager().switch_to_state("Simulation");
+ }
+
+ ImGui::SameLine();
+ if (ImGui::Button("Reset to Defaults", ImVec2(button_width, 35)))
+ reset_to_defaults();
+
+ ImGui::SameLine();
+ if (ImGui::Button("Apply Settings", ImVec2(button_width, 35)))
+ apply_settings();
+
+ ImGui::SameLine();
+ if (ImGui::Button("Exit", ImVec2(button_width, 35)))
+ Application::get().close();
+
+ if (m_show_restart_message)
+ {
+ ImGui::SetCursorPosY(ImGui::GetCursorPosY() + 10);
+ ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(1.0f, 0.8f, 0.2f, 1.0f));
+ ImGui::TextWrapped("Warning: Render API changed! Please restart the application for changes to take effect.");
+ ImGui::PopStyleColor();
+ }
+
+ ImGui::Spacing();
+ ImGui::Separator();
+ ImGui::TextColored(ImVec4(0.5f, 0.5f, 0.5f, 1.0f), "Donut Engine v1.0.0 | Black Hole Simulation");
+
ImGui::End();
}
+
+ void ConfigState::apply_settings()
+ {
+ RendererAPI::set_api(m_selected_api);
+ DONUT_INFO("Settings applied");
+ }
+
+ void ConfigState::reset_to_defaults()
+ {
+ m_selected_api = RendererAPI::API::OpenGL;
+ m_target_fps = 60;
+ m_compute_height = 512;
+ m_max_steps_moving = 30000;
+ m_max_steps_static = 15000;
+ m_early_exit_distance = 5e12f;
+ m_gravity_enabled = true;
+ m_v_sync_enabled = true;
+ m_show_fps = true;
+ m_show_performance_metrics = true;
+ m_show_debug_info = false;
+ m_enable_anti_aliasing = true;
+ m_selected_theme = 0;
+
+ DONUT_INFO("Settings reset to defaults");
+ }
};
diff --git a/src/states/config_state.h b/src/states/config_state.h
index 15aff5c..7a31f8c 100644
--- a/src/states/config_state.h
+++ b/src/states/config_state.h
@@ -3,6 +3,7 @@
#include "core/state.h"
#include "core/event.h"
#include "core/log.h"
+#include "rendering/renderer.h"
namespace Donut
{
@@ -18,5 +19,29 @@ namespace Donut
void on_render() override;
void on_im_ui_render() override;
void on_event(Event& event) override;
+
+ private:
+ void apply_settings();
+ void reset_to_defaults();
+
+ private:
+ RendererAPI::API m_selected_api = RendererAPI::API::OpenGL;
+ bool m_show_restart_message = false;
+ float m_restart_message_timer = 0.0f;
+
+ int m_target_fps = 60;
+ int m_compute_height = 512;
+ int m_max_steps_moving = 30000;
+ int m_max_steps_static = 15000;
+ float m_early_exit_distance = 5e12f;
+ bool m_gravity_enabled = true;
+
+ bool m_v_sync_enabled = true;
+ bool m_show_fps = true;
+ bool m_show_performance_metrics = true;
+ bool m_show_debug_info = false;
+ bool m_enable_anti_aliasing = true;
+
+ int m_selected_theme = 0;
};
};
diff --git a/src/states/simulation_state.cpp b/src/states/simulation_state.cpp
index ecb2898..ff7f658 100644
--- a/src/states/simulation_state.cpp
+++ b/src/states/simulation_state.cpp
@@ -86,32 +86,36 @@ namespace Donut
void SimulationState::on_im_ui_render()
{
- ImGui::Begin("Simulation Controls");
+ ImGui::SetNextWindowSize(ImVec2(400, 600), ImGuiCond_FirstUseEver);
+ ImGui::SetNextWindowPos(ImVec2(ImGui::GetIO().DisplaySize.x - 420, 20), ImGuiCond_FirstUseEver);
- ImGui::Text("Black Hole Simulation");
+ ImGui::Begin("Simulation Controls", nullptr, ImGuiWindowFlags_NoCollapse);
+
+ ImGui::TextColored(ImVec4(0.8f, 0.8f, 1.0f, 1.0f), "Black Hole Simulation");
if (ImGui::Button("Back to Config"))
Application::get().get_state_manager().switch_to_state("Config");
ImGui::Separator();
- ImGui::Text("Simulation Info:");
- ImGui::Text("FPS: %.1f", ImGui::GetIO().Framerate);
- ImGui::Text("Frame Time: %.3f ms", 1000.0f / ImGui::GetIO().Framerate);
- ImGui::Text("Resolution: %dx%d", m_engine.get_width(), m_engine.get_height());
- ImGui::Text("Compute Resolution: %dx%d", m_engine.get_compute_width(), m_engine.get_compute_height());
- ImGui::Text("Objects: %zu", m_engine.get_objects().size());
-
+ ImGui::TextColored(ImVec4(0.9f, 0.9f, 1.0f, 1.0f), "Performance");
ImGui::Separator();
- ImGui::Text("Performance:");
+ ImGui::Text("FPS: %.1f", ImGui::GetIO().Framerate);
+ ImGui::Text("Frame Time: %.3f ms", 1000.0f / ImGui::GetIO().Framerate);
ImGui::Text("Engine FPS: %.1f", m_engine.get_current_fps());
- ImGui::Text("Target FPS: %d", m_engine.get_target_fps());
int target_fps = m_engine.get_target_fps();
if (ImGui::SliderInt("Target FPS", &target_fps, 30, 120))
- {
m_engine.set_target_fps(target_fps);
- }
+
+ ImGui::Spacing();
+
+ ImGui::TextColored(ImVec4(0.9f, 0.9f, 1.0f, 1.0f), "Simulation Info");
+ ImGui::Separator();
+
+ ImGui::Text("Resolution: %dx%d", m_engine.get_width(), m_engine.get_height());
+ ImGui::Text("Compute Resolution: %dx%d", m_engine.get_compute_width(), m_engine.get_compute_height());
+ ImGui::Text("Objects: %zu", m_engine.get_objects().size());
int compute_height = m_engine.get_compute_height();
if (ImGui::SliderInt("Compute Height", &compute_height, 64, 2048))
@@ -120,11 +124,13 @@ namespace Donut
m_engine.update_compute_dimensions();
}
- ImGui::Text("Compute Width: %d (auto-calculated)", m_engine.get_compute_width());
+ ImGui::TextColored(ImVec4(0.7f, 0.7f, 0.7f, 1.0f), "Compute Width: %d (auto-calculated)", m_engine.get_compute_width());
+ ImGui::Spacing();
+
+ ImGui::TextColored(ImVec4(0.9f, 0.9f, 1.0f, 1.0f), "Quality Settings");
ImGui::Separator();
- ImGui::Text("Simulation Quality:");
int max_steps_moving = m_engine.get_max_steps_moving();
if (ImGui::SliderInt("Max Steps (Moving)", &max_steps_moving, 1000, 60000))
m_engine.set_max_steps_moving(max_steps_moving);
@@ -135,21 +141,19 @@ namespace Donut
if (ImGui::SliderFloat("Early Exit Distance", &early_exit_distance, 1e11f, 1e13f, "%.2e"))
m_engine.set_early_exit_distance(early_exit_distance);
- ImGui::Separator();
-
- ImGui::Text("Controls:");
- ImGui::Text("Left Mouse: Orbit camera");
- ImGui::Text("Scroll: Zoom in/out");
- ImGui::Text("G: Toggle gravity");
- ImGui::Text("Right Mouse: Enable gravity (hold)");
+ ImGui::Spacing();
+ ImGui::TextColored(ImVec4(0.9f, 0.9f, 1.0f, 1.0f), "Physics");
ImGui::Separator();
- ImGui::Text("Physics:");
bool& gravity = m_engine.get_gravity();
ImGui::Checkbox("Gravity Enabled", &gravity);
- ImGui::Text("Camera:");
+ ImGui::Spacing();
+
+ ImGui::TextColored(ImVec4(0.9f, 0.9f, 1.0f, 1.0f), "Camera");
+ ImGui::Separator();
+
ImGui::Text("Position: (%.2e, %.2e, %.2e)",
m_engine.get_camera().get_orbital_position().x,
m_engine.get_camera().get_orbital_position().y,
@@ -158,6 +162,16 @@ namespace Donut
ImGui::Text("Azimuth: %.2f", m_engine.get_camera().get_azimuth());
ImGui::Text("Elevation: %.2f", m_engine.get_camera().get_elevation());
+ ImGui::Spacing();
+
+ ImGui::TextColored(ImVec4(0.9f, 0.9f, 1.0f, 1.0f), "Controls");
+ ImGui::Separator();
+
+ ImGui::Text("Left Mouse: Orbit camera");
+ ImGui::Text("Scroll: Zoom in/out");
+ ImGui::Text("G: Toggle gravity");
+ ImGui::Text("Right Mouse: Enable gravity (hold)");
+
ImGui::End();
}
};