hut/outfly
hut/outfly
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

enable scrolling the map with the mouse wheel

Browse source
This commit is contained in:
yuni 2024-04-19 22:54:27 +02:00
parent ed1ef1bb1f
commit 42a3577c57
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/camera.rs
View file

@ -1,5 +1,5 @@
use bevy::prelude::*; use bevy::prelude::*;
use bevy::input::mouse::MouseMotion; use bevy::input::mouse::{MouseMotion, MouseWheel};
use bevy::window::PrimaryWindow; use bevy::window::PrimaryWindow;
use bevy::core_pipeline::bloom::{BloomCompositeMode, BloomSettings}; use bevy::core_pipeline::bloom::{BloomCompositeMode, BloomSettings};
use bevy::core_pipeline::tonemapping::Tonemapping; use bevy::core_pipeline::tonemapping::Tonemapping;
@ -119,6 +119,7 @@ pub fn update_map_camera(
q_playercam: Query<&Transform, (With<actor::PlayerCamera>, Without<Camera>)>, q_playercam: Query<&Transform, (With<actor::PlayerCamera>, Without<Camera>)>,
q_target: Query<&Transform, (With<hud::IsTargeted>, Without<Camera>, Without<actor::PlayerCamera>)>, q_target: Query<&Transform, (With<hud::IsTargeted>, Without<Camera>, Without<actor::PlayerCamera>)>,
mut mouse_events: EventReader<MouseMotion>, mut mouse_events: EventReader<MouseMotion>,
mut er_mousewheel: EventReader<MouseWheel>,
keyboard_input: Res<ButtonInput<KeyCode>>, keyboard_input: Res<ButtonInput<KeyCode>>,
) { ) {
if !settings.map_active || q_camera.is_empty() || q_playercam.is_empty() { if !settings.map_active || q_camera.is_empty() || q_playercam.is_empty() {
@ -151,12 +152,17 @@ pub fn update_map_camera(
mapcam.zoom_level *= target.scale.x * factor; mapcam.zoom_level *= target.scale.x * factor;
mapcam.initialized = true; mapcam.initialized = true;
} }
let mut change_zoom = 0.0;
if keyboard_input.pressed(settings.key_map_zoom_out) { if keyboard_input.pressed(settings.key_map_zoom_out) {
mapcam.target_zoom_level = (mapcam.target_zoom_level * 1.1).min(17e18); change_zoom += 1.0;
} }
if keyboard_input.pressed(settings.key_map_zoom_in) { if keyboard_input.pressed(settings.key_map_zoom_in) {
mapcam.target_zoom_level = (mapcam.target_zoom_level / 1.1).max(target.scale.x); change_zoom -= 1.0;
} }
for wheel_event in er_mousewheel.read() {
change_zoom -= wheel_event.y * 3.0;
}
mapcam.target_zoom_level = (mapcam.target_zoom_level * 1.1f32.powf(change_zoom)).clamp(target.scale.x, 17e18);
let zoom_speed = 0.05; // should be between 0.0001 (slow) and 1.0 (instant) let zoom_speed = 0.05; // should be between 0.0001 (slow) and 1.0 (instant)
mapcam.zoom_level = zoom_speed * mapcam.target_zoom_level + (1.0 - zoom_speed) * mapcam.zoom_level; mapcam.zoom_level = zoom_speed * mapcam.target_zoom_level + (1.0 - zoom_speed) * mapcam.zoom_level;