History

isolate calls to the QtScript libraries to an interface we control

Heather Anderson committed 5 years ago

Commit 1e018db1 parent 713b29e260 files · +6904 −5064Browse files

Showing the changes to interface/src/scripting/HMDScriptingInterface.cpp (1 of 260 files). Show all

Unified · Split

interface/src/scripting/HMDScriptingInterface.cpp+9−8
@@ -11,14 +11,15 @@ · 10 unmodified lines
11 11
12#include "HMDScriptingInterface.h"12#include "HMDScriptingInterface.h"
13 13
14#include <QtScript/QScriptContext>
15
16#include <shared/QtHelpers.h>14#include <shared/QtHelpers.h>
17#include <avatar/AvatarManager.h>15#include <avatar/AvatarManager.h>
18#include <display-plugins/DisplayPlugin.h>16#include <display-plugins/DisplayPlugin.h>
19#include <display-plugins/CompositorHelper.h>17#include <display-plugins/CompositorHelper.h>
20#include <OffscreenUi.h>18#include <OffscreenUi.h>
21#include <plugins/PluginUtils.h>19#include <plugins/PluginUtils.h>
20#include <ScriptContext.h>
21#include <ScriptEngine.h>
22#include <ScriptEngineCast.h>
22#include <QUuid>23#include <QUuid>
23 24
24#include "Application.h"25#include "Application.h"
@@ -151,23 +152,23 @@ bool HMDScriptingInterface::getAwayStateWhenFocusLostInVREnabled() { · 126 unmodified lines
151}152}
152 153
153 154
154QScriptValue HMDScriptingInterface::getHUDLookAtPosition2D(QScriptContext* context, QScriptEngine* engine) {155ScriptValuePointer HMDScriptingInterface::getHUDLookAtPosition2D(ScriptContext* context, ScriptEngine* engine) {
155 glm::vec3 hudIntersection;156 glm::vec3 hudIntersection;
156 auto instance = DependencyManager::get<HMDScriptingInterface>();157 auto instance = DependencyManager::get<HMDScriptingInterface>();
157 if (instance->getHUDLookAtPosition3D(hudIntersection)) {158 if (instance->getHUDLookAtPosition3D(hudIntersection)) {
158 glm::vec2 overlayPos = qApp->getApplicationCompositor().overlayFromSphereSurface(hudIntersection);159 glm::vec2 overlayPos = qApp->getApplicationCompositor().overlayFromSphereSurface(hudIntersection);
159 return qScriptValueFromValue<glm::vec2>(engine, overlayPos);160 return scriptValueFromValue<glm::vec2>(engine, overlayPos);
160 }161 }
161 return QScriptValue::NullValue;162 return engine->nullValue();
162}163}
163 164
164QScriptValue HMDScriptingInterface::getHUDLookAtPosition3D(QScriptContext* context, QScriptEngine* engine) {165ScriptValuePointer HMDScriptingInterface::getHUDLookAtPosition3D(ScriptContext* context, ScriptEngine* engine) {
165 glm::vec3 result;166 glm::vec3 result;
166 auto instance = DependencyManager::get<HMDScriptingInterface>();167 auto instance = DependencyManager::get<HMDScriptingInterface>();
167 if (instance->getHUDLookAtPosition3D(result)) {168 if (instance->getHUDLookAtPosition3D(result)) {
168 return qScriptValueFromValue<glm::vec3>(engine, result);169 return scriptValueFromValue<glm::vec3>(engine, result);
169 }170 }
170 return QScriptValue::NullValue;171 return engine->nullValue();
171}172}
172 173
173bool HMDScriptingInterface::getHUDLookAtPosition3D(glm::vec3& result) const {174bool HMDScriptingInterface::getHUDLookAtPosition3D(glm::vec3& result) const {