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
8787 }
8888 }
8989
90+ bool hover = false;
91+ if (propertyMap["hover"].isValid()) {
92+ hover = propertyMap["hover"].toBool();
93+ }
94+
9095 PointerTriggers triggers;
9196 auto userInputMapper = DependencyManager::get<UserInputMapper>();
9297 if (propertyMap["triggers"].isValid()) {
@@ -105,7 +110,7 @@ QUuid PointerScriptingInterface::createLaserPointer(const QVariant& properties) · 12 unmodified lines
105110 }
106111 }
107112
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,
109114 faceAvatar, centerEndY, lockEnd, distanceScaleEnd, enabled));
110115 }
111116