Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-10 22:19:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

expose Controller.triggerHapticPulse to javascript (currently does nothing)

Browse source
This commit is contained in:
SamGondelman 2016-06-02 12:11:13 -07:00
parent 35b80ba066
commit 6ca02dcad2
5 changed files with 71 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/controllers/src/controllers/InputDevice.h
View file

@ -55,6 +55,9 @@ public:
const QString& getName() const { return _name; } const QString& getName() const { return _name; }
// By default, Input Devices do not support haptics
virtual bool triggerHapticPulse(float strength, float duration, bool leftHand) { return false; }
// Update call MUST be called once per simulation loop // Update call MUST be called once per simulation loop
// It takes care of updating the action states and deltas // It takes care of updating the action states and deltas
virtual void update(float deltaTime, const InputCalibrationData& inputCalibrationData) {}; virtual void update(float deltaTime, const InputCalibrationData& inputCalibrationData) {};

4
libraries/controllers/src/controllers/ScriptingInterface.cpp
View file

@ -140,6 +140,10 @@ namespace controller {
return DependencyManager::get<UserInputMapper>()->getActionNames(); return DependencyManager::get<UserInputMapper>()->getActionNames();
} }
bool ScriptingInterface::triggerHapticPulse(unsigned int device, float strength, float duration, bool leftHand) const {
return DependencyManager::get<UserInputMapper>()->triggerHapticPulse(device, strength, duration, leftHand);
}
void ScriptingInterface::updateMaps() { void ScriptingInterface::updateMaps() {
QVariantMap newHardware; QVariantMap newHardware;
auto userInputMapper = DependencyManager::get<controller::UserInputMapper>(); auto userInputMapper = DependencyManager::get<controller::UserInputMapper>();

2
libraries/controllers/src/controllers/ScriptingInterface.h
View file

@ -84,6 +84,8 @@ namespace controller {
Q_INVOKABLE Pose getPoseValue(const int& source) const; Q_INVOKABLE Pose getPoseValue(const int& source) const;
Q_INVOKABLE Pose getPoseValue(StandardPoseChannel source, uint16_t device = 0) const; Q_INVOKABLE Pose getPoseValue(StandardPoseChannel source, uint16_t device = 0) const;
Q_INVOKABLE bool triggerHapticPulse(unsigned int device, float strength, float duration, bool leftHand = true) const;
Q_INVOKABLE QObject* newMapping(const QString& mappingName = QUuid::createUuid().toString()); Q_INVOKABLE QObject* newMapping(const QString& mappingName = QUuid::createUuid().toString());
Q_INVOKABLE void enableMapping(const QString& mappingName, bool enable = true); Q_INVOKABLE void enableMapping(const QString& mappingName, bool enable = true);
Q_INVOKABLE void disableMapping(const QString& mappingName) { enableMapping(mappingName, false); } Q_INVOKABLE void disableMapping(const QString& mappingName) { enableMapping(mappingName, false); }

8
libraries/controllers/src/controllers/UserInputMapper.cpp
View file

@ -336,6 +336,14 @@ QVector<QString> UserInputMapper::getActionNames() const {
return result; return result;
} }
bool UserInputMapper::triggerHapticPulse(uint16 deviceID, float strength, float duration, bool leftHand) {
Locker locker(_lock);
if (_registeredDevices.find(deviceID) != _registeredDevices.end()) {
return _registeredDevices[deviceID]->triggerHapticPulse(strength, duration, leftHand);
}
return false;
}
int actionMetaTypeId = qRegisterMetaType<Action>(); int actionMetaTypeId = qRegisterMetaType<Action>();
int inputMetaTypeId = qRegisterMetaType<Input>(); int inputMetaTypeId = qRegisterMetaType<Input>();
int inputPairMetaTypeId = qRegisterMetaType<Input::NamedPair>(); int inputPairMetaTypeId = qRegisterMetaType<Input::NamedPair>();

1
libraries/controllers/src/controllers/UserInputMapper.h
View file

@ -89,6 +89,7 @@ namespace controller {
void setActionState(Action action, float value) { _actionStates[toInt(action)] = value; } void setActionState(Action action, float value) { _actionStates[toInt(action)] = value; }
void deltaActionState(Action action, float delta) { _actionStates[toInt(action)] += delta; } void deltaActionState(Action action, float delta) { _actionStates[toInt(action)] += delta; }
void setActionState(Action action, const Pose& value) { _poseStates[toInt(action)] = value; } void setActionState(Action action, const Pose& value) { _poseStates[toInt(action)] = value; }
bool triggerHapticPulse(uint16 deviceID, float strength, float duration, bool leftHand);
static Input makeStandardInput(controller::StandardButtonChannel button); static Input makeStandardInput(controller::StandardButtonChannel button);
static Input makeStandardInput(controller::StandardAxisChannel axis); static Input makeStandardInput(controller::StandardAxisChannel axis);