Showing the changes to interface/src/scripting/HMDScriptingInterface.cpp (1 of 20 files). Show all
Unified · Split
| @@ -25,9 +25,9 @@ bool HMDScriptingInterface::getHUDLookAtPosition3D(glm::vec3& result) const { · 24 unmodified lines | |||
| 25 | 25 | ||
| 26 | glm::vec3 direction = orientation * glm::vec3(0.0f, 0.0f, -1.0f); | 26 | glm::vec3 direction = orientation * glm::vec3(0.0f, 0.0f, -1.0f); |
| 27 | 27 | ||
| 28 | ApplicationOverlay& applicationOverlay = Application::getInstance()->getApplicationOverlay(); | 28 | const auto& compositor = Application::getInstance()->getApplicationCompositor(); |
| 29 | 29 | ||
| 30 | return applicationOverlay.calculateRayUICollisionPoint(position, direction, result); | 30 | return compositor.calculateRayUICollisionPoint(position, direction, result); |
| 31 | } | 31 | } |
| 32 | 32 | ||
| 33 | QScriptValue HMDScriptingInterface::getHUDLookAtPosition2D(QScriptContext* context, QScriptEngine* engine) { | 33 | QScriptValue HMDScriptingInterface::getHUDLookAtPosition2D(QScriptContext* context, QScriptEngine* engine) { |
| @@ -40,7 +40,7 @@ QScriptValue HMDScriptingInterface::getHUDLookAtPosition2D(QScriptContext* conte · 6 unmodified lines | |||
| 40 | glm::vec3 direction = glm::inverse(myAvatar->getOrientation()) * (hudIntersection - sphereCenter); | 40 | glm::vec3 direction = glm::inverse(myAvatar->getOrientation()) * (hudIntersection - sphereCenter); |
| 41 | glm::quat rotation = ::rotationBetween(glm::vec3(0.0f, 0.0f, -1.0f), direction); | 41 | glm::quat rotation = ::rotationBetween(glm::vec3(0.0f, 0.0f, -1.0f), direction); |
| 42 | glm::vec3 eulers = ::safeEulerAngles(rotation); | 42 | glm::vec3 eulers = ::safeEulerAngles(rotation); |
| 43 | return qScriptValueFromValue<glm::vec2>(engine, Application::getInstance()->getApplicationOverlay() | 43 | return qScriptValueFromValue<glm::vec2>(engine, Application::getInstance()->getApplicationCompositor() |
| 44 | .sphericalToOverlay(glm::vec2(eulers.y, -eulers.x))); | 44 | .sphericalToOverlay(glm::vec2(eulers.y, -eulers.x))); |
| 45 | } | 45 | } |
| 46 | return QScriptValue::NullValue; | 46 | return QScriptValue::NullValue; |