Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 12:04:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix android build

Browse source
This commit is contained in:
HifiExperiments 2021-02-11 18:01:33 -08:00
parent b6e7466804
commit a18c24832a
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libraries/oculusMobilePlugin/src/OculusMobileControllerManager.cpp
View file

@ -161,7 +161,7 @@ public:
QString getDefaultMappingConfig() const override; QString getDefaultMappingConfig() const override;
void update(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) override; void update(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) override;
void focusOutEvent() 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: private:
void handlePose(float deltaTime, const controller::InputCalibrationData& inputCalibrationData, void handlePose(float deltaTime, const controller::InputCalibrationData& inputCalibrationData,
@ -516,12 +516,16 @@ void OculusMobileInputDevice::handleRotationForUntrackedHand(const controller::I
pose = pose.transform(controllerToAvatar); 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); Locker locker(_lock);
bool success = true; bool success = true;
qDebug()<<"AAAA: Haptic duration %f " << duration;
if (hand == controller::BOTH || hand == controller::LEFT) { if (hand == controller::BOTH || hand == controller::LEFT) {
success &= _hands[0].setHapticFeedback(strength, duration); success &= _hands[0].setHapticFeedback(strength, duration);
} }