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
32 lockEnd = propertyMap["lockEnd"].toBool();32 lockEnd = propertyMap["lockEnd"].toBool();
33 }33 }
34 34
35 bool distanceScaleEnd = false;
36 if (propertyMap["distanceScaleEnd"].isValid()) {
37 distanceScaleEnd = propertyMap["distanceScaleEnd"].toBool();
38 }
39
35 bool enabled = false;40 bool enabled = false;
36 if (propertyMap["enabled"].isValid()) {41 if (propertyMap["enabled"].isValid()) {
37 enabled = propertyMap["enabled"].toBool();42 enabled = propertyMap["enabled"].toBool();
@@ -66,7 +71,7 @@ QUuid LaserPointerScriptingInterface::createLaserPointer(const QVariant& propert · 28 unmodified lines
66 }71 }
67 }72 }
68 73
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);
70}75}
71 76
72void LaserPointerScriptingInterface::editRenderState(QUuid uid, const QString& renderState, const QVariant& properties) {77void LaserPointerScriptingInterface::editRenderState(QUuid uid, const QString& renderState, const QVariant& properties) {