X-Git-Url: https://codewiz.org/gitweb?p=mandelwow.git;a=blobdiff_plain;f=support%2Fcamera.rs;h=25b1e7292b9fb54b92c0bcdb775e052e9f437074;hp=5ae1c8c762be67db17a0d3bfa880f21c9c05a33e;hb=HEAD;hpb=a885862cc3b66323bd8d3c449e2a4f913082a973 diff --git a/support/camera.rs b/support/camera.rs index 5ae1c8c..25b1e72 100644 --- a/support/camera.rs +++ b/support/camera.rs @@ -1,7 +1,7 @@ use cgmath::{Matrix4, Vector4}; use cgmath::conv::array4x4; use glium; -use glium::glutin::VirtualKeyCode; +use glium::glutin::event::{ ElementState, VirtualKeyCode, WindowEvent }; use std::f32; use std::f32::consts::PI; use crate::support::vec3::Vec3; @@ -163,9 +163,10 @@ impl CameraState { //println!("camera_dir = {:?}", self.dir); } - pub fn process_input(&mut self, event: &glium::glutin::WindowEvent) { + pub fn process_input(&mut self, event: &WindowEvent) { + //println!("camera event={:?}", event); match event { - &glium::glutin::WindowEvent::CursorMoved { position, .. } => { + WindowEvent::CursorMoved { position, .. } => { let (x, y) = (position.x as i32, position.y as i32); if self.mouse_x == -1 { // Set initial absolute position. @@ -177,8 +178,8 @@ impl CameraState { self.mouse_x = x; self.mouse_y = y; } - &glium::glutin::WindowEvent::KeyboardInput { input, .. } => { - let pressed = input.state == glium::glutin::ElementState::Pressed; + WindowEvent::KeyboardInput { input, .. } => { + let pressed = input.state == ElementState::Pressed; let key = match input.virtual_keycode { Some(key) => key, None => return,