From c217f8d80f8d819fab509ad2fef990e3d8d72583 Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@alumni.brown.edu>
Date: Thu, 7 Feb 2019 14:23:34 -0800
Subject: [PATCH] remove overlay picks from stats qml

---
 interface/resources/qml/Stats.qml    | 10 +++++-----
 interface/src/ui/Stats.cpp           |  2 +-
 interface/src/ui/Stats.h             | 16 ++++++++--------
 libraries/pointers/src/PickManager.h |  4 ++--
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/interface/resources/qml/Stats.qml b/interface/resources/qml/Stats.qml
index a65170ee3b..3b703d72e6 100644
--- a/interface/resources/qml/Stats.qml
+++ b/interface/resources/qml/Stats.qml
@@ -129,11 +129,11 @@ Item {
                     }
                     StatText {
                         visible: root.expanded
-                        text: "Intersection calls: Entities/Overlays/Avatars/HUD\n    " +
-                                    "Styluses:\t" + root.stylusPicksUpdated.x + "/" + root.stylusPicksUpdated.y + "/" + root.stylusPicksUpdated.z + "/" + root.stylusPicksUpdated.w + "\n    " +
-                                    "Rays:\t" + root.rayPicksUpdated.x + "/" + root.rayPicksUpdated.y + "/" + root.rayPicksUpdated.z + "/" + root.rayPicksUpdated.w + "\n    " +
-                                    "Parabolas:\t" + root.parabolaPicksUpdated.x + "/" + root.parabolaPicksUpdated.y + "/" + root.parabolaPicksUpdated.z + "/" + root.parabolaPicksUpdated.w + "\n    " +
-                                    "Colliders:\t" + root.collisionPicksUpdated.x + "/" + root.collisionPicksUpdated.y + "/" + root.collisionPicksUpdated.z + "/" + root.collisionPicksUpdated.w
+                        text: "Intersection calls: Entities/Avatars/HUD\n    " +
+                                    "Styluses:\t" + root.stylusPicksUpdated.x + "/" + root.stylusPicksUpdated.y + "/" + root.stylusPicksUpdated.z + "\n    " +
+                                    "Rays:\t" + root.rayPicksUpdated.x + "/" + root.rayPicksUpdated.y + "/" + root.rayPicksUpdated.z + "\n    " +
+                                    "Parabolas:\t" + root.parabolaPicksUpdated.x + "/" + root.parabolaPicksUpdated.y + "/" + root.parabolaPicksUpdated.z + "\n    " +
+                                    "Colliders:\t" + root.collisionPicksUpdated.x + "/" + root.collisionPicksUpdated.y + "/" + root.collisionPicksUpdated.z
                     }
                 }
             }
diff --git a/interface/src/ui/Stats.cpp b/interface/src/ui/Stats.cpp
index cb204c9772..e3697ee8ec 100644
--- a/interface/src/ui/Stats.cpp
+++ b/interface/src/ui/Stats.cpp
@@ -158,7 +158,7 @@ void Stats::updateStats(bool force) {
         STAT_UPDATE(rayPicksCount, totalPicks[PickQuery::Ray]);
         STAT_UPDATE(parabolaPicksCount, totalPicks[PickQuery::Parabola]);
         STAT_UPDATE(collisionPicksCount, totalPicks[PickQuery::Collision]);
-        std::vector<QVector4D> updatedPicks = pickManager->getUpdatedPickCounts();
+        std::vector<QVector3D> updatedPicks = pickManager->getUpdatedPickCounts();
         STAT_UPDATE(stylusPicksUpdated, updatedPicks[PickQuery::Stylus]);
         STAT_UPDATE(rayPicksUpdated, updatedPicks[PickQuery::Ray]);
         STAT_UPDATE(parabolaPicksUpdated, updatedPicks[PickQuery::Parabola]);
diff --git a/interface/src/ui/Stats.h b/interface/src/ui/Stats.h
index ae608cfddb..20b6ed9919 100644
--- a/interface/src/ui/Stats.h
+++ b/interface/src/ui/Stats.h
@@ -171,10 +171,10 @@ private: \
  * @property {number} rayPicksCount - <em>Read-only.</em>
  * @property {number} parabolaPicksCount - <em>Read-only.</em>
  * @property {number} collisionPicksCount - <em>Read-only.</em>
- * @property {Vec4} stylusPicksUpdated - <em>Read-only.</em>
- * @property {Vec4} rayPicksUpdated - <em>Read-only.</em>
- * @property {Vec4} parabolaPicksUpdated - <em>Read-only.</em>
- * @property {Vec4} collisionPicksUpdated - <em>Read-only.</em>
+ * @property {Vec3} stylusPicksUpdated - <em>Read-only.</em>
+ * @property {Vec3} rayPicksUpdated - <em>Read-only.</em>
+ * @property {Vec3} parabolaPicksUpdated - <em>Read-only.</em>
+ * @property {Vec3} collisionPicksUpdated - <em>Read-only.</em>
  */
 // Properties from x onwards are QQuickItem properties.
 
@@ -296,10 +296,10 @@ class Stats : public QQuickItem {
     STATS_PROPERTY(int, rayPicksCount, 0)
     STATS_PROPERTY(int, parabolaPicksCount, 0)
     STATS_PROPERTY(int, collisionPicksCount, 0)
-    STATS_PROPERTY(QVector4D, stylusPicksUpdated, QVector4D(0, 0, 0, 0))
-    STATS_PROPERTY(QVector4D, rayPicksUpdated, QVector4D(0, 0, 0, 0))
-    STATS_PROPERTY(QVector4D, parabolaPicksUpdated, QVector4D(0, 0, 0, 0))
-    STATS_PROPERTY(QVector4D, collisionPicksUpdated, QVector4D(0, 0, 0, 0))
+    STATS_PROPERTY(QVector3D, stylusPicksUpdated, QVector3D(0, 0, 0))
+    STATS_PROPERTY(QVector3D, rayPicksUpdated, QVector3D(0, 0, 0))
+    STATS_PROPERTY(QVector3D, parabolaPicksUpdated, QVector3D(0, 0, 0))
+    STATS_PROPERTY(QVector3D, collisionPicksUpdated, QVector3D(0, 0, 0))
 
 public:
     static Stats* getInstance();
diff --git a/libraries/pointers/src/PickManager.h b/libraries/pointers/src/PickManager.h
index 9d5971078d..8f5aa5caf8 100644
--- a/libraries/pointers/src/PickManager.h
+++ b/libraries/pointers/src/PickManager.h
@@ -61,14 +61,14 @@ public:
 
     bool getForceCoarsePicking() { return _forceCoarsePicking; }
 
-    const std::vector<QVector4D>& getUpdatedPickCounts() { return _updatedPickCounts; }
+    const std::vector<QVector3D>& getUpdatedPickCounts() { return _updatedPickCounts; }
     const std::vector<int>& getTotalPickCounts() { return _totalPickCounts; }
 
 public slots:
     void setForceCoarsePicking(bool forceCoarsePicking) { _forceCoarsePicking = forceCoarsePicking; }
 
 protected:
-    std::vector<QVector4D> _updatedPickCounts { PickQuery::NUM_PICK_TYPES };
+    std::vector<QVector3D> _updatedPickCounts { PickQuery::NUM_PICK_TYPES };
     std::vector<int> _totalPickCounts { 0, 0, 0, 0 };
 
     bool _forceCoarsePicking { false };