X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fcore%2Fcontroller.rs;h=de91928e0fdf2a1a19ad2a1963789198780d3d74;hb=bb3eb700e040846ca793832da4adc133218f2954;hp=15b3a701bb103208f9faf3e8027b8376d7f00351;hpb=902b2b3136a49738de32a6b2fd1df78d18cf6048;p=kaka%2Frust-sdl-test.git diff --git a/src/core/controller.rs b/src/core/controller.rs index 15b3a70..de91928 100644 --- a/src/core/controller.rs +++ b/src/core/controller.rs @@ -1,5 +1,5 @@ -use common::Point2D; -use common::Radians; +use geometry::{Angle, Point}; +use {hashmap, point}; use sdl2::HapticSubsystem; use sdl2::JoystickSubsystem; use sdl2::event::Event; @@ -12,6 +12,7 @@ use time::{Duration, prelude::*}; #[derive(Debug, Default)] pub struct Button { + id: u8, pub time_pressed: Duration, pub time_released: Duration, pub is_pressed: bool, @@ -20,9 +21,9 @@ pub struct Button { } impl Button { - fn update(&mut self, device: &Joystick, dt: Duration, btn: u8) { + fn update(&mut self, device: &Joystick, dt: Duration) { self.was_pressed = self.is_pressed; - self.is_pressed = match device.button(btn as u32) { + self.is_pressed = match device.button(self.id as u32) { Ok(true) => { if !self.was_pressed { self.time_pressed = 0.seconds(); @@ -38,70 +39,69 @@ impl Button { self.time_released += dt; false } - Err(_) => { panic!("invalid button {}", btn) } + Err(_) => { panic!("invalid button {}", self.id) } } } } #[derive(Debug, Default)] pub struct Axis { + id: u8, pub val: f32, } impl Axis { #[allow(dead_code)] - fn update(&mut self, device: &Joystick, _dt: Duration, axis: u8) { - self.val = match device.axis(axis as u32) { + fn update(&mut self, device: &Joystick, _dt: Duration) { + self.val = match device.axis(self.id as u32) { Ok(val) => val as f32 / 32768.0, - Err(_) => panic!("invalid axis {}", axis), + Err(_) => panic!("invalid axis {}", self.id), } } } #[derive(Debug, Default)] pub struct Stick { + idx: u8, + idy: u8, pub x: f32, pub y: f32, - pub a: Radians, - pub len: f32, + pub a: Angle, } impl Stick { - fn update(&mut self, device: &Joystick, _dt: Duration, x_axis: u8, y_axis: u8) { - self.x = match device.axis(x_axis as u32) { + fn update(&mut self, device: &Joystick, _dt: Duration) { + self.x = match device.axis(self.idx as u32) { Ok(val) => val as f32 / 32768.0, - Err(_) => panic!("invalid x axis {}", x_axis), + Err(_) => panic!("invalid x axis {}", self.idx), }; - self.y = match device.axis(y_axis as u32) { + self.y = match device.axis(self.idy as u32) { Ok(val) => val as f32 / 32768.0, - Err(_) => panic!("invalid y axis {}", y_axis), + Err(_) => panic!("invalid y axis {}", self.idy), }; - self.a = Radians(self.y.atan2(self.x) as f64); - self.len = { - let x = (self.x / self.y).abs().min(1.0); - let y = (self.y / self.x).abs().min(1.0); - (self.x.powi(2) + self.y.powi(2)).sqrt() / (x.powi(2) + y.powi(2)).sqrt() - } + self.a = point!(self.x as f64, self.y as f64).to_angle(); } - #[inline(always)] #[allow(dead_code)] fn up(&self) -> bool { self.y > 0.99 } - #[inline(always)] #[allow(dead_code)] fn down(&self) -> bool { self.y < -0.99 } - #[inline(always)] #[allow(dead_code)] fn left(&self) -> bool { self.x < -0.99 } - #[inline(always)] #[allow(dead_code)] fn right(&self) -> bool { self.x > 0.99 } + #[inline(always)] #[allow(dead_code)] pub fn up(&self) -> bool { self.y < -0.99 } + #[inline(always)] #[allow(dead_code)] pub fn down(&self) -> bool { self.y > 0.99 } + #[inline(always)] #[allow(dead_code)] pub fn left(&self) -> bool { self.x < -0.99 } + #[inline(always)] #[allow(dead_code)] pub fn right(&self) -> bool { self.x > 0.99 } - pub fn to_point(&self) -> Point2D { - Point2D { - x: self.x as f64, - y: self.y as f64, - } + pub fn to_axis_point(&self) -> Point { + point!(self.x as f64, self.y as f64) } - pub fn to_adjusted_point(&self) -> Point2D { - Point2D::from(self.a) * self.len as f64 + pub fn to_point(&self) -> Point { + let p = point!(self.x as f64, self.y as f64); + if p.length() > 1.0 { + p.normalized() + } else { + p + } } } -impl From<&Stick> for Point2D { +impl From<&Stick> for Point { fn from(item: &Stick) -> Self { Self { x: item.x as f64, @@ -116,6 +116,46 @@ impl From<&Stick> for (f64, f64) { } } +#[derive(Eq, PartialEq, Hash)] +enum DeviceControls { + AxisLX, + AxisLY, + AxisRX, + AxisRY, + AxisL2, + AxisR2, + ButtonA, + ButtonB, + ButtonY, + ButtonX, + ButtonSelect, + ButtonStart, + ButtonHome, + ButtonL3, + ButtonR3, + ButtonL1, + ButtonR1, + ButtonL2, + ButtonR2, + ButtonUp, + ButtonDown, + ButtonLeft, + ButtonRight, +} +use self::DeviceControls::*; + +#[derive(Eq, PartialEq, Hash)] +enum ActionControls { + MovementX, + MovementY, + AimX, + AimY, + Jump, + Shoot, + Start, +} +use self::ActionControls::*; + //#[derive(Debug)] pub struct Controller { pub device: Joystick, @@ -130,7 +170,9 @@ pub struct Controller { impl Controller { pub fn new(device: Joystick, haptic: Option>>) -> Self { - Controller { + let action_map = get_action_mapping(); + let device_map = get_device_mapping(&device.name()); + let mut ctrl = Controller { device, haptic, mov: Default::default(), @@ -138,15 +180,27 @@ impl Controller { jump: Default::default(), start: Default::default(), shoot: Default::default(), - } + }; + ctrl.set_mapping(&action_map, &device_map); + ctrl + } + + fn set_mapping(&mut self, action: &HashMap, device: &HashMap) { + self.mov.idx = *action.get(&MovementX).map(|i| device.get(i)).flatten().unwrap(); + self.mov.idy = *action.get(&MovementY).map(|i| device.get(i)).flatten().unwrap(); + self.aim.idx = *action.get(&AimX).map(|i| device.get(i)).flatten().unwrap(); + self.aim.idy = *action.get(&AimY).map(|i| device.get(i)).flatten().unwrap(); + self.jump.id = *action.get(&Jump).map(|i| device.get(i)).flatten().unwrap(); + self.shoot.id = *action.get(&Shoot).map(|i| device.get(i)).flatten().unwrap(); + self.start.id = *action.get(&Start).map(|i| device.get(i)).flatten().unwrap(); } pub fn update(&mut self, dt: Duration) { - self.mov.update(&self.device, dt, 0, 1); // left stick - self.aim.update(&self.device, dt, 3, 4); // right stick - self.jump.update(&self.device, dt, 4); // left shoulder - self.shoot.update(&self.device, dt, 5); // right shoulder - self.start.update(&self.device, dt, 9); // start + self.mov.update(&self.device, dt); + self.aim.update(&self.device, dt); + self.jump.update(&self.device, dt); + self.shoot.update(&self.device, dt); + self.start.update(&self.device, dt); } /// strength [0 - 1] @@ -157,6 +211,49 @@ impl Controller { } } +fn get_action_mapping() -> HashMap { + hashmap!( + MovementX => AxisLX, + MovementY => AxisLY, + AimX => AxisRX, + AimY => AxisRY, + Jump => ButtonA, + Shoot => ButtonR1, + Start => ButtonStart + ) +} + +fn get_device_mapping(device_name: &str) -> HashMap { + match device_name { + "Sony PLAYSTATION(R)3 Controller" => hashmap!( + AxisLX => 0, + AxisLY => 1, + AxisRX => 3, + AxisRY => 4, + AxisL2 => 2, + AxisR2 => 5, + ButtonA => 0, + ButtonB => 1, + ButtonY => 3, + ButtonX => 2, + ButtonSelect => 8, + ButtonStart => 9, + ButtonHome => 10, + ButtonL3 => 11, + ButtonR3 => 12, + ButtonL1 => 4, + ButtonR1 => 5, + ButtonL2 => 6, + ButtonR2 => 7, + ButtonUp => 13, + ButtonDown => 14, + ButtonLeft => 15, + ButtonRight => 16 + ), + _ => panic!("No controller mapping for device '{}'", device_name) + } +} + //#[derive(Debug)] pub struct ControllerManager { pub joystick: JoystickSubsystem, @@ -190,9 +287,9 @@ impl ControllerManager { match event { Event::JoyDeviceAdded { which, .. } => { self.add_device(*which) } Event::JoyDeviceRemoved { which, .. } => { self.remove_device(*which) } - Event::JoyButtonDown { which, button_idx, .. } => { println!("device {} button {} down!", which, button_idx) } - Event::JoyButtonUp { which, button_idx, .. } => { println!("device {} button {} up!", which, button_idx) } - Event::JoyAxisMotion { which, axis_idx, .. } => { println!("device {} axis motion {}!", which, axis_idx) } + // Event::JoyButtonDown { which, button_idx, .. } => { println!("device {} button {} down!", which, button_idx) } + // Event::JoyButtonUp { which, button_idx, .. } => { println!("device {} button {} up!", which, button_idx) } + // Event::JoyAxisMotion { which, axis_idx, .. } => { println!("device {} axis motion {}!", which, axis_idx) } _ => {} } }