Fleshed out the controller

[kaka/rust-sdl-test.git] / src / core / app.rs

diff --git a/src/core/app.rs b/src/core/app.rs
index 62d7507..ddfe3d9 100644 (file)
--- a/src/core/app.rs
+++ b/src/core/app.rs
@@ -72,15 +72,13 @@ impl AppBuilder {
         let event_pump = context.event_pump()?;
         let sprites = SpriteManager::new(canvas.texture_creator());
        let screen = canvas.output_size().unwrap();
-       let ctrl = context.game_controller()?;
-       ctrl.set_event_state(true);
 
         Ok(App {
             canvas,
             event_pump,
             sprites,
             state: self.state.unwrap_or_else(|| Box::new(ActiveState::new(screen))),
-           ctrl_man: ControllerManager::new(ctrl, context.haptic()?),
+           ctrl_man: ControllerManager::new(context.joystick()?, context.haptic()?),
         })
     }
 
@@ -160,6 +158,7 @@ impl App {
             let duration =
                 last_time.to(PreciseTime::now()).num_nanoseconds().unwrap() as Nanoseconds;
             last_time = PreciseTime::now();
+           self.ctrl_man.update(duration);
             self.state.update(duration);
 
            self.render();