From c80392e402fc18094b563b0061dfb69274ae4f0b Mon Sep 17 00:00:00 2001 From: hachem Date: Sun, 23 Aug 2026 21:39:17 +0200 Subject: feat: scene module --- src/rendering/black_hole_renderer.h | 2 +- src/rendering/renderer_backend.h | 24 -------------- src/rendering/scene_renderer.h | 2 +- src/scene/scene.cpp | 62 +++++++++++++++++++++++++++++++++++++ src/scene/scene.h | 30 ++++++++++++++++++ src/scene/scene_types.h | 24 ++++++++++++++ 6 files changed, 118 insertions(+), 26 deletions(-) delete mode 100644 src/rendering/renderer_backend.h create mode 100644 src/scene/scene.cpp create mode 100644 src/scene/scene.h create mode 100644 src/scene/scene_types.h (limited to 'src') diff --git a/src/rendering/black_hole_renderer.h b/src/rendering/black_hole_renderer.h index 563fa9b..b68a791 100644 --- a/src/rendering/black_hole_renderer.h +++ b/src/rendering/black_hole_renderer.h @@ -1,7 +1,7 @@ #pragma once #include "rhi.h" -#include "renderer_backend.h" +#include "scene/scene_types.h" #include namespace Donut diff --git a/src/rendering/renderer_backend.h b/src/rendering/renderer_backend.h deleted file mode 100644 index d64a46b..0000000 --- a/src/rendering/renderer_backend.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include - -namespace Donut -{ - struct SceneObject - { - glm::vec3 position = { 0.0f, 2.0f, 0.0f }; - float radius = 2.0f; - glm::vec3 color = { 0.85f, 0.35f, 0.2f }; - }; - - struct BlackHoleParams - { - float disk_inner_rs = 3.0f; - float disk_outer_rs = 12.0f; - float temperature = 4800.0f; - float brightness = 0.9f; - float turbulence = 0.4f; - int quality_steps = 15000; - float fov_degrees = 60.0f; - }; -} diff --git a/src/rendering/scene_renderer.h b/src/rendering/scene_renderer.h index 1f16afc..06d9d49 100644 --- a/src/rendering/scene_renderer.h +++ b/src/rendering/scene_renderer.h @@ -1,7 +1,7 @@ #pragma once #include "rhi.h" -#include "renderer_backend.h" +#include "scene/scene_types.h" #include #include diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp new file mode 100644 index 0000000..43716ca --- /dev/null +++ b/src/scene/scene.cpp @@ -0,0 +1,62 @@ +#include "scene.h" + +#include +#include +#include +#include +#include + +namespace Donut +{ + Scene::Scene() + { + sim_camera.set_camera_mode(CameraMode::Orbital); + sim_camera.set_orbital_target(glm::vec3(0.0f)); + sim_camera.set_orbital_radius(4e11); + sim_camera.set_orbital_limits(2.2e11, 1.5e12); + sim_camera.set_orbital_speed(0.01f); + sim_camera.set_zoom_speed(3e10); + sim_camera.set_azimuth(0.0f); + sim_camera.set_elevation(1.25f); + + scene_camera.set_camera_mode(CameraMode::Orbital); + scene_camera.set_orbital_target(glm::vec3(0.0f)); + scene_camera.set_orbital_radius(15.0); + scene_camera.set_orbital_limits(2.0, 200.0); + scene_camera.set_orbital_speed(0.01f); + scene_camera.set_zoom_speed(2.0); + scene_camera.set_azimuth(0.0f); + scene_camera.set_elevation((float)std::numbers::pi / 3.0f); + scene_camera.update_orbital(); + } + + auto Scene::reset_sim_camera() -> void + { + sim_camera.set_camera_mode(CameraMode::Orbital); + sim_camera.set_orbital_radius(4e11); + sim_camera.set_azimuth(0.0f); + sim_camera.set_elevation(1.25f); + } + + auto Scene::set_free_fly(bool enabled) -> void + { + const bool is_fps = sim_camera.get_camera_mode() == CameraMode::FPS; + if (enabled == is_fps) return; + if (enabled) + { + glm::vec3 pos = sim_camera.get_orbital_position(); + glm::vec3 fwd = glm::normalize(sim_camera.get_orbital_target() - pos); + float pitch = glm::degrees(asin(glm::clamp(fwd.y, -1.0f, 1.0f))); + float yaw = glm::degrees(atan2(fwd.z, fwd.x)); + sim_camera.set_camera_mode(CameraMode::FPS); + sim_camera.set_movement_speed(2.0e10f); + sim_camera.set_mouse_sensitivity(0.15f); + sim_camera.set_position(pos); + sim_camera.set_rotation(glm::vec3(pitch, yaw, 0.0f)); + } + else + { + sim_camera.set_camera_mode(CameraMode::Orbital); + } + } +} diff --git a/src/scene/scene.h b/src/scene/scene.h new file mode 100644 index 0000000..9f633c9 --- /dev/null +++ b/src/scene/scene.h @@ -0,0 +1,30 @@ +#pragma once + +#include "scene_types.h" +#include "core/camera.h" + +#include +#include + +namespace Donut +{ + class Scene + { + public: + Scene(); + + std::vector objects{ SceneObject{} }; + int selected_object = 0; + + BlackHoleParams black_hole; + + std::string hdri_path = "assets/hdri/hdr_blue_nebulae_1.hdr"; + + Camera sim_camera{ 60.0f, 16.0f / 9.0f, 0.1f, 100.0f }; + Camera scene_camera{ 45.0f, 16.0f / 9.0f, 0.1f, 1000.0f }; + + auto reset_sim_camera() -> void; + auto set_free_fly(bool enabled) -> void; + auto is_free_fly() const -> bool { return sim_camera.get_camera_mode() == CameraMode::FPS; } + }; +} diff --git a/src/scene/scene_types.h b/src/scene/scene_types.h new file mode 100644 index 0000000..d64a46b --- /dev/null +++ b/src/scene/scene_types.h @@ -0,0 +1,24 @@ +#pragma once + +#include + +namespace Donut +{ + struct SceneObject + { + glm::vec3 position = { 0.0f, 2.0f, 0.0f }; + float radius = 2.0f; + glm::vec3 color = { 0.85f, 0.35f, 0.2f }; + }; + + struct BlackHoleParams + { + float disk_inner_rs = 3.0f; + float disk_outer_rs = 12.0f; + float temperature = 4800.0f; + float brightness = 0.9f; + float turbulence = 0.4f; + int quality_steps = 15000; + float fov_degrees = 60.0f; + }; +} -- cgit v1.3