From 7a217acd693c2eaef2c533b17c84c1af2723d22d Mon Sep 17 00:00:00 2001 From: Jim Date: Sun, 24 Aug 2025 14:56:42 -0400 Subject: [PATCH] rebindable camera settings --- Cargo.lock | 2 + assets/settings/camera.ron | 9 +++ assets/settings/input_map.ron | 6 +- crates/camera/Cargo.toml | 2 + crates/camera/src/lib.rs | 112 +++++++++++++++++++++++++--------- crates/input/src/lib.rs | 4 +- 6 files changed, 102 insertions(+), 33 deletions(-) create mode 100644 assets/settings/camera.ron diff --git a/Cargo.lock b/Cargo.lock index 23fa29d..0a43d59 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1693,6 +1693,8 @@ version = "0.1.0" dependencies = [ "bevy", "input", + "ron 0.10.1", + "serde", "state", ] diff --git a/assets/settings/camera.ron b/assets/settings/camera.ron new file mode 100644 index 0000000..5610f91 --- /dev/null +++ b/assets/settings/camera.ron @@ -0,0 +1,9 @@ +( + zoom_speed: 1.0, + zoom_distance_mult: 0.1, + min_distance: 1.0, + max_distance: 100.0, + yaw_speed: 0.004, + pan_speed: 0.01, + pan_zoom_mult: 0.1, +) diff --git a/assets/settings/input_map.ron b/assets/settings/input_map.ron index 2c24da8..635e99b 100644 --- a/assets/settings/input_map.ron +++ b/assets/settings/input_map.ron @@ -13,14 +13,14 @@ MouseMovementY: [ CameraPanY, ], + MouseButton(Middle): [ + CameraOrbitEnable, + ], KeyCode(Escape): [ TogglePause, ], MouseButton(Left): [ CameraPanEnable, ], - MouseButton(Middle): [ - CameraOrbitEnable, - ], }, ) \ No newline at end of file diff --git a/crates/camera/Cargo.toml b/crates/camera/Cargo.toml index 10e61cd..b676d2d 100644 --- a/crates/camera/Cargo.toml +++ b/crates/camera/Cargo.toml @@ -5,6 +5,8 @@ edition = "2024" [dependencies] bevy = { workspace = true } +serde = { workspace = true } +ron = { workspace = true } input = { path = "../input" } state = { path = "../state" } diff --git a/crates/camera/src/lib.rs b/crates/camera/src/lib.rs index f5a6b90..78a40b3 100644 --- a/crates/camera/src/lib.rs +++ b/crates/camera/src/lib.rs @@ -2,38 +2,52 @@ #![allow(clippy::type_complexity)] #![allow(clippy::too_many_arguments)] +use std::fs; + use bevy::prelude::*; use input::{Inputs, actions::InputAction, conditions::action_pressed}; +use serde::{Deserialize, Serialize}; use state::GameSystemSet; pub struct CameraPlugin; impl Plugin for CameraPlugin { fn build(&self, app: &mut App) { - app.init_resource::().add_systems( - Update, - ( - orbit.run_if(action_pressed::(InputAction::CameraOrbitEnable)), - zoom, - pan.run_if(action_pressed::(InputAction::CameraPanEnable)), - update_camera, - ) - .in_set(GameSystemSet::Update) - .chain(), - ); + app.add_systems(Startup, setup) + .add_systems(Update, save) + .add_systems( + Update, + ( + orbit.run_if(action_pressed::(InputAction::CameraOrbitEnable)), + zoom, + pan.run_if(action_pressed::(InputAction::CameraPanEnable)), + update_camera, + ) + .in_set(GameSystemSet::Update) + .chain(), + ); } } -#[derive(Component, Default)] +#[derive(Component)] pub struct ControlledCamera { pub target: Vec3, + pub distance: f32, } -#[derive(Debug, Resource)] -struct CameraState { +impl Default for ControlledCamera { + fn default() -> Self { + Self { + target: Default::default(), + distance: 20.0, + } + } +} + +#[derive(Debug, Resource, Serialize, Deserialize)] +struct CameraSettings { zoom_speed: f32, zoom_distance_mult: f32, - distance: f32, min_distance: f32, max_distance: f32, yaw_speed: f32, @@ -41,10 +55,23 @@ struct CameraState { pan_zoom_mult: f32, } -impl Default for CameraState { +impl CameraSettings { + fn save_to_file(&self, path: &str) -> Result<()> { + let ron = ron::ser::to_string_pretty(self, ron::ser::PrettyConfig::default())?; + fs::write(path, ron)?; + Ok(()) + } + + fn load_from_file(path: &str) -> Result { + let content = fs::read_to_string(path)?; + let input_map = ron::from_str(&content)?; + Ok(input_map) + } +} + +impl Default for CameraSettings { fn default() -> Self { Self { - distance: 20.0, min_distance: 1.0, max_distance: 100.0, zoom_speed: 1., @@ -56,22 +83,26 @@ impl Default for CameraState { } } -fn update_camera(query: Single<(&mut Transform, &ControlledCamera)>, state: ResMut) { - let (mut camera, ControlledCamera { target }) = query.into_inner(); +fn update_camera(query: Single<(&mut Transform, &ControlledCamera)>) { + let (mut camera, ControlledCamera { target, distance }) = query.into_inner(); - camera.translation = *target - camera.forward().as_vec3() * state.distance; + camera.translation = *target - camera.forward().as_vec3() * distance; } -fn zoom(inputs: Res>, mut state: ResMut) { +fn zoom( + inputs: Res>, + state: Res, + mut camera: Single<&mut ControlledCamera>, +) { let input = -inputs.get(InputAction::CameraZoom); let delta_zoom = input * state.zoom_speed - + input * state.zoom_speed * state.zoom_distance_mult * state.distance; - state.distance = (state.distance + delta_zoom).clamp(state.min_distance, state.max_distance); + + input * state.zoom_speed * state.zoom_distance_mult * camera.distance; + camera.distance = (camera.distance + delta_zoom).clamp(state.min_distance, state.max_distance); } fn orbit( mut camera: Single<&mut Transform, With>, - camera_settings: Res, + camera_settings: Res, inputs: Res>, ) { let delta_yaw = -inputs.get(InputAction::CameraYaw) * camera_settings.yaw_speed; @@ -84,17 +115,16 @@ fn orbit( fn pan( inputs: Res>, - state: Res, + state: Res, query: Single<(&Transform, &mut ControlledCamera)>, ) { - let pan_speed = state.pan_speed + state.pan_speed * state.pan_zoom_mult * state.distance; + let (tf, mut camera) = query.into_inner(); + let pan_speed = state.pan_speed + state.pan_speed * state.pan_zoom_mult * camera.distance; let delta = Vec2::new( inputs.get(InputAction::CameraPanX), inputs.get(InputAction::CameraPanY), ); - let (tf, mut camera) = query.into_inner(); - let projected_left = Vec3::new(tf.left().x, 0.0, tf.left().z).normalize(); let vx = projected_left * delta.x; let projected_forward = Vec3::new(tf.forward().x, 0.0, tf.forward().z).normalize(); @@ -102,3 +132,29 @@ fn pan( camera.target += (vx + vy) * pan_speed; } + +const INPUT_MAP_PATH: &'static str = "assets/settings/camera.ron"; + +fn save(settings: Res) { + if settings.is_changed() { + if let Err(e) = settings.save_to_file(INPUT_MAP_PATH) { + error!("Failed to save camera settings: {}", e); + } else { + info!("Camera settings saved successfully"); + } + } +} + +fn setup(mut commands: Commands) { + let settings = match CameraSettings::load_from_file(INPUT_MAP_PATH) { + Ok(settings) => { + info!("Loaded camera settings"); + settings + } + Err(e) => { + error!("Failed to load camera settings: {}", e); + default() + } + }; + commands.insert_resource(settings); +} diff --git a/crates/input/src/lib.rs b/crates/input/src/lib.rs index 1e48d18..9ccf5bc 100644 --- a/crates/input/src/lib.rs +++ b/crates/input/src/lib.rs @@ -62,8 +62,8 @@ impl InputMap { } fn save_to_file(&self, path: &str) -> Result<()> { - let json = ron::ser::to_string_pretty(self, PrettyConfig::default())?; - fs::write(path, json)?; + let ron = ron::ser::to_string_pretty(self, PrettyConfig::default())?; + fs::write(path, ron)?; Ok(()) }