History

Merge remote-tracking branch 'upstream/pointers' into ui

SamGondelman committed 8 years ago

Commit 3274c412 parents 8730a26 7eb22b380 files · +1022 −222Browse files

Showing the changes to interface/src/raypick/PointerScriptingInterface.cpp (1 of 80 files). Show all

Unified · Split

interface/src/raypick/PointerScriptingInterface.cpp+6−1
@@ -81,6 +81,11 @@ unsigned int PointerScriptingInterface::createLaserPointer(const QVariant& prope · 80 unmodified lines
81 distanceScaleEnd = propertyMap["distanceScaleEnd"].toBool();81 distanceScaleEnd = propertyMap["distanceScaleEnd"].toBool();
82 }82 }
83 83
84 bool scaleWithAvatar = false;
85 if (propertyMap["scaleWithAvatar"].isValid()) {
86 scaleWithAvatar = propertyMap["scaleWithAvatar"].toBool();
87 }
88
84 bool enabled = false;89 bool enabled = false;
85 if (propertyMap["enabled"].isValid()) {90 if (propertyMap["enabled"].isValid()) {
86 enabled = propertyMap["enabled"].toBool();91 enabled = propertyMap["enabled"].toBool();
@@ -139,7 +144,7 @@ unsigned int PointerScriptingInterface::createLaserPointer(const QVariant& prope · 52 unmodified lines
139 }144 }
140 145
141 return DependencyManager::get<PointerManager>()->addPointer(std::make_shared<LaserPointer>(properties, renderStates, defaultRenderStates, hover, triggers,146 return DependencyManager::get<PointerManager>()->addPointer(std::make_shared<LaserPointer>(properties, renderStates, defaultRenderStates, hover, triggers,
142 faceAvatar, centerEndY, lockEnd, distanceScaleEnd, enabled));147 faceAvatar, centerEndY, lockEnd, distanceScaleEnd, scaleWithAvatar, enabled));
143}148}
144 149
145void PointerScriptingInterface::editRenderState(unsigned int uid, const QString& renderState, const QVariant& properties) const {150void PointerScriptingInterface::editRenderState(unsigned int uid, const QString& renderState, const QVariant& properties) const {