Sample joystick as dpad

Author: Grarak

src/main.rs

@@ -493,7 +493,7 @@ pub fn actual_main() {
         let mut screen_layout = emu_unsafe.get_mut().settings.screen_layout();
         let arm7_emu = emu_unsafe.get_mut().settings.arm7_emu();
         loop {
-            let pause = match presenter.poll_event() {
+            let pause = match presenter.poll_event(&emu_unsafe.get_mut().settings) {
                 PresentEvent::Inputs { mut keymap, touch } => {
                     if let Some((x, y)) = touch {
                         let (x_norm, y_norm) = screen_layout.normalize_touch_points(x, y);

src/presenter/linux.rs

@@ -173,7 +173,7 @@ impl Presenter {
         show_pause_menu(self, gpu_renderer, settings)
     }
 
-    pub fn poll_event(&mut self) -> PresentEvent {
+    pub fn poll_event(&mut self, _: &Settings) -> PresentEvent {
         for event in self.event_pump.poll_iter() {
             match event {
                 Event::KeyDown {

src/presenter/vita.rs

@@ -129,7 +129,9 @@ impl Presenter {
         }
     }
 
-    pub fn poll_event(&mut self) -> PresentEvent {
+    pub fn poll_event(&mut self, settings: &Settings) -> PresentEvent {
+        let mut stick_keymap = 0xFFFFFFFF;
+
         unsafe {
             let pressed = MaybeUninit::<SceCtrlData>::uninit();
             let mut pressed = pressed.assume_init();
@@ -177,6 +179,21 @@ impl Presenter {
                 }
             }
 
+            if settings.joystick_as_dpad() {
+                let stick_x = (pressed.lx as f32 - 127.0) / 127.0;
+                let stick_y = (pressed.ly as f32 - 127.0) / 127.0;
+                let length_threshold = 0.8;
+                if stick_x * stick_x + stick_y * stick_y > length_threshold * length_threshold {
+                    const STICK_MAPPING: [((f32, f32), Keycode); 4] = [((-1.0, 0.0), Keycode::Left), ((0.0, -1.0), Keycode::Up), ((1.0, 0.0), Keycode::Right), ((0.0, 1.0), Keycode::Down)];
+                    for ((x, y), guest_key) in STICK_MAPPING {
+                        let dot = stick_x * x + stick_y * y;
+                        if dot > 0.5 {
+                            stick_keymap &= !(1 << guest_key as u8);
+                        }
+                    }
+                }
+            }
+
             let touch_report = MaybeUninit::<SceTouchData>::uninit();
             let mut touch_report = touch_report.assume_init();
             sceTouchPeek(SCE_TOUCH_PORT_FRONT, &mut touch_report, 1);
@@ -191,7 +208,7 @@ impl Presenter {
             }
         }
         PresentEvent::Inputs {
-            keymap: self.keymap,
+            keymap: self.keymap & stick_keymap,
             touch: self.touch_points,
         }
     }

src/settings.rs

@@ -161,6 +161,7 @@ lazy_static! {
             Setting::new("Screen Layout", "Press PS + L Trigger or PS + R Trigger to cycle through layouts in game.", ScreenLayout::settings_value(), true),
             Setting::new("Swap screens", "Press PS + X to swap screens in game.", SettingValue::Bool(false), true),
             Setting::new("Language", "Some ROMs only come with one language. Make sure yours is multilingual.", Language::iter().into(), false),
+            Setting::new("Joystick as D-Pad", "", SettingValue::Bool(true), true),
             Setting::new("Framelimit", "Limits gamespeed to 60fps", SettingValue::Bool(true), true),
             Setting::new("Audio", "Disabling audio can give a performance boost", SettingValue::Bool(true), true),
             Setting::new(
@@ -180,15 +181,16 @@ lazy_static! {
 }
 
 #[derive(Clone)]
-pub struct Settings([Setting; 7]);
+pub struct Settings([Setting; 8]);
 
 const SCREEN_LAYOUT_SETTING: usize = 0;
 const SWAP_SCREEN_SETTING: usize = 1;
 const LANGUAGE_SETTING: usize = 2;
-const FRAMELIMIT_SETTING: usize = 3;
-const AUDIO_SETTING: usize = 4;
-const ARM7_EMU_SETTING: usize = 5;
-const ARM7_BLOCK_VALIDATION_SETTING: usize = 6;
+const JOYSTICK_AS_DPAD_SETTING: usize = 3;
+const FRAMELIMIT_SETTING: usize = 4;
+const AUDIO_SETTING: usize = 5;
+const ARM7_EMU_SETTING: usize = 6;
+const ARM7_BLOCK_VALIDATION_SETTING: usize = 7;
 
 impl Settings {
     pub fn screen_layout(&self) -> ScreenLayout {
@@ -200,6 +202,10 @@ impl Settings {
         }
     }
 
+    pub fn joystick_as_dpad(&self) -> bool {
+        unsafe { self.0[JOYSTICK_AS_DPAD_SETTING].value.as_bool().unwrap_unchecked() }
+    }
+
     pub fn framelimit(&self) -> bool {
         unsafe { self.0[FRAMELIMIT_SETTING].value.as_bool().unwrap_unchecked() }
     }
@@ -241,7 +247,7 @@ impl Settings {
         *self.0[ARM7_BLOCK_VALIDATION_SETTING].value.as_bool_mut().unwrap() = value;
     }
 
-    pub fn get_all_mut(&mut self) -> &mut [Setting; 7] {
+    pub fn get_all_mut(&mut self) -> &mut [Setting; 8] {
         &mut self.0
     }
 }