Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated mouse wheel zooming to use WindowEvent

Browse Source 
Former-commit-id: fabe382516fd65eb76043b7d6ada87cf20f53590
This commit is contained in:
Yeedo
2019-02-02 20:18:40 +00:00
parent 7be8337aac
commit 63c945b598
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
voxygen/src/scene/mod.rs
View File

@ -128,7 +128,7 @@ impl Scene {
}, },
// Zoom the camera when a zoom event occurs // Zoom the camera when a zoom event occurs
Event::Zoom(delta) => { Event::Zoom(delta) => {
self.camera.zoom_by(delta); self.camera.zoom_by(-delta);
true true
}, },
// All other events are unhandled // All other events are unhandled

8
voxygen/src/window.rs
View File

@ -92,15 +92,15 @@ impl Window {
}), }),
_ => {}, _ => {},
}, },
glutin::WindowEvent::MouseWheel {
delta: glutin::MouseScrollDelta::LineDelta(_x, y),
..
} => events.push(Event::Zoom(y as f32)),
_ => {}, _ => {},
}, },
glutin::Event::DeviceEvent { event, .. } => match event { glutin::Event::DeviceEvent { event, .. } => match event {
glutin::DeviceEvent::MouseMotion { delta: (dx, dy), .. } if cursor_grabbed => glutin::DeviceEvent::MouseMotion { delta: (dx, dy), .. } if cursor_grabbed =>
events.push(Event::CursorPan(Vec2::new(dx as f32, dy as f32))), events.push(Event::CursorPan(Vec2::new(dx as f32, dy as f32))),
glutin::DeviceEvent::MouseWheel {
delta: glutin::MouseScrollDelta::LineDelta(_x, y),
..
} if cursor_grabbed => events.push(Event::Zoom(y as f32)),
_ => {}, _ => {},
}, },
_ => {}, _ => {},