touchHLE/archived-rust-sdl2
1
0
Fork 0
mirror of https://github.com/touchHLE/rust-sdl2.git synced 2026-01-31 01:25:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update sensor types and Return correct SensorData Enum (#1461)

Browse Source 
* Return proper SensorData for Gyroscope

* Update SensorTypes to match SDL bindings

* Update changelog
This commit is contained in:
Alexander Cieslewicz
2025-03-19 02:11:46 -06:00
committed by GitHub
parent 01099a5733
commit bccd248c63
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
changelog.md
View File

@@ -3,6 +3,10 @@ when upgrading from a version of rust-sdl2 to another.
### Next
[PR #1461](https://github.com/Rust-SDL2/rust-sdl2/pull/1461) **BREAKING CHANGE** Added new SensorType variants: LeftGyroscope, RightGyroscope, LeftAccelerometer, RightAccelerometer
[PR #1461](https://github.com/Rust-SDL2/rust-sdl2/pull/1461) **BREAKING CHANGE** Sensor::get_data now returns correct SensorData::Gyro enum
[PR #1437](https://github.com/Rust-SDL2/rust-sdl2/pull/1437) **BREAKING CHANGE** Prevent users from creating `Sdl2TtfContext` out of nothing and use SDL's reference counting init/quit
[PR #1464](https://github.com/Rust-SDL2/rust-sdl2/pull/1464) Added binding for `Mix_OpenAudioDevice`

22
src/sdl2/sensor.rs
View File

@@ -69,14 +69,22 @@ impl SensorSubsystem {
pub enum SensorType {
Unknown,
Gyroscope,
LeftGyroscope,
RightGyroscope,
Accelerometer,
LeftAccelerometer,
RightAccelerometer,
}
impl SensorType {
pub fn from_ll(raw: i32) -> Self {
match raw {
x if x == SDL_SensorType::SDL_SENSOR_GYRO as i32 => SensorType::Gyroscope,
x if x == SDL_SensorType::SDL_SENSOR_GYRO_L as i32 => SensorType::LeftGyroscope,
x if x == SDL_SensorType::SDL_SENSOR_GYRO_R as i32 => SensorType::RightGyroscope,
x if x == SDL_SensorType::SDL_SENSOR_ACCEL as i32 => SensorType::Accelerometer,
x if x == SDL_SensorType::SDL_SENSOR_ACCEL_L as i32 => SensorType::LeftAccelerometer,
x if x == SDL_SensorType::SDL_SENSOR_ACCEL_R as i32 => SensorType::RightAccelerometer,
_ => SensorType::Unknown,
}
}
@@ -87,7 +95,11 @@ impl From<SensorType> for SDL_SensorType {
match val {
SensorType::Unknown => SDL_SensorType::SDL_SENSOR_UNKNOWN,
SensorType::Gyroscope => SDL_SensorType::SDL_SENSOR_GYRO,
SensorType::LeftGyroscope => SDL_SensorType::SDL_SENSOR_GYRO_L,
SensorType::RightGyroscope => SDL_SensorType::SDL_SENSOR_GYRO_R,
SensorType::Accelerometer => SDL_SensorType::SDL_SENSOR_ACCEL,
SensorType::LeftAccelerometer => SDL_SensorType::SDL_SENSOR_ACCEL_L,
SensorType::RightAccelerometer => SDL_SensorType::SDL_SENSOR_ACCEL_R,
}
}
}
@@ -136,7 +148,11 @@ impl Sensor {
}
sys::SDL_SensorType::SDL_SENSOR_UNKNOWN => SensorType::Unknown,
sys::SDL_SensorType::SDL_SENSOR_ACCEL => SensorType::Accelerometer,
sys::SDL_SensorType::SDL_SENSOR_ACCEL_L => SensorType::LeftAccelerometer,
sys::SDL_SensorType::SDL_SENSOR_ACCEL_R => SensorType::RightAccelerometer,
sys::SDL_SensorType::SDL_SENSOR_GYRO => SensorType::Gyroscope,
sys::SDL_SensorType::SDL_SENSOR_GYRO_L => SensorType::LeftGyroscope,
sys::SDL_SensorType::SDL_SENSOR_GYRO_R => SensorType::RightGyroscope,
}
}
@@ -152,8 +168,12 @@ impl Sensor {
Err(IntegerOrSdlError::SdlError(get_error()))
} else {
Ok(match self.sensor_type() {
SensorType::Gyroscope => SensorData::Accel([data[0], data[1], data[2]]),
SensorType::Gyroscope => SensorData::Gyro([data[0], data[1], data[2]]),
SensorType::LeftGyroscope => SensorData::Gyro([data[0], data[1], data[2]]),
SensorType::RightGyroscope => SensorData::Gyro([data[0], data[1], data[2]]),
SensorType::Accelerometer => SensorData::Accel([data[0], data[1], data[2]]),
SensorType::LeftAccelerometer => SensorData::Accel([data[0], data[1], data[2]]),
SensorType::RightAccelerometer => SensorData::Accel([data[0], data[1], data[2]]),
SensorType::Unknown => SensorData::Unknown(data),
})
}