Disable jump filter for eye gaze

ami-iit · Oct 25, 2024 · 96baf8b · 96baf8b
1 parent 3c1d8f2
commit 96baf8b
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 4 deletions.
diff --git a/src/devices/openxrheadset/FilteredPosePublisher.cpp b/src/devices/openxrheadset/FilteredPosePublisher.cpp
@@ -146,6 +146,13 @@ void FilteredPosePublisher::updateInputPose(const OpenXrInterface::NamedPoseVelo
     {
         return;
     }
-
-    PosePublisher::updateInputPose(filterJumps(input));
+    switch (input.filterType)
+    {
+        case PoseFilterType::JumpFilter:
+            PosePublisher::updateInputPose(filterJumps(input));
+            break;
+        default:
+            PosePublisher::updateInputPose(input);
+            break;
+    }
 }
diff --git a/src/devices/openxrheadset/OpenXrInterface.cpp b/src/devices/openxrheadset/OpenXrInterface.cpp
@@ -924,7 +924,7 @@ bool OpenXrInterface::prepareXrActions()
 
         gazeInputs.poses =
         {
-            {"/input/gaze_ext/pose", "pose"}
+            {"/input/gaze_ext/pose", "pose", PoseFilterType::None}
         };
 
         TopLevelPathDeclaration gaze;

diff --git a/src/devices/openxrheadset/OpenXrInterface.h b/src/devices/openxrheadset/OpenXrInterface.h
@@ -61,6 +61,12 @@ class IOpenXrQuadLayer
     virtual void setEnabled(bool enabled) = 0;
 };
 
+enum class PoseFilterType
+{
+    None,
+    JumpFilter,
+};
+
 struct OpenXrInterfaceSettings
 {
     double posesPredictionInMs{0.0};
@@ -142,6 +148,7 @@ class OpenXrInterface
         std::string name;
         Pose pose;
         Velocity velocity;
+        PoseFilterType filterType;
 
         static NamedPoseVelocity Identity(const std::string& name);
     };

diff --git a/src/devices/openxrheadset/impl/OpenXrInterfaceImpl.cpp b/src/devices/openxrheadset/impl/OpenXrInterfaceImpl.cpp
@@ -289,6 +289,7 @@ bool OpenXrInterface::Implementation::fillActionBindings(const std::vector<Inter
                     bindings.emplace_back();
                     bindings.back().action = newAction.xrAction;
                     bindings.back().binding = xrPath;
+                    newAction.filterType = input.filterType;
                 }
 
                 for (auto& input : actionDeclaration.buttons)

diff --git a/src/devices/openxrheadset/impl/OpenXrInterfaceImpl.h b/src/devices/openxrheadset/impl/OpenXrInterfaceImpl.h
@@ -114,9 +114,14 @@ struct ActionDeclaration
     std::string nameSuffix;
 };
 
+struct PoseActionDeclaration : public ActionDeclaration
+{
+    PoseFilterType filterType{ PoseFilterType::JumpFilter };
+};
+
 struct InputActionsDeclaration
 {
-    std::vector<ActionDeclaration> poses;
+    std::vector<PoseActionDeclaration> poses;
 
     std::vector<ActionDeclaration>  buttons;