Merge pull request #10928 from 1P-Cusack/21362

Add point and thumb up gestures to the Vive.

interface/resources/controllers/vive.json

@@ -1,6 +1,15 @@
 {
     "name": "Vive to Standard",
     "channels": [
+        { "from": "Vive.LY", "to": "Standard.LeftIndexPoint",
+            "peek": true,
+            "filters": [ { "type": "hysteresis", "min": 0.7, "max": 0.75 } ]
+        },
+        { "from": "Vive.RY", "to": "Standard.RightIndexPoint",
+            "peek": true,
+            "filters": [ { "type": "hysteresis", "min": 0.7, "max": 0.75 } ]
+        },
+
         { "from": "Vive.LY", "when": "Vive.LSY", "filters": ["invert"], "to": "Standard.LY" },
         { "from": "Vive.LX", "when": "Vive.LSX", "to": "Standard.LX" },
         {
@@ -13,6 +22,10 @@
 
         { "from": "Vive.LeftGrip", "to": "Standard.LeftGrip" },
         { "from": "Vive.LS", "to": "Standard.LS" },
+        { "from": "Vive.LSTouch", "to": "Standard.LeftThumbUp",
+            "peek": true,
+            "filters": [ { "type": "logicalNot" } ]
+        },
         { "from": "Vive.LSTouch", "to": "Standard.LSTouch" },
 
         { "from": "Vive.RY", "when": "Vive.RSY", "filters": ["invert"], "to": "Standard.RY" },
@@ -27,6 +40,10 @@
 
         { "from": "Vive.RightGrip", "to": "Standard.RightGrip" },
         { "from": "Vive.RS", "to": "Standard.RS" },
+        { "from": "Vive.RSTouch", "to": "Standard.RightThumbUp",
+            "peek": true,
+            "filters": [ { "type": "logicalNot" } ]
+        },
         { "from": "Vive.RSTouch", "to": "Standard.RSTouch" },
 
         { "from": "Vive.LSCenter", "to": "Standard.LeftPrimaryThumb" },
@@ -59,7 +76,7 @@
 
         { "from": "Vive.Head", "to" : "Standard.Head"},
 
-        { "from": "Vive.RightArm", "to" : "Standard.RightArm"},
-        { "from": "Vive.LeftArm", "to" : "Standard.LeftArm"}
+        { "from": "Vive.RightArm", "to" : "Standard.RightArm" },
+        { "from": "Vive.LeftArm", "to" : "Standard.LeftArm" }
     ]
 }

libraries/controllers/src/controllers/impl/Filter.cpp

@@ -22,6 +22,7 @@
 #include "filters/DeadZoneFilter.h"
 #include "filters/HysteresisFilter.h"
 #include "filters/InvertFilter.h"
+#include "filters/NotFilter.h"
 #include "filters/PulseFilter.h"
 #include "filters/ScaleFilter.h"
 #include "filters/TranslateFilter.h"
@@ -40,6 +41,7 @@ REGISTER_FILTER_CLASS_INSTANCE(ConstrainToPositiveIntegerFilter, "constrainToPos
 REGISTER_FILTER_CLASS_INSTANCE(DeadZoneFilter, "deadZone")
 REGISTER_FILTER_CLASS_INSTANCE(HysteresisFilter, "hysteresis")
 REGISTER_FILTER_CLASS_INSTANCE(InvertFilter, "invert")
+REGISTER_FILTER_CLASS_INSTANCE(NotFilter, "logicalNot")
 REGISTER_FILTER_CLASS_INSTANCE(ScaleFilter, "scale")
 REGISTER_FILTER_CLASS_INSTANCE(PulseFilter, "pulse")
 REGISTER_FILTER_CLASS_INSTANCE(TranslateFilter, "translate")

libraries/controllers/src/controllers/impl/RouteBuilderProxy.cpp

@@ -24,6 +24,7 @@
 #include "filters/DeadZoneFilter.h"
 #include "filters/HysteresisFilter.h"
 #include "filters/InvertFilter.h"
+#include "filters/NotFilter.h"
 #include "filters/PulseFilter.h"
 #include "filters/ScaleFilter.h"
 #include "filters/TranslateFilter.h"
@@ -148,6 +149,11 @@ QObject* RouteBuilderProxy::pulse(float interval) {
     return this;
 }
 
+QObject* RouteBuilderProxy::logicalNot() {
+    addFilter(std::make_shared<NotFilter>());
+    return this;
+}
+
 void RouteBuilderProxy::addFilter(Filter::Pointer filter) {
     _route->filters.push_back(filter);
 }

libraries/controllers/src/controllers/impl/RouteBuilderProxy.h

@@ -53,6 +53,7 @@ class RouteBuilderProxy : public QObject {
         Q_INVOKABLE QObject* postTransform(glm::mat4 transform);
         Q_INVOKABLE QObject* rotate(glm::quat rotation);
         Q_INVOKABLE QObject* lowVelocity(float rotationConstant, float translationConstant);
+        Q_INVOKABLE QObject* logicalNot();
 
     private:
         void to(const Endpoint::Pointer& destination);

libraries/controllers/src/controllers/impl/filters/NotFilter.cpp

@@ -0,0 +1,10 @@
+#include "NotFilter.h"
+
+using namespace controller;
+
+NotFilter::NotFilter() {
+}
+
+float NotFilter::apply(float value) const {
+    return (value == 0.0f) ? 1.0f : 0.0f;
+}

libraries/controllers/src/controllers/impl/filters/NotFilter.h

@@ -0,0 +1,21 @@
+#pragma once
+#ifndef hifi_Controllers_Filters_Not_h
+#define hifi_Controllers_Filters_Not_h
+
+#include "../Filter.h"
+
+namespace controller {
+
+class NotFilter : public Filter {
+    REGISTER_FILTER_CLASS(NotFilter);
+public:
+    NotFilter();
+
+    virtual float apply(float value) const override;
+    virtual Pose apply(Pose value) const override { return value; }
+};
+
+}
+
+#endif
+