fish-cannard/border-wars
fish-cannard/border-wars
5
3
Fork 0
generated from tipragot/rust
Code Issues 10 Pull requests 3 Actions Packages Projects Releases Wiki Activity

Add a camera system #69

Merged
CoCo_Sol merged 15 commits from camera into main 2024-03-02 11:18:13 +00:00
Conversation 0 Commits 15 Files changed 4 +7 -7
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 2d13997750 - Show all commits

14
crates/border-wars/src/camera.rs
View file

@ -88,10 +88,10 @@ fn movement_system(
let mut target = Vec3::ZERO; let mut target = Vec3::ZERO;
for key in keys.get_pressed() { for key in keys.get_pressed() {
match *key { match *key {
v if v == keys_settings.up => target.y += movement_speed.0, value if value == keys_settings.up => target.y += movement_speed.0,
v if v == keys_settings.down => target.y -= movement_speed.0, value if value == keys_settings.down => target.y -= movement_speed.0,
v if v == keys_settings.right => target.x += movement_speed.0, value if value == keys_settings.right => target.x += movement_speed.0,
v if v == keys_settings.left => target.x -= movement_speed.0, value if value == keys_settings.left => target.x -= movement_speed.0,
_ => continue, _ => continue,
} }
} }
@ -108,13 +108,13 @@ fn scale_system(
max_scale: Res<MaximumScale>, max_scale: Res<MaximumScale>,
scale_speed: Res<CameraSpeedScale>, scale_speed: Res<CameraSpeedScale>,
) { ) {
for ev in scroll_event.read() { for event in scroll_event.read() {
for mut projection in query.iter_mut() { for mut projection in query.iter_mut() {
if ev.unit != MouseScrollUnit::Line { if event.unit != MouseScrollUnit::Line {
return; return;
} }
let future_scale = ev.y.mul_add(scale_speed.0, projection.scale); let future_scale = event.y.mul_add(scale_speed.0, projection.scale);
if min_scale.0 < future_scale && future_scale < max_scale.0 { if min_scale.0 < future_scale && future_scale < max_scale.0 {
projection.scale = future_scale; projection.scale = future_scale;
} }