Showing the changes to interface/src/scripting/HMDScriptingInterface.cpp (1 of 39 files). Show all
Unified · Split
| @@ -156,7 +156,7 @@ QString HMDScriptingInterface::preferredAudioOutput() const { · 155 unmodified lines | |||
| 156 | bool HMDScriptingInterface::setHandLasers(int hands, bool enabled, const glm::vec4& color, const glm::vec3& direction) { | 156 | bool HMDScriptingInterface::setHandLasers(int hands, bool enabled, const glm::vec4& color, const glm::vec3& direction) { |
| 157 | if (QThread::currentThread() != thread()) { | 157 | if (QThread::currentThread() != thread()) { |
| 158 | bool result; | 158 | bool result; |
| 159 | hifi::qt::blockingInvokeMethod(this, "setHandLasers", Q_RETURN_ARG(bool, result), | 159 | BLOCKING_INVOKE_METHOD(this, "setHandLasers", Q_RETURN_ARG(bool, result), |
| 160 | Q_ARG(int, hands), Q_ARG(bool, enabled), Q_ARG(glm::vec4, color), Q_ARG(glm::vec3, direction)); | 160 | Q_ARG(int, hands), Q_ARG(bool, enabled), Q_ARG(glm::vec4, color), Q_ARG(glm::vec3, direction)); |
| 161 | return result; | 161 | return result; |
| 162 | } | 162 | } |
| @@ -171,7 +171,7 @@ bool HMDScriptingInterface::setHandLasers(int hands, bool enabled, const glm::ve · 8 unmodified lines | |||
| 171 | bool HMDScriptingInterface::setExtraLaser(const glm::vec3& worldStart, bool enabled, const glm::vec4& color, const glm::vec3& direction) { | 171 | bool HMDScriptingInterface::setExtraLaser(const glm::vec3& worldStart, bool enabled, const glm::vec4& color, const glm::vec3& direction) { |
| 172 | if (QThread::currentThread() != thread()) { | 172 | if (QThread::currentThread() != thread()) { |
| 173 | bool result; | 173 | bool result; |
| 174 | hifi::qt::blockingInvokeMethod(this, "setExtraLaser", Q_RETURN_ARG(bool, result), | 174 | BLOCKING_INVOKE_METHOD(this, "setExtraLaser", Q_RETURN_ARG(bool, result), |
| 175 | Q_ARG(glm::vec3, worldStart), Q_ARG(bool, enabled), Q_ARG(glm::vec4, color), Q_ARG(glm::vec3, direction)); | 175 | Q_ARG(glm::vec3, worldStart), Q_ARG(bool, enabled), Q_ARG(glm::vec4, color), Q_ARG(glm::vec3, direction)); |
| 176 | return result; | 176 | return result; |
| 177 | } | 177 | } |