From 0af3b41293ef5663cb8752feaff53ae6fed347c5 Mon Sep 17 00:00:00 2001 From: reo Date: Wed, 29 Oct 2025 21:35:55 +0300 Subject: [PATCH] Move debug_camera to the game crate, activate FPSDebugCameraSystem --- engine/src/systems/mod.rs | 1 - game/src/main.rs | 3 ++- .../fps_camera.rs => game/src/systems/debug_camera.rs | 8 ++++---- game/src/systems/mod.rs | 1 + 4 files changed, 7 insertions(+), 6 deletions(-) rename engine/src/systems/fps_camera.rs => game/src/systems/debug_camera.rs (96%) diff --git a/engine/src/systems/mod.rs b/engine/src/systems/mod.rs index 8489571..e69de29 100644 --- a/engine/src/systems/mod.rs +++ b/engine/src/systems/mod.rs @@ -1 +0,0 @@ -pub mod fps_camera; diff --git a/game/src/main.rs b/game/src/main.rs index a5a3d9c..99eb0e2 100644 --- a/game/src/main.rs +++ b/game/src/main.rs @@ -17,7 +17,7 @@ use winit::event::{ElementState, Event, WindowEvent}; use winit::event::DeviceEvent::MouseMotion; use winit::keyboard::{KeyCode, PhysicalKey}; use raidillon_core::DebugUIBuffer; -use raidillon_engine::systems::fps_camera::FPSDebugCameraSystem; +use systems::debug_camera::FPSDebugCameraSystem; use raidillon_glium::RenderingSystem; use raidillon_physics::Physics; use crate::systems::{KeybindsSystem, KinematicCharacterController, PhysicsSystem}; @@ -123,6 +123,7 @@ fn main() { engine.system_manager.add::(); engine.system_manager.add::(); engine.system_manager.add::(); + engine.system_manager.add::(); engine.system_manager.add::(); engine.system_manager.add::(); // engine.system_manager.add::(); diff --git a/engine/src/systems/fps_camera.rs b/game/src/systems/debug_camera.rs similarity index 96% rename from engine/src/systems/fps_camera.rs rename to game/src/systems/debug_camera.rs index 5ff9cc7..13cb971 100644 --- a/engine/src/systems/fps_camera.rs +++ b/game/src/systems/debug_camera.rs @@ -1,4 +1,4 @@ -use crate::system::{System, SystemContext}; +use raidillon_engine::system::{System, SystemContext}; use glam::{Quat, Vec3}; use winit::event::DeviceEvent::MouseMotion; use winit::event::{ElementState, Event, MouseButton, WindowEvent}; @@ -6,8 +6,8 @@ use winit::keyboard::{KeyCode, PhysicalKey}; use winit::window::CursorGrabMode; use raidillon_assets::model_path; use raidillon_platform::{Camera, PlatformContext}; -use crate::input::InputState; -use crate::resources::EngineResources; +use raidillon_engine::InputState; +use raidillon_engine::EngineResources; use raidillon_core::scene::Scene; use raidillon_ecs::components::CameraMode; @@ -29,7 +29,7 @@ impl Default for FPSDebugCameraSystem { position: Vec3::new(0.0, 0.0, 2.0), yaw: -90.0, pitch: 0.0, - speed: 3.0, + speed: 8.0, sensitivity: 0.1, } } diff --git a/game/src/systems/mod.rs b/game/src/systems/mod.rs index f975aff..2a387b1 100644 --- a/game/src/systems/mod.rs +++ b/game/src/systems/mod.rs @@ -1,6 +1,7 @@ mod physics; mod kinematic_character_controller; mod keybinds; +pub mod debug_camera; pub use physics::PhysicsSystem; pub use kinematic_character_controller::KinematicCharacterController;