Showing the changes to interface/src/raypick/PointerScriptingInterface.cpp (1 of 50 files). Show all
Unified · Split
| @@ -134,6 +134,11 @@ unsigned int PointerScriptingInterface::createLaserPointer(const QVariant& prope · 133 unmodified lines | |||
| 134 | scaleWithAvatar = propertyMap["scaleWithAvatar"].toBool(); | 134 | scaleWithAvatar = propertyMap["scaleWithAvatar"].toBool(); |
| 135 | } | 135 | } |
| 136 | 136 | ||
| 137 | bool followNormal = true; | ||
| 138 | if (propertyMap["followNormal"].isValid()) { | ||
| 139 | followNormal = propertyMap["followNormal"].toBool(); | ||
| 140 | } | ||
| 141 | |||
| 137 | bool enabled = false; | 142 | bool enabled = false; |
| 138 | if (propertyMap["enabled"].isValid()) { | 143 | if (propertyMap["enabled"].isValid()) { |
| 139 | enabled = propertyMap["enabled"].toBool(); | 144 | enabled = propertyMap["enabled"].toBool(); |
| @@ -192,7 +197,8 @@ unsigned int PointerScriptingInterface::createLaserPointer(const QVariant& prope · 52 unmodified lines | |||
| 192 | } | 197 | } |
| 193 | 198 | ||
| 194 | return DependencyManager::get<PointerManager>()->addPointer(std::make_shared<LaserPointer>(properties, renderStates, defaultRenderStates, hover, triggers, | 199 | return DependencyManager::get<PointerManager>()->addPointer(std::make_shared<LaserPointer>(properties, renderStates, defaultRenderStates, hover, triggers, |
| 195 | faceAvatar, centerEndY, lockEnd, distanceScaleEnd, scaleWithAvatar, enabled)); | 200 | faceAvatar, followNormal, centerEndY, lockEnd, distanceScaleEnd, |
| 201 | scaleWithAvatar, enabled)); | ||
| 196 | } | 202 | } |
| 197 | 203 | ||
| 198 | void PointerScriptingInterface::editRenderState(unsigned int uid, const QString& renderState, const QVariant& properties) const { | 204 | void PointerScriptingInterface::editRenderState(unsigned int uid, const QString& renderState, const QVariant& properties) const { |