use mouse events for offscreenui because touch events aren't working with the eventFilter, cleanup, documentation

SamGondelman committed 9 years ago

Commit 8730a261 parent 60db24f32 files · +427 −64Browse files

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

Unified · Split

 #include <QVariant>
 #include "GLMHelpers.h"
-#include <pointers/PickManager.h>
+#include <PickManager.h>
 #include "StaticRayPick.h"
 #include "JointRayPick.h"
 #include "MouseRayPick.h"
 #include "StylusPick.h"
-#include <pointers/Pick.h>
 #include <ScriptEngine.h>
 unsigned int PickScriptingInterface::createPick(const PickQuery::PickType type, const QVariant& properties) {
         filter = PickFilter(propMap["filter"].toUInt());
     }
-    return DependencyManager::get<PickManager>()->addPick(PickQuery::Stylus, std::make_shared<StylusPick>(filter, side, enabled));
+    float maxDistance = 0.0f;
+    if (propMap["maxDistance"].isValid()) {
+        maxDistance = propMap["maxDistance"].toFloat();
+    }
+    return DependencyManager::get<PickManager>()->addPick(PickQuery::Stylus, std::make_shared<StylusPick>(side, filter, maxDistance, enabled));
 }
 void PickScriptingInterface::enablePick(unsigned int uid) {

Keyboard shortcuts