From a18c24832a33a33d95ad4f7465e15cdc0141bf60 Mon Sep 17 00:00:00 2001
From: HifiExperiments <thingsandstuffblog@gmail.com>
Date: Thu, 11 Feb 2021 18:01:33 -0800
Subject: [PATCH] fix android build
---
.../src/OculusMobileControllerManager.cpp | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/libraries/oculusMobilePlugin/src/OculusMobileControllerManager.cpp b/libraries/oculusMobilePlugin/src/OculusMobileControllerManager.cpp
index 54a796954e..ec744ce039 100644
--- a/libraries/oculusMobilePlugin/src/OculusMobileControllerManager.cpp
+++ b/libraries/oculusMobilePlugin/src/OculusMobileControllerManager.cpp
@@ -161,7 +161,7 @@ public:
QString getDefaultMappingConfig() const override;
void update(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) override;
void focusOutEvent() override;
- bool triggerHapticPulse(float strength, float duration, controller::Hand hand) override;
+ bool triggerHapticPulse(float strength, float duration, uint16_t index) override;
private:
void handlePose(float deltaTime, const controller::InputCalibrationData& inputCalibrationData,
@@ -516,12 +516,16 @@ void OculusMobileInputDevice::handleRotationForUntrackedHand(const controller::I
pose = pose.transform(controllerToAvatar);
}
-bool OculusMobileInputDevice::triggerHapticPulse(float strength, float duration, controller::Hand hand) {
+bool OculusMobileInputDevice::triggerHapticPulse(float strength, float duration, uint16_t index) {
+ if (index > 2) {
+ return false;
+ }
+
+ controller::Hand hand = (controller::Hand)index;
+
Locker locker(_lock);
bool success = true;
- qDebug()<<"AAAA: Haptic duration %f " << duration;
-
if (hand == controller::BOTH || hand == controller::LEFT) {
success &= _hands[0].setHapticFeedback(strength, duration);
}