Showing the changes to interface/src/scripting/HMDScriptingInterface.cpp (1 of 260 files). Show all
Unified · Split
| @@ -11,14 +11,15 @@ · 10 unmodified lines | ||
| 11 | 11 | |
| 12 | 12 | #include "HMDScriptingInterface.h" |
| 13 | 13 | |
| 14 | −#include <QtScript/QScriptContext> | |
| 15 | − | |
| 16 | 14 | #include <shared/QtHelpers.h> |
| 17 | 15 | #include <avatar/AvatarManager.h> |
| 18 | 16 | #include <display-plugins/DisplayPlugin.h> |
| 19 | 17 | #include <display-plugins/CompositorHelper.h> |
| 20 | 18 | #include <OffscreenUi.h> |
| 21 | 19 | #include <plugins/PluginUtils.h> |
| 20 | +#include <ScriptContext.h> | |
| 21 | +#include <ScriptEngine.h> | |
| 22 | +#include <ScriptEngineCast.h> | |
| 22 | 23 | #include <QUuid> |
| 23 | 24 | |
| 24 | 25 | #include "Application.h" |
| @@ -151,23 +152,23 @@ bool HMDScriptingInterface::getAwayStateWhenFocusLostInVREnabled() { · 126 unmodified lines | ||
| 151 | 152 | } |
| 152 | 153 | |
| 153 | 154 | |
| 154 | −QScriptValue HMDScriptingInterface::getHUDLookAtPosition2D(QScriptContext* context, QScriptEngine* engine) { | |
| 155 | +ScriptValuePointer HMDScriptingInterface::getHUDLookAtPosition2D(ScriptContext* context, ScriptEngine* engine) { | |
| 155 | 156 | glm::vec3 hudIntersection; |
| 156 | 157 | auto instance = DependencyManager::get<HMDScriptingInterface>(); |
| 157 | 158 | if (instance->getHUDLookAtPosition3D(hudIntersection)) { |
| 158 | 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 | |
| 164 | −QScriptValue HMDScriptingInterface::getHUDLookAtPosition3D(QScriptContext* context, QScriptEngine* engine) { | |
| 165 | +ScriptValuePointer HMDScriptingInterface::getHUDLookAtPosition3D(ScriptContext* context, ScriptEngine* engine) { | |
| 165 | 166 | glm::vec3 result; |
| 166 | 167 | auto instance = DependencyManager::get<HMDScriptingInterface>(); |
| 167 | 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 | |
| 173 | 174 | bool HMDScriptingInterface::getHUDLookAtPosition3D(glm::vec3& result) const { |