Showing the changes to interface/src/raypick/PointerScriptingInterface.cpp (1 of 260 files). Show all
Unified · Split
| @@ -12,6 +12,8 @@ · 11 unmodified lines | |||
| 12 | #include <GLMHelpers.h> | 12 | #include <GLMHelpers.h> |
| 13 | #include <shared/QtHelpers.h> | 13 | #include <shared/QtHelpers.h> |
| 14 | 14 | ||
| 15 | #include <ScriptValueUtils.h> | ||
| 16 | |||
| 15 | #include "Application.h" | 17 | #include "Application.h" |
| 16 | #include "PickManager.h" | 18 | #include "PickManager.h" |
| 17 | #include "LaserPointer.h" | 19 | #include "LaserPointer.h" |
| @@ -23,11 +25,11 @@ static const glm::quat X_ROT_NEG_90{ 0.70710678f, -0.70710678f, 0.0f, 0.0f }; · 5 unmodified lines | |||
| 23 | static const glm::vec3 DEFAULT_POSITION_OFFSET{0.0f, 0.0f, -StylusPick::WEB_STYLUS_LENGTH / 2.0f}; | 25 | static const glm::vec3 DEFAULT_POSITION_OFFSET{0.0f, 0.0f, -StylusPick::WEB_STYLUS_LENGTH / 2.0f}; |
| 24 | static const glm::vec3 DEFAULT_MODEL_DIMENSIONS{0.01f, 0.01f, StylusPick::WEB_STYLUS_LENGTH}; | 26 | static const glm::vec3 DEFAULT_MODEL_DIMENSIONS{0.01f, 0.01f, StylusPick::WEB_STYLUS_LENGTH}; |
| 25 | 27 | ||
| 26 | void PointerScriptingInterface::setIgnoreItems(unsigned int uid, const QScriptValue& ignoreItems) const { | 28 | void PointerScriptingInterface::setIgnoreItems(unsigned int uid, const ScriptValuePointer& ignoreItems) const { |
| 27 | DependencyManager::get<PointerManager>()->setIgnoreItems(uid, qVectorQUuidFromScriptValue(ignoreItems)); | 29 | DependencyManager::get<PointerManager>()->setIgnoreItems(uid, qVectorQUuidFromScriptValue(ignoreItems)); |
| 28 | } | 30 | } |
| 29 | 31 | ||
| 30 | void PointerScriptingInterface::setIncludeItems(unsigned int uid, const QScriptValue& includeItems) const { | 32 | void PointerScriptingInterface::setIncludeItems(unsigned int uid, const ScriptValuePointer& includeItems) const { |
| 31 | DependencyManager::get<PointerManager>()->setIncludeItems(uid, qVectorQUuidFromScriptValue(includeItems)); | 33 | DependencyManager::get<PointerManager>()->setIncludeItems(uid, qVectorQUuidFromScriptValue(includeItems)); |
| 32 | } | 34 | } |
| 33 | 35 | ||