History

Trim picks in use during quest:

danteruiz committed 7 years ago

Commit b00746c1 parent d45d8708 files · +108 −4Browse files

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

Unified · Split

interface/src/raypick/PointerScriptingInterface.cpp+11−0
@@ -150,6 +150,17 @@ unsigned int PointerScriptingInterface::createStylus(const QVariant& properties) · 149 unmodified lines
150unsigned int PointerScriptingInterface::createLaserPointer(const QVariant& properties) const {150unsigned int PointerScriptingInterface::createLaserPointer(const QVariant& properties) const {
151 QVariantMap propertyMap = properties.toMap();151 QVariantMap propertyMap = properties.toMap();
152 152
153#if defined (Q_OS_ANDROID)
154 QString jointName { "" };
155 if (propertyMap["joint"].isValid()) {
156 QString jointName = propertyMap["joint"].toString();
157 QString mouseJoint { "Mouse" };
158 if (jointName == mouseJoint) {
159 return PointerEvent::INVALID_POINTER_ID;
160 }
161 }
162#endif
163
153 bool faceAvatar = false;164 bool faceAvatar = false;
154 if (propertyMap["faceAvatar"].isValid()) {165 if (propertyMap["faceAvatar"].isValid()) {
155 faceAvatar = propertyMap["faceAvatar"].toBool();166 faceAvatar = propertyMap["faceAvatar"].toBool();