Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 18:50:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for linux build

Browse source
This commit is contained in:
Anthony J. Thibault 2017-01-05 15:04:16 -08:00
parent 7198cd13b5
commit 70078b0e78
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/script-engine/src/TabletScriptingInterface.cpp
View file

@ -166,7 +166,7 @@ void TabletProxy::updateAudioBar(const double micLevel) {
} }
void TabletProxy::updateTabletPosition(glm::vec3 tabletPosition) { void TabletProxy::updateTabletPosition(glm::vec3 tabletPosition) {
_position.store(tabletPosition); _position.set(tabletPosition);
} }
void TabletProxy::emitScriptEvent(QVariant msg) { void TabletProxy::emitScriptEvent(QVariant msg) {

6
libraries/script-engine/src/TabletScriptingInterface.h
View file

@ -24,7 +24,7 @@
#include <DependencyManager.h> #include <DependencyManager.h>
#include <SoundCache.h> #include <SoundCache.h>
#include <ThreadSafeValueCache.h>
class TabletProxy; class TabletProxy;
class TabletButtonProxy; class TabletButtonProxy;
@ -110,7 +110,7 @@ public:
*/ */
Q_INVOKABLE void updateTabletPosition(glm::vec3 tabletPosition); 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; } QString getName() const { return _name; }
@ -141,7 +141,7 @@ protected:
std::vector<QSharedPointer<TabletButtonProxy>> _tabletButtonProxies; std::vector<QSharedPointer<TabletButtonProxy>> _tabletButtonProxies;
QQuickItem* _qmlTabletRoot { nullptr }; QQuickItem* _qmlTabletRoot { nullptr };
QObject* _qmlOffscreenSurface { nullptr }; QObject* _qmlOffscreenSurface { nullptr };
std::atomic<glm::vec3> _position; ThreadSafeValueCache<glm::vec3> _position;
}; };
/**jsdoc /**jsdoc