fix: proper scene loading

4 files changed, 72 insertions, 58 deletions

diff --git a/src/states/config_state.cpp b/src/states/config_state.cpp
index 41fbaad..4573aab 100644
--- a/src/states/config_state.cpp
+++ b/src/states/config_state.cpp
@@ -216,15 +216,8 @@ namespace Donut
         ImGui::Separator();
         ImGui::Spacing();
 
-        float button_width = (ImGui::GetWindowWidth() - 120) / 6.0f;
+        float button_width = (ImGui::GetWindowWidth() - 120) / 5.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("World Builder", ImVec2(button_width, 35)))
         {
             apply_settings();
diff --git a/src/states/simulation_state.cpp b/src/states/simulation_state.cpp
index e71d498..6964852 100644
--- a/src/states/simulation_state.cpp
+++ b/src/states/simulation_state.cpp
@@ -15,15 +15,16 @@ namespace Donut
         DONUT_INFO("Entering Simulation State");
         
         const auto& settings = SettingsManager::get_settings_const();
+        auto& engine = Application::get().get_engine();
         
-        m_engine.set_target_fps(settings.simulation.target_fps);
-        m_engine.set_compute_height(settings.simulation.compute_height);
-        m_engine.set_max_steps_moving(settings.simulation.max_steps_moving);
-        m_engine.set_max_steps_static(settings.simulation.max_steps_static);
-        m_engine.set_early_exit_distance(settings.simulation.early_exit_distance);
-        m_engine.get_gravity() = settings.simulation.gravity_enabled;
+        engine.set_target_fps(settings.simulation.target_fps);
+        engine.set_compute_height(settings.simulation.compute_height);
+        engine.set_max_steps_moving(settings.simulation.max_steps_moving);
+        engine.set_max_steps_static(settings.simulation.max_steps_static);
+        engine.set_early_exit_distance(settings.simulation.early_exit_distance);
+        engine.get_gravity() = settings.simulation.gravity_enabled;
         
-        m_engine.update_compute_dimensions();
+        engine.update_compute_dimensions();
         m_initialized = true;
     }
     
