Showing the changes to interface/src/raypick/PickScriptingInterface.cpp (1 of 32 files). Show all
Unified · Split
| @@ -11,14 +11,13 @@ · 10 unmodified lines | ||
| 11 | 11 | #include <QVariant> |
| 12 | 12 | #include "GLMHelpers.h" |
| 13 | 13 | |
| 14 | −#include <pointers/PickManager.h> | |
| 14 | +#include <PickManager.h> | |
| 15 | 15 | |
| 16 | 16 | #include "StaticRayPick.h" |
| 17 | 17 | #include "JointRayPick.h" |
| 18 | 18 | #include "MouseRayPick.h" |
| 19 | 19 | #include "StylusPick.h" |
| 20 | 20 | |
| 21 | −#include <pointers/Pick.h> | |
| 22 | 21 | #include <ScriptEngine.h> |
| 23 | 22 | |
| 24 | 23 | unsigned int PickScriptingInterface::createPick(const PickQuery::PickType type, const QVariant& properties) { |
| @@ -105,7 +104,12 @@ unsigned int PickScriptingInterface::createStylusPick(const QVariant& properties · 80 unmodified lines | ||
| 105 | 104 | filter = PickFilter(propMap["filter"].toUInt()); |
| 106 | 105 | } |
| 107 | 106 | |
| 108 | − return DependencyManager::get<PickManager>()->addPick(PickQuery::Stylus, std::make_shared<StylusPick>(filter, side, enabled)); | |
| 107 | + float maxDistance = 0.0f; | |
| 108 | + if (propMap["maxDistance"].isValid()) { | |
| 109 | + maxDistance = propMap["maxDistance"].toFloat(); | |
| 110 | + } | |
| 111 | + | |
| 112 | + return DependencyManager::get<PickManager>()->addPick(PickQuery::Stylus, std::make_shared<StylusPick>(side, filter, maxDistance, enabled)); | |
| 109 | 113 | } |
| 110 | 114 | |
| 111 | 115 | void PickScriptingInterface::enablePick(unsigned int uid) { |