History

control hovering, preset buttons for clicking, constness, scroll off surface

SamGondelman committed 9 years ago

Commit e9a5acd1 parent 79518267 files · +100 −43Browse files

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

Unified · Split

interface/src/raypick/PointerScriptingInterface.cpp+6−1
@@ -87,6 +87,11 @@ QUuid PointerScriptingInterface::createLaserPointer(const QVariant& properties) · 86 unmodified lines
87 }87 }
88 }88 }
89 89
90 bool hover = false;
91 if (propertyMap["hover"].isValid()) {
92 hover = propertyMap["hover"].toBool();
93 }
94
90 PointerTriggers triggers;95 PointerTriggers triggers;
91 auto userInputMapper = DependencyManager::get<UserInputMapper>();96 auto userInputMapper = DependencyManager::get<UserInputMapper>();
92 if (propertyMap["triggers"].isValid()) {97 if (propertyMap["triggers"].isValid()) {
@@ -105,7 +110,7 @@ QUuid PointerScriptingInterface::createLaserPointer(const QVariant& properties) · 12 unmodified lines
105 }110 }
106 }111 }
107 112
108 return DependencyManager::get<PointerManager>()->addPointer(std::make_shared<LaserPointer>(properties, renderStates, defaultRenderStates, triggers,113 return DependencyManager::get<PointerManager>()->addPointer(std::make_shared<LaserPointer>(properties, renderStates, defaultRenderStates, hover, triggers,
109 faceAvatar, centerEndY, lockEnd, distanceScaleEnd, enabled));114 faceAvatar, centerEndY, lockEnd, distanceScaleEnd, enabled));
110}115}
111 116