History

scale end sphere in c++ for controller modules

SamGondelman committed 9 years ago

Commit aee817f1 parent d276adc11 files · +58 −91Browse files

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

Unified · Split

interface/src/raypick/LaserPointerScriptingInterface.cpp+6−1
@@ -32,6 +32,11 @@ QUuid LaserPointerScriptingInterface::createLaserPointer(const QVariant& propert · 31 unmodified lines
3232 lockEnd = propertyMap["lockEnd"].toBool();
3333 }
3434
35+ bool distanceScaleEnd = false;
36+ if (propertyMap["distanceScaleEnd"].isValid()) {
37+ distanceScaleEnd = propertyMap["distanceScaleEnd"].toBool();
38+ }
39+
3540 bool enabled = false;
3641 if (propertyMap["enabled"].isValid()) {
3742 enabled = propertyMap["enabled"].toBool();
@@ -66,7 +71,7 @@ QUuid LaserPointerScriptingInterface::createLaserPointer(const QVariant& propert · 28 unmodified lines
6671 }
6772 }
6873
69− return qApp->getLaserPointerManager().createLaserPointer(properties, renderStates, defaultRenderStates, faceAvatar, centerEndY, lockEnd, enabled);
74+ return qApp->getLaserPointerManager().createLaserPointer(properties, renderStates, defaultRenderStates, faceAvatar, centerEndY, lockEnd, distanceScaleEnd, enabled);
7075 }
7176
7277 void LaserPointerScriptingInterface::editRenderState(QUuid uid, const QString& renderState, const QVariant& properties) {