rebindable camera settings

This commit is contained in:
Jim 2025-08-24 14:56:42 -04:00
parent 87fcc2b817
commit 7a217acd69
Signed by: jim
GPG key ID: 3236D2F059A7C0AC
6 changed files with 102 additions and 33 deletions

2
Cargo.lock generated
View file

@ -1693,6 +1693,8 @@ version = "0.1.0"
dependencies = [ dependencies = [
"bevy", "bevy",
"input", "input",
"ron 0.10.1",
"serde",
"state", "state",
] ]

View file

@ -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,
)

View file

@ -13,14 +13,14 @@
MouseMovementY: [ MouseMovementY: [
CameraPanY, CameraPanY,
], ],
MouseButton(Middle): [
CameraOrbitEnable,
],
KeyCode(Escape): [ KeyCode(Escape): [
TogglePause, TogglePause,
], ],
MouseButton(Left): [ MouseButton(Left): [
CameraPanEnable, CameraPanEnable,
], ],
MouseButton(Middle): [
CameraOrbitEnable,
],
}, },
) )

View file

@ -5,6 +5,8 @@ edition = "2024"
[dependencies] [dependencies]
bevy = { workspace = true } bevy = { workspace = true }
serde = { workspace = true }
ron = { workspace = true }
input = { path = "../input" } input = { path = "../input" }
state = { path = "../state" } state = { path = "../state" }

View file

@ -2,15 +2,20 @@
#![allow(clippy::type_complexity)] #![allow(clippy::type_complexity)]
#![allow(clippy::too_many_arguments)] #![allow(clippy::too_many_arguments)]
use std::fs;
use bevy::prelude::*; use bevy::prelude::*;
use input::{Inputs, actions::InputAction, conditions::action_pressed}; use input::{Inputs, actions::InputAction, conditions::action_pressed};
use serde::{Deserialize, Serialize};
use state::GameSystemSet; use state::GameSystemSet;
pub struct CameraPlugin; pub struct CameraPlugin;
impl Plugin for CameraPlugin { impl Plugin for CameraPlugin {
fn build(&self, app: &mut App) { fn build(&self, app: &mut App) {
app.init_resource::<CameraState>().add_systems( app.add_systems(Startup, setup)
.add_systems(Update, save)
.add_systems(
Update, Update,
( (
orbit.run_if(action_pressed::<Update>(InputAction::CameraOrbitEnable)), orbit.run_if(action_pressed::<Update>(InputAction::CameraOrbitEnable)),
@ -24,16 +29,25 @@ impl Plugin for CameraPlugin {
} }
} }
#[derive(Component, Default)] #[derive(Component)]
pub struct ControlledCamera { pub struct ControlledCamera {
pub target: Vec3, pub target: Vec3,
pub distance: f32,
} }
#[derive(Debug, Resource)] impl Default for ControlledCamera {
struct CameraState { fn default() -> Self {
Self {
target: Default::default(),
distance: 20.0,
}
}
}
#[derive(Debug, Resource, Serialize, Deserialize)]
struct CameraSettings {
zoom_speed: f32, zoom_speed: f32,
zoom_distance_mult: f32, zoom_distance_mult: f32,
distance: f32,
min_distance: f32, min_distance: f32,
max_distance: f32, max_distance: f32,
yaw_speed: f32, yaw_speed: f32,
@ -41,10 +55,23 @@ struct CameraState {
pan_zoom_mult: f32, 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<Self> {
let content = fs::read_to_string(path)?;
let input_map = ron::from_str(&content)?;
Ok(input_map)
}
}
impl Default for CameraSettings {
fn default() -> Self { fn default() -> Self {
Self { Self {
distance: 20.0,
min_distance: 1.0, min_distance: 1.0,
max_distance: 100.0, max_distance: 100.0,
zoom_speed: 1., zoom_speed: 1.,
@ -56,22 +83,26 @@ impl Default for CameraState {
} }
} }
fn update_camera(query: Single<(&mut Transform, &ControlledCamera)>, state: ResMut<CameraState>) { fn update_camera(query: Single<(&mut Transform, &ControlledCamera)>) {
let (mut camera, ControlledCamera { target }) = query.into_inner(); 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<Inputs<Update>>, mut state: ResMut<CameraState>) { fn zoom(
inputs: Res<Inputs<Update>>,
state: Res<CameraSettings>,
mut camera: Single<&mut ControlledCamera>,
) {
let input = -inputs.get(InputAction::CameraZoom); let input = -inputs.get(InputAction::CameraZoom);
let delta_zoom = input * state.zoom_speed let delta_zoom = input * state.zoom_speed
+ input * state.zoom_speed * state.zoom_distance_mult * state.distance; + input * state.zoom_speed * state.zoom_distance_mult * camera.distance;
state.distance = (state.distance + delta_zoom).clamp(state.min_distance, state.max_distance); camera.distance = (camera.distance + delta_zoom).clamp(state.min_distance, state.max_distance);
} }
fn orbit( fn orbit(
mut camera: Single<&mut Transform, With<ControlledCamera>>, mut camera: Single<&mut Transform, With<ControlledCamera>>,
camera_settings: Res<CameraState>, camera_settings: Res<CameraSettings>,
inputs: Res<Inputs<Update>>, inputs: Res<Inputs<Update>>,
) { ) {
let delta_yaw = -inputs.get(InputAction::CameraYaw) * camera_settings.yaw_speed; let delta_yaw = -inputs.get(InputAction::CameraYaw) * camera_settings.yaw_speed;
@ -84,17 +115,16 @@ fn orbit(
fn pan( fn pan(
inputs: Res<Inputs<Update>>, inputs: Res<Inputs<Update>>,
state: Res<CameraState>, state: Res<CameraSettings>,
query: Single<(&Transform, &mut ControlledCamera)>, 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( let delta = Vec2::new(
inputs.get(InputAction::CameraPanX), inputs.get(InputAction::CameraPanX),
inputs.get(InputAction::CameraPanY), 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 projected_left = Vec3::new(tf.left().x, 0.0, tf.left().z).normalize();
let vx = projected_left * delta.x; let vx = projected_left * delta.x;
let projected_forward = Vec3::new(tf.forward().x, 0.0, tf.forward().z).normalize(); 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; camera.target += (vx + vy) * pan_speed;
} }
const INPUT_MAP_PATH: &'static str = "assets/settings/camera.ron";
fn save(settings: Res<CameraSettings>) {
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);
}

View file

@ -62,8 +62,8 @@ impl InputMap {
} }
fn save_to_file(&self, path: &str) -> Result<()> { fn save_to_file(&self, path: &str) -> Result<()> {
let json = ron::ser::to_string_pretty(self, PrettyConfig::default())?; let ron = ron::ser::to_string_pretty(self, PrettyConfig::default())?;
fs::write(path, json)?; fs::write(path, ron)?;
Ok(()) Ok(())
} }