kohrokho
/
ALVR-IPv6
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(server): 🐛 Remove debug log; fix butons-fingers animations

This commit is contained in:
Riccardo Zaglia 2023-09-10 21:07:09 +08:00
parent 5e9e9b6527
commit a417a841eb
2 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
alvr/server/cpp/alvr_server/Controller.cpp
View File

@ -168,21 +168,21 @@ void Controller::SetButton(uint64_t id, FfiButtonValue value) {
} else {
vr::VRDriverInput()->UpdateScalarComponent(m_buttonHandles[id], value.scalar, 0.0);
}
}
// todo: remove when moving inferred controller hand skeleton to rust
if (id == LEFT_A_TOUCH_ID || id == LEFT_B_TOUCH_ID || id == LEFT_X_TOUCH_ID ||
id == LEFT_Y_TOUCH_ID || id == LEFT_TRACKPAD_TOUCH_ID ||
id == LEFT_THUMBSTICK_TOUCH_ID || id == LEFT_THUMBREST_TOUCH_ID ||
id == RIGHT_A_TOUCH_ID || id == RIGHT_B_TOUCH_ID || id == RIGHT_TRACKPAD_TOUCH_ID ||
id == RIGHT_THUMBSTICK_TOUCH_ID || id == RIGHT_THUMBREST_TOUCH_ID) {
m_currentThumbTouch = value.binary;
} else if (id == LEFT_TRIGGER_TOUCH_ID || id == RIGHT_TRIGGER_TOUCH_ID) {
m_currentTriggerTouch = value.binary;
} else if (id == LEFT_TRIGGER_VALUE_ID || id == RIGHT_TRIGGER_VALUE_ID) {
m_triggerValue = value.scalar;
} else if (id == LEFT_SQUEEZE_VALUE_ID || id == RIGHT_SQUEEZE_VALUE_ID) {
m_gripValue = value.scalar;
}
// todo: remove when moving inferred controller hand skeleton to rust
if (id == LEFT_A_TOUCH_ID || id == LEFT_B_TOUCH_ID || id == LEFT_X_TOUCH_ID ||
id == LEFT_Y_TOUCH_ID || id == LEFT_TRACKPAD_TOUCH_ID || id == LEFT_THUMBSTICK_TOUCH_ID ||
id == LEFT_THUMBREST_TOUCH_ID || id == RIGHT_A_TOUCH_ID || id == RIGHT_B_TOUCH_ID ||
id == RIGHT_TRACKPAD_TOUCH_ID || id == RIGHT_THUMBSTICK_TOUCH_ID ||
id == RIGHT_THUMBREST_TOUCH_ID) {
m_currentThumbTouch = value.binary;
} else if (id == LEFT_TRIGGER_TOUCH_ID || id == RIGHT_TRIGGER_TOUCH_ID) {
m_currentTriggerTouch = value.binary;
} else if (id == LEFT_TRIGGER_VALUE_ID || id == RIGHT_TRIGGER_VALUE_ID) {
m_triggerValue = value.scalar;
} else if (id == LEFT_SQUEEZE_VALUE_ID || id == RIGHT_SQUEEZE_VALUE_ID) {
m_gripValue = value.scalar;
}
}

8
alvr/server/src/input_mapping.rs
View File

@ -585,7 +585,6 @@ impl ButtonMappingManager {
ButtonValue::Binary(*state)
}
(MappingType::BinaryToScalar(levels), ButtonValue::Binary(value)) => {
error!("binary to scalar");
if value {
ButtonValue::Scalar(levels.on)
} else {
@ -593,7 +592,6 @@ impl ButtonMappingManager {
}
}
(MappingType::Remap(range), ButtonValue::Scalar(value)) => {
error!("remap");
let value = (value - range.start) / (range.end - range.start);
ButtonValue::Scalar(value.clamp(0.0, 1.0))
}
@ -614,12 +612,6 @@ impl ButtonMappingManager {
}
}
let button_name = BUTTON_INFO
.get(&mapping.destination)
.map(|info| info.path)
.unwrap_or("Unknown");
error!("setting {button_name}: {destination_value:?}");
let destination_value = match destination_value {
ButtonValue::Binary(value) => FfiButtonValue {
type_: crate::FfiButtonType_BUTTON_TYPE_BINARY,