Skip to content

Inertia and Damper are also condition-ed effects. #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
leosat wants to merge 1 commit into from
Closed

Inertia and Damper are also condition-ed effects. #168

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 24 additions & 6 deletions src/ff.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,14 @@ impl From<FFCondition> for ff_condition_effect {

#[derive(Clone, Copy, Debug, Eq, PartialEq)]
pub enum FFEffectKind {
Damper,
Inertia,
Damper {
/// Condition data for each axis.
condition: [FFCondition; 2],
},
Inertia {
/// Condition data for each axis.
condition: [FFCondition; 2],
},
Constant {
/// The strength of the effect.
level: i16,
Expand Down Expand Up @@ -160,8 +166,8 @@ pub enum FFEffectKind {
impl From<FFEffectKind> for FFEffectCode {
fn from(other: FFEffectKind) -> Self {
match other {
FFEffectKind::Damper => FFEffectCode::FF_DAMPER,
FFEffectKind::Inertia => FFEffectCode::FF_INERTIA,
FFEffectKind::Damper { .. } => FFEffectCode::FF_DAMPER,
FFEffectKind::Inertia { .. } => FFEffectCode::FF_INERTIA,
FFEffectKind::Constant { .. } => FFEffectCode::FF_CONSTANT,
FFEffectKind::Ramp { .. } => FFEffectCode::FF_RAMP,
FFEffectKind::Periodic { .. } => FFEffectCode::FF_PERIODIC,
Expand Down Expand Up @@ -241,8 +247,20 @@ pub struct FFEffectData {
impl From<sys::ff_effect> for FFEffectData {
fn from(value: sys::ff_effect) -> Self {
let kind = match FFEffectCode::from_index(value.type_ as usize) {
FFEffectCode::FF_DAMPER => FFEffectKind::Damper,
FFEffectCode::FF_INERTIA => FFEffectKind::Inertia,
FFEffectCode::FF_DAMPER => {
let condition = unsafe { value.u.condition };

FFEffectKind::Damper {
condition: [condition[0].into(), condition[1].into()],
}
}
FFEffectCode::FF_INERTIA => {
let condition = unsafe { value.u.condition };

FFEffectKind::Inertia {
condition: [condition[0].into(), condition[1].into()],
}
}
FFEffectCode::FF_CONSTANT => {
let constant = unsafe { value.u.constant };

Expand Down