@@ -34,38 +35,42 @@ namespace Donut
     
     void SimulationState::on_update(float delta_time)
     {
-        m_engine.update_performance(delta_time);
-        m_engine.update_window_dimensions();
-        m_engine.update_physics(delta_time);
+        auto& engine = Application::get().get_engine();
+        engine.update_performance(delta_time);
+        engine.update_window_dimensions();
+        engine.update_physics(delta_time);
 
-        if (m_engine.get_camera().is_dragging())
+        if (engine.get_camera().is_dragging())
         {
             GLFWwindow* window = static_cast<GLFWwindow*>(Application::get().get_window().get_native_window());
             double xpos, ypos;
             glfwGetCursorPos(window, &xpos, &ypos);
-            m_engine.get_camera().process_orbital_mouse_move(xpos, ypos);
+            engine.get_camera().process_orbital_mouse_move(xpos, ypos);
         }
     }
     
     void SimulationState::on_render()
     {
+        auto& engine = Application::get().get_engine();
         RenderCommand::set_clear_color(glm::vec4(0.0f, 0.0f, 0.0f, 1.0f));
         RenderCommand::clear();
-        RenderCommand::set_viewport(0, 0, m_engine.get_width(), m_engine.get_height());
+        RenderCommand::set_viewport(0, 0, static_cast<uint32_t>(engine.get_width()), static_cast<uint32_t>(engine.get_height()));
 
-        m_engine.dispatch_compute(m_engine.get_camera());
-        m_engine.draw_full_screen_quad();
+        engine.dispatch_compute(engine.get_camera());
+        engine.draw_full_screen_quad();
     }
     
     void SimulationState::on_event(Event& event)
     {
+        auto& engine = Application::get().get_engine();
+        
         if (event.get_event_type() == EventType::MouseButtonPressed)
         {
             MouseButtonPressedEvent& e = (MouseButtonPressedEvent&)event;
             int button = e.get_mouse_button();
             
             GLFWwindow* window = static_cast<GLFWwindow*>(Application::get().get_window().get_native_window());
-            Camera& camera = m_engine.get_camera();
+            Camera& camera = engine.get_camera();
             double last_x = camera.get_last_x();
             double last_y = camera.get_last_y();
             glfwGetCursorPos(window, &last_x, &last_y);
@@ -76,13 +81,13 @@ namespace Donut
         {
             MouseButtonReleasedEvent& e = (MouseButtonReleasedEvent&)event;
             int button = e.get_mouse_button();
-            m_engine.get_camera().process_orbital_mouse_button(button, GLFW_RELEASE, 0);
+            engine.get_camera().process_orbital_mouse_button(button, GLFW_RELEASE, 0);
         }
         
         if (event.get_event_type() == EventType::MouseScrolled)
         {
             MouseScrolledEvent& e = (MouseScrolledEvent&)event;
-            m_engine.get_camera().process_orbital_scroll(e.get_x_offset(), e.get_y_offset());
+            engine.get_camera().process_orbital_scroll(e.get_x_offset(), e.get_y_offset());
         }
         
         if (event.get_event_type() == EventType::KeyPressed)
@@ -90,14 +95,16 @@ namespace Donut
             KeyPressedEvent& e = (KeyPressedEvent&)event;
             if (e.get_key_code() == GLFW_KEY_G)
             {
-                m_engine.get_gravity() = !m_engine.get_gravity();
-                DONUT_INFO("Gravity turned {}", m_engine.get_gravity() ? "ON" : "OFF");
+                engine.get_gravity() = !engine.get_gravity();
+                DONUT_INFO("Gravity turned {}", engine.get_gravity() ? "ON" : "OFF");
             }
         }
     }
     
     void SimulationState::on_im_ui_render()
     {
+        auto& engine = Application::get().get_engine();
+        
         ImGui::SetNextWindowSize(ImVec2(400, 600), ImGuiCond_FirstUseEver);
         ImGui::SetNextWindowPos(ImVec2(ImGui::GetIO().DisplaySize.x - 420, 20), ImGuiCond_FirstUseEver);
         
@@ -111,12 +118,12 @@ namespace Donut
         if (ImGui::Button("Save Settings"))
         {
             SimulationSettings settings = SettingsManager::get_settings_const().simulation;
-            settings.target_fps = m_engine.get_target_fps();
-            settings.compute_height = m_engine.get_compute_height();
-            settings.max_steps_moving = m_engine.get_max_steps_moving();
-            settings.max_steps_static = m_engine.get_max_steps_static();
-            settings.early_exit_distance = m_engine.get_early_exit_distance();
-            settings.gravity_enabled = m_engine.get_gravity();
+            settings.target_fps = engine.get_target_fps();
+            settings.compute_height = engine.get_compute_height();
+            settings.max_steps_moving = engine.get_max_steps_moving();
+            settings.max_steps_static = engine.get_max_steps_static();
+            settings.early_exit_distance = engine.get_early_exit_distance();
+            settings.gravity_enabled = engine.get_gravity();
             SettingsManager::set_simulation_settings(settings);
             DONUT_INFO("Simulation settings saved manually");
         }
@@ -128,12 +135,12 @@ namespace Donut
         
         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("Engine FPS: %.1f", engine.get_current_fps());
         
-        int target_fps = m_engine.get_target_fps();
+        int target_fps = engine.get_target_fps();
         if (ImGui::SliderInt("Target FPS", &target_fps, 30, 120))
         {
-            m_engine.set_target_fps(target_fps);
+            engine.set_target_fps(target_fps);
             SimulationSettings settings = SettingsManager::get_settings_const().simulation;
             settings.target_fps = target_fps;
             SettingsManager::set_simulation_settings(settings);
@@ -144,47 +151,52 @@ namespace Donut
         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());
+        ImGui::Text("Resolution: %dx%d", engine.get_width(), engine.get_height());
+        ImGui::Text("Compute Resolution: %dx%d", engine.get_compute_width(), engine.get_compute_height());
+        ImGui::Text("Objects: %zu", engine.get_objects().size());
+        
+        if (ImGui::Button("Print Object Info"))
+        {
+            engine.print_object_info();
+        }
         
-        int compute_height = m_engine.get_compute_height();
+        int compute_height = engine.get_compute_height();
         if (ImGui::SliderInt("Compute Height", &compute_height, 64, 2048))
         {
-            m_engine.set_compute_height(compute_height);
-            m_engine.update_compute_dimensions();
+            engine.set_compute_height(compute_height);
+            engine.update_compute_dimensions();
             SimulationSettings settings = SettingsManager::get_settings_const().simulation;
             settings.compute_height = compute_height;
             SettingsManager::set_simulation_settings(settings);
         }
         
-        ImGui::TextColored(ImVec4(0.7f, 0.7f, 0.7f, 1.0f), "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)", engine.get_compute_width());
         
         ImGui::Spacing();
         
         ImGui::TextColored(ImVec4(0.9f, 0.9f, 1.0f, 1.0f), "Quality Settings");
         ImGui::Separator();
         
-        int max_steps_moving = m_engine.get_max_steps_moving();
+        int max_steps_moving = 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);
+            engine.set_max_steps_moving(max_steps_moving);
             SimulationSettings settings = SettingsManager::get_settings_const().simulation;
             settings.max_steps_moving = max_steps_moving;
             SettingsManager::set_simulation_settings(settings);
         }
