Showing the changes to interface/src/raypick/LaserPointerScriptingInterface.cpp (1 of 7 files). Show all
Unified · Split
| @@ -88,18 +88,22 @@ uint32_t LaserPointerScriptingInterface::createLaserPointer(const QVariant& prop · 87 unmodified lines | ||
| 88 | 88 | if (propertyMap["joint"].isValid()) { |
| 89 | 89 | QString jointName = propertyMap["joint"].toString(); |
| 90 | 90 | |
| 91 | − // x = upward, y = forward, z = lateral | |
| 92 | − glm::vec3 posOffset = Vectors::ZERO; | |
| 93 | − if (propertyMap["posOffset"].isValid()) { | |
| 94 | − posOffset = vec3FromVariant(propertyMap["posOffset"]); | |
| 95 | − } | |
| 91 | + if (jointName != "Mouse") { | |
| 92 | + // x = upward, y = forward, z = lateral | |
| 93 | + glm::vec3 posOffset = Vectors::ZERO; | |
| 94 | + if (propertyMap["posOffset"].isValid()) { | |
| 95 | + posOffset = vec3FromVariant(propertyMap["posOffset"]); | |
| 96 | + } | |
| 96 | 97 | |
| 97 | − glm::vec3 dirOffset = Vectors::UP; | |
| 98 | − if (propertyMap["dirOffset"].isValid()) { | |
| 99 | − dirOffset = vec3FromVariant(propertyMap["dirOffset"]); | |
| 100 | − } | |
| 98 | + glm::vec3 dirOffset = Vectors::UP; | |
| 99 | + if (propertyMap["dirOffset"].isValid()) { | |
| 100 | + dirOffset = vec3FromVariant(propertyMap["dirOffset"]); | |
| 101 | + } | |
| 101 | 102 | |
| 102 | − return DependencyManager::get<LaserPointerManager>()->createLaserPointer(jointName, posOffset, dirOffset, filter, maxDistance, renderStates, faceAvatar, centerEndY, enabled); | |
| 103 | + return DependencyManager::get<LaserPointerManager>()->createLaserPointer(jointName, posOffset, dirOffset, filter, maxDistance, renderStates, faceAvatar, centerEndY, enabled); | |
| 104 | + } else { | |
| 105 | + return DependencyManager::get<LaserPointerManager>()->createLaserPointer(filter, maxDistance, renderStates, faceAvatar, centerEndY, enabled); | |
| 106 | + } | |
| 103 | 107 | } else if (propertyMap["position"].isValid()) { |
| 104 | 108 | glm::vec3 position = vec3FromVariant(propertyMap["position"]); |
| 105 | 109 | |