diff options
Diffstat (limited to 'src/states')
| -rw-r--r-- | src/states/config_state.cpp | 16 | ||||
| -rw-r--r-- | src/states/config_state.h | 16 | ||||
| -rw-r--r-- | src/states/simulation_state.cpp | 12 | ||||
| -rw-r--r-- | src/states/simulation_state.h | 12 | ||||
| -rw-r--r-- | src/states/world_builder_state.cpp | 42 | ||||
| -rw-r--r-- | src/states/world_builder_state.h | 38 |
6 files changed, 68 insertions, 68 deletions
diff --git a/src/states/config_state.cpp b/src/states/config_state.cpp index 4573aab..d5fca87 100644 --- a/src/states/config_state.cpp +++ b/src/states/config_state.cpp @@ -10,7 +10,7 @@ namespace Donut { - void ConfigState::on_enter() + auto ConfigState::on_enter() -> void { DONUT_INFO("Entering Config State"); @@ -32,12 +32,12 @@ namespace Donut m_enable_anti_aliasing = settings.graphics.enable_anti_aliasing; } - void ConfigState::on_exit() + auto ConfigState::on_exit() -> void { DONUT_INFO("Exiting Config State"); } - void ConfigState::on_update(float delta_time) + auto ConfigState::on_update(float delta_time) -> void { if (m_show_restart_message) { @@ -50,17 +50,17 @@ namespace Donut } } - void ConfigState::on_render() + auto ConfigState::on_render() -> void { Renderer::set_clear_color({ 0.1f, 0.1f, 0.1f, 1.0f }); Renderer::clear(); } - void ConfigState::on_event(Event& event) + auto ConfigState::on_event(Event& event) -> void { } - void ConfigState::on_im_ui_render() + auto ConfigState::on_im_ui_render() -> void { ImGui::SetNextWindowSize(ImVec2(900, 700), ImGuiCond_FirstUseEver); ImGui::SetNextWindowPos(ImVec2(ImGui::GetIO().DisplaySize.x * 0.5f, ImGui::GetIO().DisplaySize.y * 0.5f), @@ -258,7 +258,7 @@ namespace Donut ImGui::End(); } - void ConfigState::apply_settings() + auto ConfigState::apply_settings() -> void { SimulationSettings sim_settings; sim_settings.target_fps = m_target_fps; @@ -285,7 +285,7 @@ namespace Donut DONUT_INFO("Settings applied and saved"); } - void ConfigState::reset_to_defaults() + auto ConfigState::reset_to_defaults() -> void { m_selected_api = RendererAPI::API::OpenGL; m_target_fps = 60; diff --git a/src/states/config_state.h b/src/states/config_state.h index 7a31f8c..c723daa 100644 --- a/src/states/config_state.h +++ b/src/states/config_state.h @@ -13,16 +13,16 @@ namespace Donut public: ~ConfigState() = default; - void on_enter() override; - void on_exit() override; - void on_update(float delta_time) override; - void on_render() override; - void on_im_ui_render() override; - void on_event(Event& event) override; + auto on_enter() -> void override; + auto on_exit() -> void override; + auto on_update(float delta_time) -> void override; + auto on_render() -> void override; + auto on_im_ui_render() -> void override; + auto on_event(Event& event) -> void override; private: - void apply_settings(); - void reset_to_defaults(); + auto apply_settings() -> void; + auto reset_to_defaults() -> void; private: RendererAPI::API m_selected_api = RendererAPI::API::OpenGL; diff --git a/src/states/simulation_state.cpp b/src/states/simulation_state.cpp index 540f236..06955ff 100644 --- a/src/states/simulation_state.cpp +++ b/src/states/simulation_state.cpp @@ -15,7 +15,7 @@ namespace Donut { - void SimulationState::on_enter() + auto SimulationState::on_enter() -> void { DONUT_INFO("Entering Simulation State"); @@ -39,12 +39,12 @@ namespace Donut m_initialized = true; } - void SimulationState::on_exit() + auto SimulationState::on_exit() -> void { DONUT_INFO("Exiting Simulation State"); } - void SimulationState::on_update(float delta_time) + auto SimulationState::on_update(float delta_time) -> void { auto& engine = Application::get().get_engine(); engine.update_performance(delta_time); @@ -60,7 +60,7 @@ namespace Donut } } - void SimulationState::on_render() + auto SimulationState::on_render() -> void { auto& engine = Application::get().get_engine(); RenderCommand::set_clear_color(glm::vec4(0.0f, 0.0f, 0.0f, 1.0f)); @@ -71,7 +71,7 @@ namespace Donut engine.draw_blur_pass(); } - void SimulationState::on_event(Event& event) + auto SimulationState::on_event(Event& event) -> void { auto& engine = Application::get().get_engine(); @@ -112,7 +112,7 @@ namespace Donut } } - void SimulationState::on_im_ui_render() + auto SimulationState::on_im_ui_render() -> void { auto& engine = Application::get().get_engine(); diff --git a/src/states/simulation_state.h b/src/states/simulation_state.h index 9a89fea..625d19e 100644 --- a/src/states/simulation_state.h +++ b/src/states/simulation_state.h @@ -14,12 +14,12 @@ namespace Donut public: ~SimulationState() = default; - void on_enter() override; - void on_exit() override; - void on_update(float delta_time) override; - void on_render() override; - void on_im_ui_render() override; - void on_event(Event& event) override; + auto on_enter() -> void override; + auto on_exit() -> void override; + auto on_update(float delta_time) -> void override; + auto on_render() -> void override; + auto on_im_ui_render() -> void override; + auto on_event(Event& event) -> void override; private: bool m_initialized = false; diff --git a/src/states/world_builder_state.cpp b/src/states/world_builder_state.cpp index ab3e2b3..be74eb6 100644 --- a/src/states/world_builder_state.cpp +++ b/src/states/world_builder_state.cpp @@ -28,7 +28,7 @@ namespace Donut { - void WorldBuilderState::on_enter() + auto WorldBuilderState::on_enter() -> void { DONUT_INFO("Entering World Builder State"); @@ -78,12 +78,12 @@ namespace Donut m_initialized = true; } - void WorldBuilderState::on_exit() + auto WorldBuilderState::on_exit() -> void { DONUT_INFO("Exiting World Builder State"); } - void WorldBuilderState::on_update(float delta_time) + auto WorldBuilderState::on_update(float delta_time) -> void { if (m_camera_dragging && !ImGuizmo::IsUsing()) @@ -112,7 +112,7 @@ namespace Donut } } - void WorldBuilderState::on_render() + auto WorldBuilderState::on_render() -> void { auto& hdri_manager = HDRIManager::get(); m_hdri_environment = hdri_manager.get_current_hdri(); @@ -129,7 +129,7 @@ namespace Donut render_scene(); } - void WorldBuilderState::on_event(Event& event) + auto WorldBuilderState::on_event(Event& event) -> void { EventDispatcher dispatcher(event); @@ -309,7 +309,7 @@ namespace Donut }); } - void WorldBuilderState::on_im_ui_render() + auto WorldBuilderState::on_im_ui_render() -> void { GLFWwindow* window = static_cast<GLFWwindow*>(Application::get().get_window().get_native_window()); int width, height; @@ -376,7 +376,7 @@ namespace Donut ImGui::Spacing(); - if (ImGui::CollapsingHeader("Create Object")) + if (ImGui::CollapsingHeader("create Object")) { ImGui::TextColored(ImVec4(0.9f, 0.9f, 1.0f, 1.0f), "New Sphere"); ImGui::Separator(); @@ -403,12 +403,12 @@ namespace Donut if (m_scene.objs.size() >= 16) { ImGui::PushStyleVar(ImGuiStyleVar_Alpha, 0.5f); - ImGui::Button("Add Sphere (Limit Reached)", ImVec2(ImGui::GetWindowWidth() - 20, 30)); + ImGui::Button("add Sphere (Limit Reached)", ImVec2(ImGui::GetWindowWidth() - 20, 30)); ImGui::PopStyleVar(); } else { - if (ImGui::Button("Add Sphere", ImVec2(ImGui::GetWindowWidth() - 20, 30))) + if (ImGui::Button("add Sphere", ImVec2(ImGui::GetWindowWidth() - 20, 30))) add_sphere(); } } @@ -576,7 +576,7 @@ namespace Donut save_scene(); ImGui::SameLine(); - if (ImGui::Button("Load Scene", ImVec2(button_width, 30))) + if (ImGui::Button("load Scene", ImVec2(button_width, 30))) load_scene(); ImGui::Spacing(); @@ -643,7 +643,7 @@ namespace Donut } } - void WorldBuilderState::add_sphere() + auto WorldBuilderState::add_sphere() -> void { if (m_scene.objs.size() >= 16) { @@ -666,7 +666,7 @@ namespace Donut DONUT_INFO("Added sphere to scene and selected it"); } - void WorldBuilderState::remove_selected_object() + auto WorldBuilderState::remove_selected_object() -> void { if (m_selected_object_index >= 0 && m_selected_object_index < static_cast<int>(m_scene.objs.size())) { @@ -676,14 +676,14 @@ namespace Donut } } - void WorldBuilderState::clear_scene() + auto WorldBuilderState::clear_scene() -> void { m_scene.objs.clear(); m_selected_object_index = -1; DONUT_INFO("Cleared scene (black hole remains at center)"); } - void WorldBuilderState::save_scene() + auto WorldBuilderState::save_scene() -> void { nlohmann::json scene_data; scene_data["objects"] = nlohmann::json::array(); @@ -722,7 +722,7 @@ namespace Donut DONUT_ERROR("Failed to save scene"); } - void WorldBuilderState::load_scene() + auto WorldBuilderState::load_scene() -> void { std::ifstream file("Scene.json"); if (file.is_open()) @@ -770,7 +770,7 @@ namespace Donut DONUT_ERROR("Failed to load scene"); } - void WorldBuilderState::initialize_sphere_geometry() + auto WorldBuilderState::initialize_sphere_geometry() -> void { std::vector<float> vertices; std::vector<uint32_t> indices; @@ -837,7 +837,7 @@ namespace Donut m_sphere_vao->set_index_buffer(index_buffer); } - void WorldBuilderState::render_scene() + auto WorldBuilderState::render_scene() -> void { GLFWwindow* window = static_cast<GLFWwindow*>(Application::get().get_window().get_native_window()); int width, height; @@ -920,7 +920,7 @@ namespace Donut - void WorldBuilderState::initialize_skybox_geometry() + auto WorldBuilderState::initialize_skybox_geometry() -> void { float skybox_vertices[] = { @@ -976,7 +976,7 @@ namespace Donut m_skybox_vao->add_vertex_buffer(vertex_buffer); } - void WorldBuilderState::render_skybox() + auto WorldBuilderState::render_skybox() -> void { if (!m_skybox_shader || !m_skybox_vao || !m_hdri_environment) return; @@ -1006,7 +1006,7 @@ namespace Donut RenderCommand::enable_depth_test(); } - void WorldBuilderState::initialize_grid_geometry() + auto WorldBuilderState::initialize_grid_geometry() -> void { if (m_grid_vao) { @@ -1070,7 +1070,7 @@ namespace Donut m_grid_vao->unbind(); } - void WorldBuilderState::render_grid() + auto WorldBuilderState::render_grid() -> void { if (!m_grid_shader || !m_grid_vao) return; diff --git a/src/states/world_builder_state.h b/src/states/world_builder_state.h index 243b750..8b4678a 100644 --- a/src/states/world_builder_state.h +++ b/src/states/world_builder_state.h @@ -26,22 +26,22 @@ namespace Donut public: ~WorldBuilderState() = default; - void on_enter() override; - void on_exit() override; - void on_update(float delta_time) override; - void on_render() override; - void on_im_ui_render() override; - void on_event(Event& event) override; + auto on_enter() -> void override; + auto on_exit() -> void override; + auto on_update(float delta_time) -> void override; + auto on_render() -> void override; + auto on_im_ui_render() -> void override; + auto on_event(Event& event) -> void override; private: - void add_sphere(); - void remove_selected_object(); - void clear_scene(); - void save_scene(); - void load_scene(); - void render_scene(); - void initialize_sphere_geometry(); - void initialize_grid_geometry(); - void render_grid(); + auto add_sphere() -> void; + auto remove_selected_object() -> void; + auto clear_scene() -> void; + auto save_scene() -> void; + auto load_scene() -> void; + auto render_scene() -> void; + auto initialize_sphere_geometry() -> void; + auto initialize_grid_geometry() -> void; + auto render_grid() -> void; private: Scene m_scene; Camera m_camera; @@ -87,10 +87,10 @@ namespace Donut Object m_black_hole; bool m_black_hole_initialized = false; - void set_hdri_environment(Ref<CubemapTexture> hdri) { m_hdri_environment = hdri; } - Ref<CubemapTexture> get_hdri_environment() const { return m_hdri_environment; } + auto set_hdri_environment(Ref<CubemapTexture> hdri) -> void { m_hdri_environment = hdri; } + auto get_hdri_environment() const -> Ref<CubemapTexture> { return m_hdri_environment; } - void initialize_skybox_geometry(); - void render_skybox(); + auto initialize_skybox_geometry() -> void; + auto render_skybox() -> void; }; }; |