projects
/
mandelwow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update to rust-rocket 0.7.2
[mandelwow.git]
/
support
/
camera.rs
diff --git
a/support/camera.rs
b/support/camera.rs
index 69e3bb5388447df98326398edabd3d01f13833e0..25b1e7292b9fb54b92c0bcdb775e052e9f437074 100644
(file)
--- a/
support/camera.rs
+++ b/
support/camera.rs
@@
-1,13
+1,11
@@
-extern crate glutin;
-
use cgmath::{Matrix4, Vector4};
use cgmath::conv::array4x4;
use cgmath::{Matrix4, Vector4};
use cgmath::conv::array4x4;
-use gl
utin::WindowEvent::{KeyboardInput, MouseMoved}
;
-use gl
utin::VirtualKeyCode
;
+use gl
ium
;
+use gl
ium::glutin::event::{ ElementState, VirtualKeyCode, WindowEvent }
;
use std::f32;
use std::f32::consts::PI;
use std::f32;
use std::f32::consts::PI;
-use support::vec3::Vec3;
-use support::vec3::norm;
+use
crate::
support::vec3::Vec3;
+use
crate::
support::vec3::norm;
#[derive(Default)]
pub struct CameraState {
#[derive(Default)]
pub struct CameraState {
@@
-165,10
+163,11
@@
impl CameraState {
//println!("camera_dir = {:?}", self.dir);
}
//println!("camera_dir = {:?}", self.dir);
}
- pub fn process_input(&mut self, event: &glutin::WindowEvent) {
+ pub fn process_input(&mut self, event: &WindowEvent) {
+ //println!("camera event={:?}", event);
match event {
match event {
-
&MouseMoved { position: (x, y)
, .. } => {
- let (x, y) = (
x as i32,
y as i32);
+
WindowEvent::CursorMoved { position
, .. } => {
+ let (x, y) = (
position.x as i32, position.
y as i32);
if self.mouse_x == -1 {
// Set initial absolute position.
self.mouse_x = x;
if self.mouse_x == -1 {
// Set initial absolute position.
self.mouse_x = x;
@@
-179,8
+178,8
@@
impl CameraState {
self.mouse_x = x;
self.mouse_y = y;
}
self.mouse_x = x;
self.mouse_y = y;
}
-
&
KeyboardInput { input, .. } => {
- let pressed = input.state ==
glutin::
ElementState::Pressed;
+
WindowEvent::
KeyboardInput { input, .. } => {
+ let pressed = input.state == ElementState::Pressed;
let key = match input.virtual_keycode {
Some(key) => key,
None => return,
let key = match input.virtual_keycode {
Some(key) => key,
None => return,