-        int max_steps_static = m_engine.get_max_steps_static();
+        int max_steps_static = engine.get_max_steps_static();
         if (ImGui::SliderInt("Max Steps (Static)", &max_steps_static, 1000, 30000))
         {
-            m_engine.set_max_steps_static(max_steps_static);
+            engine.set_max_steps_static(max_steps_static);
             SimulationSettings settings = SettingsManager::get_settings_const().simulation;
             settings.max_steps_static = max_steps_static;
             SettingsManager::set_simulation_settings(settings);
         }
-        float early_exit_distance = m_engine.get_early_exit_distance();
+        float early_exit_distance = engine.get_early_exit_distance();
         if (ImGui::SliderFloat("Early Exit Distance", &early_exit_distance, 1e11f, 1e13f, "%.2e"))
         {
-            m_engine.set_early_exit_distance(early_exit_distance);
+            engine.set_early_exit_distance(early_exit_distance);
             SimulationSettings settings = SettingsManager::get_settings_const().simulation;
             settings.early_exit_distance = early_exit_distance;
             SettingsManager::set_simulation_settings(settings);
@@ -195,7 +207,7 @@ namespace Donut
         ImGui::TextColored(ImVec4(0.9f, 0.9f, 1.0f, 1.0f), "Physics");
         ImGui::Separator();
         
-        bool& gravity = m_engine.get_gravity();
+        bool& gravity = engine.get_gravity();
         if (ImGui::Checkbox("Gravity Enabled", &gravity))
         {
             SimulationSettings settings = SettingsManager::get_settings_const().simulation;
@@ -209,12 +221,12 @@ namespace Donut
         ImGui::Separator();
         
         ImGui::Text("Position: (%.2e, %.2e, %.2e)", 
-                   m_engine.get_camera().get_orbital_position().x, 
-                   m_engine.get_camera().get_orbital_position().y, 
-                   m_engine.get_camera().get_orbital_position().z);
-        ImGui::Text("Radius: %.2e", m_engine.get_camera().get_orbital_radius());
-        ImGui::Text("Azimuth: %.2f", m_engine.get_camera().get_azimuth());
-        ImGui::Text("Elevation: %.2f", m_engine.get_camera().get_elevation());
+                   engine.get_camera().get_orbital_position().x, 
+                   engine.get_camera().get_orbital_position().y, 
+                   engine.get_camera().get_orbital_position().z);
+        ImGui::Text("Radius: %.2e", engine.get_camera().get_orbital_radius());
+        ImGui::Text("Azimuth: %.2f", engine.get_camera().get_azimuth());
+        ImGui::Text("Elevation: %.2f", engine.get_camera().get_elevation());
         
         ImGui::Spacing();
         
diff --git a/src/states/simulation_state.h b/src/states/simulation_state.h
index cc55901..9a89fea 100644
--- a/src/states/simulation_state.h
+++ b/src/states/simulation_state.h
@@ -22,7 +22,6 @@ namespace Donut
         void on_event(Event& event)     override;
     
     private:
-        Engine m_engine;
         bool m_initialized = false;
     };
 };
diff --git a/src/states/world_builder_state.cpp b/src/states/world_builder_state.cpp
index a01935c..f28f70a 100644
--- a/src/states/world_builder_state.cpp
+++ b/src/states/world_builder_state.cpp
@@ -480,6 +480,16 @@ namespace Donut
         
         ImGui::Spacing();
         
+        if (ImGui::Button("Start Simulation", ImVec2(ImGui::GetWindowWidth() - 20, 30)))
+        {
+            auto& engine = Application::get().get_engine();
+            engine.load_objects_from_scene(m_scene.objs);
+            
+            Application::get().get_state_manager().switch_to_state("Simulation");
+        }
+        
+        ImGui::Spacing();
+        
         if (ImGui::Button("Back to Config", ImVec2(ImGui::GetWindowWidth() - 20, 30)))
             Application::get().get_state_manager().switch_to_state("Config");