Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add mutex

Browse source
This commit is contained in:
luiscuenca 2018-10-01 11:44:08 -07:00
parent 5ccbc5c029
commit 2c6003e40b
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -178,6 +178,11 @@ namespace controller {
return inputRecorder->getSaveDirectory(); return inputRecorder->getSaveDirectory();
} }
QStringList ScriptingInterface::getRunningInputDeviceNames() {
QMutexLocker locker(&_mutex);
return _runningInputDeviceNames;
}
bool ScriptingInterface::triggerHapticPulseOnDevice(unsigned int device, float strength, float duration, controller::Hand hand) const { bool ScriptingInterface::triggerHapticPulseOnDevice(unsigned int device, float strength, float duration, controller::Hand hand) const {
return DependencyManager::get<UserInputMapper>()->triggerHapticPulseOnDevice(device, strength, duration, hand); return DependencyManager::get<UserInputMapper>()->triggerHapticPulseOnDevice(device, strength, duration, hand);
} }

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

@ -26,6 +26,7 @@
#include <QThread> #include <QThread>
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtCore/QVariant> #include <QtCore/QVariant>
#include <QMutex>
#include <QtQml/QJSValue> #include <QtQml/QJSValue>
#include <QtScript/QScriptValue> #include <QtScript/QScriptValue>
@ -436,7 +437,7 @@ namespace controller {
* @function Controller.getRunningInputDevices * @function Controller.getRunningInputDevices
* @returns {string[]} An array of strings with the names * @returns {string[]} An array of strings with the names
*/ */
Q_INVOKABLE QStringList getRunningInputDeviceNames() { return _runningInputDeviceNames; } Q_INVOKABLE QStringList getRunningInputDeviceNames();
bool isMouseCaptured() const { return _mouseCaptured; } bool isMouseCaptured() const { return _mouseCaptured; }
bool isTouchCaptured() const { return _touchCaptured; } bool isTouchCaptured() const { return _touchCaptured; }
@ -627,6 +628,8 @@ namespace controller {
std::atomic<bool> _touchCaptured { false }; std::atomic<bool> _touchCaptured { false };
std::atomic<bool> _wheelCaptured { false }; std::atomic<bool> _wheelCaptured { false };
std::atomic<bool> _actionsCaptured { false }; std::atomic<bool> _actionsCaptured { false };
QMutex _mutex;
}; };
} }