From 70078b0e78de6a067a11df4ab0802700534a8e83 Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Thu, 5 Jan 2017 15:04:16 -0800 Subject: [PATCH] Fix for linux build --- libraries/script-engine/src/TabletScriptingInterface.cpp | 2 +- libraries/script-engine/src/TabletScriptingInterface.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/script-engine/src/TabletScriptingInterface.cpp b/libraries/script-engine/src/TabletScriptingInterface.cpp index 3e0a25d1a2..0f2d382525 100644 --- a/libraries/script-engine/src/TabletScriptingInterface.cpp +++ b/libraries/script-engine/src/TabletScriptingInterface.cpp @@ -166,7 +166,7 @@ void TabletProxy::updateAudioBar(const double micLevel) { } void TabletProxy::updateTabletPosition(glm::vec3 tabletPosition) { - _position.store(tabletPosition); + _position.set(tabletPosition); } void TabletProxy::emitScriptEvent(QVariant msg) { diff --git a/libraries/script-engine/src/TabletScriptingInterface.h b/libraries/script-engine/src/TabletScriptingInterface.h index 29bfe6a98a..61e3205dc3 100644 --- a/libraries/script-engine/src/TabletScriptingInterface.h +++ b/libraries/script-engine/src/TabletScriptingInterface.h @@ -24,7 +24,7 @@ #include #include - +#include class TabletProxy; class TabletButtonProxy; @@ -110,7 +110,7 @@ public: */ Q_INVOKABLE void updateTabletPosition(glm::vec3 tabletPosition); - glm::vec3 getPosition() const { return _position; } + glm::vec3 getPosition() const { return _position.get(); } QString getName() const { return _name; } @@ -141,7 +141,7 @@ protected: std::vector> _tabletButtonProxies; QQuickItem* _qmlTabletRoot { nullptr }; QObject* _qmlOffscreenSurface { nullptr }; - std::atomic _position; + ThreadSafeValueCache _position; }; /**jsdoc