fixed issues with Input API
This commit is contained in:
@@ -15,12 +15,13 @@ pub enum ButtonId {
|
||||
Select = 11,
|
||||
}
|
||||
|
||||
#[repr(C)]
|
||||
#[derive(Default, Clone, Copy, Debug)]
|
||||
pub struct Button {
|
||||
pub pressed: bool,
|
||||
pub released: bool,
|
||||
pub down: bool,
|
||||
pub hold_frames: u32,
|
||||
pub hold_frames: u16,
|
||||
}
|
||||
|
||||
impl Button {
|
||||
|
||||
@@ -66,6 +66,23 @@ pub enum Syscall {
|
||||
TouchIsReleased = 0x2105,
|
||||
/// Returns how many frames the pointer has been held down.
|
||||
TouchGetHold = 0x2106,
|
||||
/// Returns the full Button struct (6 bytes) for the touch finger state.
|
||||
TouchGetFinger = 0x2107,
|
||||
|
||||
// --- Input (Pad service-based) ---
|
||||
/// Returns the full Button struct (6 bytes) for each gamepad button
|
||||
PadGetUp = 0x2200,
|
||||
PadGetDown = 0x2201,
|
||||
PadGetLeft = 0x2202,
|
||||
PadGetRight = 0x2203,
|
||||
PadGetA = 0x2204,
|
||||
PadGetB = 0x2205,
|
||||
PadGetX = 0x2206,
|
||||
PadGetY = 0x2207,
|
||||
PadGetL = 0x2208,
|
||||
PadGetR = 0x2209,
|
||||
PadGetStart = 0x220A,
|
||||
PadGetSelect = 0x220B,
|
||||
|
||||
// --- Audio ---
|
||||
/// Starts playback of a sound sample by its Bank and ID.
|
||||
@@ -138,6 +155,19 @@ impl Syscall {
|
||||
0x2104 => Some(Self::TouchIsPressed),
|
||||
0x2105 => Some(Self::TouchIsReleased),
|
||||
0x2106 => Some(Self::TouchGetHold),
|
||||
0x2107 => Some(Self::TouchGetFinger),
|
||||
0x2200 => Some(Self::PadGetUp),
|
||||
0x2201 => Some(Self::PadGetDown),
|
||||
0x2202 => Some(Self::PadGetLeft),
|
||||
0x2203 => Some(Self::PadGetRight),
|
||||
0x2204 => Some(Self::PadGetA),
|
||||
0x2205 => Some(Self::PadGetB),
|
||||
0x2206 => Some(Self::PadGetX),
|
||||
0x2207 => Some(Self::PadGetY),
|
||||
0x2208 => Some(Self::PadGetL),
|
||||
0x2209 => Some(Self::PadGetR),
|
||||
0x220A => Some(Self::PadGetStart),
|
||||
0x220B => Some(Self::PadGetSelect),
|
||||
0x3001 => Some(Self::AudioPlaySample),
|
||||
0x3002 => Some(Self::AudioPlay),
|
||||
0x4001 => Some(Self::FsOpen),
|
||||
@@ -184,6 +214,19 @@ impl Syscall {
|
||||
Self::TouchIsPressed => 0,
|
||||
Self::TouchIsReleased => 0,
|
||||
Self::TouchGetHold => 0,
|
||||
Self::TouchGetFinger => 0,
|
||||
Self::PadGetUp => 0,
|
||||
Self::PadGetDown => 0,
|
||||
Self::PadGetLeft => 0,
|
||||
Self::PadGetRight => 0,
|
||||
Self::PadGetA => 0,
|
||||
Self::PadGetB => 0,
|
||||
Self::PadGetX => 0,
|
||||
Self::PadGetY => 0,
|
||||
Self::PadGetL => 0,
|
||||
Self::PadGetR => 0,
|
||||
Self::PadGetStart => 0,
|
||||
Self::PadGetSelect => 0,
|
||||
Self::AudioPlaySample => 5,
|
||||
Self::AudioPlay => 7,
|
||||
Self::FsOpen => 1,
|
||||
@@ -209,6 +252,20 @@ impl Syscall {
|
||||
Self::GfxClear565 => 0,
|
||||
Self::InputPadSnapshot => 48,
|
||||
Self::InputTouchSnapshot => 6,
|
||||
// Touch finger and Pad per-button services return a Button (4 slots)
|
||||
Self::TouchGetFinger => 4,
|
||||
Self::PadGetUp
|
||||
| Self::PadGetDown
|
||||
| Self::PadGetLeft
|
||||
| Self::PadGetRight
|
||||
| Self::PadGetA
|
||||
| Self::PadGetB
|
||||
| Self::PadGetX
|
||||
| Self::PadGetY
|
||||
| Self::PadGetL
|
||||
| Self::PadGetR
|
||||
| Self::PadGetStart
|
||||
| Self::PadGetSelect => 4,
|
||||
_ => 1,
|
||||
}
|
||||
}
|
||||
@@ -238,6 +295,19 @@ impl Syscall {
|
||||
Self::TouchIsPressed => "TouchIsPressed",
|
||||
Self::TouchIsReleased => "TouchIsReleased",
|
||||
Self::TouchGetHold => "TouchGetHold",
|
||||
Self::TouchGetFinger => "TouchGetFinger",
|
||||
Self::PadGetUp => "PadGetUp",
|
||||
Self::PadGetDown => "PadGetDown",
|
||||
Self::PadGetLeft => "PadGetLeft",
|
||||
Self::PadGetRight => "PadGetRight",
|
||||
Self::PadGetA => "PadGetA",
|
||||
Self::PadGetB => "PadGetB",
|
||||
Self::PadGetX => "PadGetX",
|
||||
Self::PadGetY => "PadGetY",
|
||||
Self::PadGetL => "PadGetL",
|
||||
Self::PadGetR => "PadGetR",
|
||||
Self::PadGetStart => "PadGetStart",
|
||||
Self::PadGetSelect => "PadGetSelect",
|
||||
Self::AudioPlaySample => "AudioPlaySample",
|
||||
Self::AudioPlay => "AudioPlay",
|
||||
Self::FsOpen => "FsOpen",
|
||||
|
||||
Reference in New Issue
Block a user