Showing the changes to interface/src/raypick/LaserPointerScriptingInterface.cpp (1 of 12 files). Show all
Unified · Split
| @@ -12,11 +12,8 @@ · 11 unmodified lines | |||
| 12 | #include "LaserPointerScriptingInterface.h" | 12 | #include "LaserPointerScriptingInterface.h" |
| 13 | 13 | ||
| 14 | #include <QVariant> | 14 | #include <QVariant> |
| 15 | #include "RegisteredMetaTypes.h" | ||
| 16 | #include "GLMHelpers.h" | 15 | #include "GLMHelpers.h" |
| 17 | 16 | ||
| 18 | #include "Application.h" | ||
| 19 | |||
| 20 | QUuid LaserPointerScriptingInterface::createLaserPointer(const QVariant& properties) { | 17 | QUuid LaserPointerScriptingInterface::createLaserPointer(const QVariant& properties) { |
| 21 | QVariantMap propertyMap = properties.toMap(); | 18 | QVariantMap propertyMap = properties.toMap(); |
| 22 | 19 | ||
| @@ -69,7 +66,7 @@ QUuid LaserPointerScriptingInterface::createLaserPointer(const QVariant& propert · 46 unmodified lines | |||
| 69 | } | 66 | } |
| 70 | } | 67 | } |
| 71 | 68 | ||
| 72 | return qApp->getLaserPointerManager().createLaserPointer(propertyMap, renderStates, defaultRenderStates, faceAvatar, centerEndY, lockEnd, enabled); | 69 | return qApp->getLaserPointerManager().createLaserPointer(properties, renderStates, defaultRenderStates, faceAvatar, centerEndY, lockEnd, enabled); |
| 73 | } | 70 | } |
| 74 | 71 | ||
| 75 | void LaserPointerScriptingInterface::editRenderState(QUuid uid, const QString& renderState, const QVariant& properties) { | 72 | void LaserPointerScriptingInterface::editRenderState(QUuid uid, const QString& renderState, const QVariant& properties) { |