improve graphics and add camera controls

This commit is contained in:
Jim 2025-08-24 14:46:57 -04:00
parent 82a0fbdb50
commit 87fcc2b817
Signed by: jim
GPG key ID: 3236D2F059A7C0AC
12 changed files with 367 additions and 93 deletions

104
crates/camera/src/lib.rs Normal file
View file

@ -0,0 +1,104 @@
//bevy system signatures often violate these rules
#![allow(clippy::type_complexity)]
#![allow(clippy::too_many_arguments)]
use bevy::prelude::*;
use input::{Inputs, actions::InputAction, conditions::action_pressed};
use state::GameSystemSet;
pub struct CameraPlugin;
impl Plugin for CameraPlugin {
fn build(&self, app: &mut App) {
app.init_resource::<CameraState>().add_systems(
Update,
(
orbit.run_if(action_pressed::<Update>(InputAction::CameraOrbitEnable)),
zoom,
pan.run_if(action_pressed::<Update>(InputAction::CameraPanEnable)),
update_camera,
)
.in_set(GameSystemSet::Update)
.chain(),
);
}
}
#[derive(Component, Default)]
pub struct ControlledCamera {
pub target: Vec3,
}
#[derive(Debug, Resource)]
struct CameraState {
zoom_speed: f32,
zoom_distance_mult: f32,
distance: f32,
min_distance: f32,
max_distance: f32,
yaw_speed: f32,
pan_speed: f32,
pan_zoom_mult: f32,
}
impl Default for CameraState {
fn default() -> Self {
Self {
distance: 20.0,
min_distance: 1.0,
max_distance: 100.0,
zoom_speed: 1.,
zoom_distance_mult: 0.1,
yaw_speed: 0.004,
pan_speed: 0.01,
pan_zoom_mult: 0.1,
}
}
}
fn update_camera(query: Single<(&mut Transform, &ControlledCamera)>, state: ResMut<CameraState>) {
let (mut camera, ControlledCamera { target }) = query.into_inner();
camera.translation = *target - camera.forward().as_vec3() * state.distance;
}
fn zoom(inputs: Res<Inputs<Update>>, mut state: ResMut<CameraState>) {
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);
}
fn orbit(
mut camera: Single<&mut Transform, With<ControlledCamera>>,
camera_settings: Res<CameraState>,
inputs: Res<Inputs<Update>>,
) {
let delta_yaw = -inputs.get(InputAction::CameraYaw) * camera_settings.yaw_speed;
let (yaw, pitch, roll) = camera.rotation.to_euler(EulerRot::YXZ);
let yaw = yaw + delta_yaw;
camera.rotation = Quat::from_euler(EulerRot::YXZ, yaw, pitch, roll);
}
fn pan(
inputs: Res<Inputs<Update>>,
state: Res<CameraState>,
query: Single<(&Transform, &mut ControlledCamera)>,
) {
let pan_speed = state.pan_speed + state.pan_speed * state.pan_zoom_mult * state.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();
let vy = projected_forward * delta.y;
camera.target += (vx + vy) * pan_speed;
}