Adding upstream version 1:115.7.0.upstream/1%115.7.0upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 51 insertions, 0 deletions

diff --git a/gfx/vr/service/OpenVRWMRMapper.cpp b/gfx/vr/service/OpenVRWMRMapper.cpp
new file mode 100644
index 0000000000..4611d9ee0a
--- /dev/null
+++ b/gfx/vr/service/OpenVRWMRMapper.cpp
@@ -0,0 +1,51 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "OpenVRWMRMapper.h"
+
+#include "moz_external_vr.h"
+#include "VRSession.h"
+
+namespace mozilla::gfx {
+
+void OpenVRWMRMapper::UpdateButtons(VRControllerState& aControllerState,
+                                    ControllerInfo& aControllerInfo) {
+  mNumButtons = mNumAxes = 0;
+  // Button 0: Trigger
+  GetTriggerValueFromAction(aControllerState,
+                            aControllerInfo.mActionTrigger_Value);
+  // Button 1: Grip
+  GetButtonValueFromAction(aControllerState,
+                           aControllerInfo.mActionGrip_Pressed,
+                           aControllerInfo.mActionGrip_Touched);
+  // Button 2: Touchpad
+  GetButtonValueFromAction(aControllerState,
+                           aControllerInfo.mActionTrackpad_Pressed,
+                           aControllerInfo.mActionTrackpad_Touched);
+  // Button 3: Thumbstick.
+  GetButtonValueFromAction(aControllerState,
+                           aControllerInfo.mActionThumbstick_Pressed,
+                           aControllerInfo.mActionThumbstick_Touched);
+  // Button 4: Menu
+  GetButtonValueFromAction(aControllerState,
+                           aControllerInfo.mActionMenu_Pressed,
+                           aControllerInfo.mActionMenu_Touched);
+
+  // Compared to Edge, we have a wrong implementation for the vertical axis
+  // value. In order to not affect the current VR content, we add a workaround
+  // for yAxis.
+  // Axis 0, 1: Trackpad
+  GetAxisValueFromAction(aControllerState,
+                         aControllerInfo.mActionTrackpad_Analog, true);
+  // Axis 2, 3: Thumbstick
+  GetAxisValueFromAction(aControllerState,
+                         aControllerInfo.mActionThumbstick_Analog, true);
+
+  aControllerState.numButtons = mNumButtons;
+  aControllerState.numAxes = mNumAxes;
+}
+
+}  // namespace mozilla::gfx