Improve pick/pointer debugging. Use unsigned int in Graphics api for compatibility

sabrina-shanman committed 7 years ago

Commit f7c324c1 parent 3108b6935 files · +406 −89Browse files

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

Unified · Split

interface/src/raypick/PointerScriptingInterface.cpp+49−20

 #include <shared/QtHelpers.h>
 #include "Application.h"
+#include "PickManager.h"
 #include "LaserPointer.h"
 #include "StylusPointer.h"
 #include "ParabolaPointer.h"
         return result;
     }
+    QVariantMap propertyMap = properties.toMap();
+    std::shared_ptr<Pointer> pointer;
     switch (type) {
         case PickQuery::PickType::Ray:
-            return createLaserPointer(properties);
+            pointer = buildLaserPointer(propertyMap);
+            break;
         case PickQuery::PickType::Stylus:
-            return createStylus(properties);
+            pointer = buildStylus(propertyMap);
+            break;
         case PickQuery::PickType::Parabola:
-            return createParabolaPointer(properties);
+            pointer = buildParabolaPointer(propertyMap);
+            break;
         default:
-            return PointerEvent::INVALID_POINTER_ID;
+            break;
     }
+    if (!pointer) {
+        return PointerEvent::INVALID_POINTER_ID;
+    }
+    propertyMap["type"] = (int)type;
+    return DependencyManager::get<PointerManager>()->addPointer(pointer);
+}
+bool PointerScriptingInterface::isPointerEnabled(unsigned int uid) const {
+    return DependencyManager::get<PointerManager>()->isPointerEnabled(uid);
+}
+QVector<unsigned int> PointerScriptingInterface::getCreatedPointers() const {
+    return DependencyManager::get<PointerManager>()->getCreatedPointers();
+}
+QVariantMap PointerScriptingInterface::getPointerProperties(unsigned int uid) const {
+    return DependencyManager::get<PointerManager>()->getPointerProperties(uid);
+}
+QVariantMap PointerScriptingInterface::getPointerScriptParameters(unsigned int uid) const {
+    return DependencyManager::get<PointerManager>()->getPointerScriptParameters(uid);
 }
 /**jsdoc
  * @property {Pointers.StylusPointerModel} [model] - Override some or all of the default stylus model properties.
  * @property {boolean} [hover=false] - <code>true</code> if the pointer generates {@link Entities} hover events,
  *     <code>false</code> if it doesn't.
+ * @property {number} [pickID] - Returned from {@link Pointers.getPointerProperties}. The ID of the pick created alongside this pointer.
  * @see {@link Picks.StylusPickProperties} for additional properties from the underlying stylus pick.
  */
 /**jsdoc
  *     offset.
  * @property {Quat} [rotationOffset] - The rotation offset of the model from the hand, to override the default rotation offset.
  */
-unsigned int PointerScriptingInterface::createStylus(const QVariant& properties) const {
+std::shared_ptr<Pointer> PointerScriptingInterface::buildStylus(const QVariant& properties) {
     QVariantMap propertyMap = properties.toMap();
     bool hover = false;
         }
     }
-    return DependencyManager::get<PointerManager>()->addPointer(std::make_shared<StylusPointer>(properties, StylusPointer::buildStylus(propertyMap), hover, enabled, modelPositionOffset,
+    return std::make_shared<StylusPointer>(properties, StylusPointer::buildStylus(propertyMap), hover, enabled, modelPositionOffset, modelRotationOffset, modelDimensions);
-                                                                                                modelRotationOffset, modelDimensions));
 }
 /**jsdoc
  *     <code>false</code> if it doesn't.
  * @property {Pointers.Trigger[]} [triggers=[]] - A list of ways that a {@link Controller} action or function should trigger
  *     events on the entity or overlay currently intersected.
+ * @property {number} [pickID] - Returned from {@link Pointers.getPointerProperties}. The ID of the pick created alongside this pointer.
  * @see {@link Picks.RayPickProperties} for additional properties from the underlying ray pick.
  */
-unsigned int PointerScriptingInterface::createLaserPointer(const QVariant& properties) const {
+std::shared_ptr<Pointer> PointerScriptingInterface::buildLaserPointer(const QVariant& properties) {
     QVariantMap propertyMap = properties.toMap();
 #if defined (Q_OS_ANDROID)
         QString jointName = propertyMap["joint"].toString();
         const QString MOUSE_JOINT = "Mouse";
         if (jointName == MOUSE_JOINT) {
-            return PointerEvent::INVALID_POINTER_ID;
+            return nullptr;
         }
     }
 #endif
         }
     }
-    return DependencyManager::get<PointerManager>()->addPointer(std::make_shared<LaserPointer>(properties, renderStates, defaultRenderStates, hover, triggers,
+    return std::make_shared<LaserPointer>(properties, renderStates, defaultRenderStates, hover, triggers,
-                                                                                               faceAvatar, followNormal, followNormalStrength, centerEndY, lockEnd,
+                                          faceAvatar, followNormal, followNormalStrength, centerEndY, lockEnd,
-                                                                                               distanceScaleEnd, scaleWithParent, enabled));
+                                          distanceScaleEnd, scaleWithParent, enabled);
 }
 /**jsdoc
  *     <code>false</code> if it doesn't.
  * @property {Pointers.Trigger[]} [triggers=[]] - A list of ways that a {@link Controller} action or function should trigger
  *     events on the entity or overlay currently intersected.
+ * @property {number} [pickID] - Returned from {@link Pointers.getPointerProperties}. The ID of the pick created alongside this pointer.
  * @see {@link Picks.ParabolaPickProperties} for additional properties from the underlying parabola pick.
  */
-unsigned int PointerScriptingInterface::createParabolaPointer(const QVariant& properties) const {
+std::shared_ptr<Pointer> PointerScriptingInterface::buildParabolaPointer(const QVariant& properties) {
     QVariantMap propertyMap = properties.toMap();
     bool faceAvatar = false;
         }
     }
-    return DependencyManager::get<PointerManager>()->addPointer(std::make_shared<ParabolaPointer>(properties, renderStates, defaultRenderStates, hover, triggers,
+    return std::make_shared<ParabolaPointer>(properties, renderStates, defaultRenderStates, hover, triggers,
-                                                                                                  faceAvatar, followNormal, followNormalStrength, centerEndY, lockEnd, distanceScaleEnd,
+                                             faceAvatar, followNormal, followNormalStrength, centerEndY, lockEnd, distanceScaleEnd,
-                                                                                                  scaleWithParent, enabled));
+                                             scaleWithParent, enabled);
 }
 void PointerScriptingInterface::editRenderState(unsigned int uid, const QString& renderState, const QVariant& properties) const {
     }
     return result;
 }
-QVariantMap PointerScriptingInterface::getPointerProperties(unsigned int uid) const {
-    return DependencyManager::get<PointerManager>()->getPointerProperties(uid);
-}