Starting to work

src/programs/viewer.rs

@@ -12,14 +12,17 @@ use glium::glutin::Event;
 use glium::glutin::WindowEvent;
 use glium::glutin::VirtualKeyCode;
 
+
+use model_converter::math::vector::Vector3;
 use model_converter::parser::{parse, parse_into_model};
 use model_converter::renderer::Renderer;
-use model_converter::renderer::camera::RotatingCamera;
+use model_converter::renderer::controls::OrbitControls;
+use model_converter::renderer::camera::Camera;
 
 fn main() {
 
-    let mut model = parse("./assets/models/toonlink/link.mtl").unwrap();
-    parse_into_model("./assets/models/toonlink/link.obj", &mut model).unwrap();
+    let mut model = parse("./assets/models/cube/cube.mtl").unwrap();
+    parse_into_model("./assets/models/cube/cube.obj", &mut model).unwrap();
 
     let mut events_loop = EventsLoop::new();
     let window = WindowBuilder::new();
@@ -31,18 +34,21 @@ fn main() {
     let mut renderer = Renderer::new(display);
     renderer.add_model(&model);
 
-    let mut camera = RotatingCamera::new(50.0);
+    let mut camera = Camera::new(
+        Vector3::new( 0.0, 0.0, 0.0),
+        Vector3::new( 0.0, 0.0, 0.0),
+        Vector3::new( 0.0, 1.0, 0.0),
+    );
+
+    let mut controls = OrbitControls::new(&mut camera);
 
     while !closed {
 
-        camera.increase_theta(0.025);
-
-        let mut target = renderer.draw();
-        renderer.render(&camera, &mut target);
-
-        target.finish().unwrap();
-
         events_loop.poll_events(|ev| {
+
+            use model_converter::renderer::controls::Controls;
+            controls.manage_event(&ev, &mut camera);
+
             match ev {
                 // Close window
                 Event::WindowEvent {
@@ -61,5 +67,11 @@ fn main() {
                 _ => (),
             }
         });
+
+
+        let mut target = renderer.draw();
+        renderer.render(&camera, &mut target);
+        target.finish().unwrap();
+
     }
 }