Fixed bug in WebXRController Button Up/Down state.

Author: De-Panther

Packages/webxr/CHANGELOG.md

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- WebXRController Button Up/Down state.
 
 ## [0.5.0] - 2020-12-19
 ### Added

Packages/webxr/Runtime/Scripts/WebXRController.cs

@@ -196,51 +196,34 @@ public bool GetButton(ButtonTypes action)
       return buttonStates[action].pressed;
     }
 
-    private bool GetPastButtonState(ButtonTypes action)
-    {
-      if (!buttonStates.ContainsKey(action))
-        return false;
-      return buttonStates[action].prevPressedState;
-    }
-
     private void SetButtonState(ButtonTypes action, bool isPressed, float value)
     {
       if (buttonStates.ContainsKey(action))
       {
-        buttonStates[action].pressed = isPressed;
-        buttonStates[action].value = value;
+        buttonStates[action].UpdateState(isPressed, value);
       }
       else
         buttonStates.Add(action, new WebXRControllerButton(isPressed, value));
     }
 
-    private void SetPastButtonState(ButtonTypes action, bool isPressed)
-    {
-      if (!buttonStates.ContainsKey(action))
-        return;
-      buttonStates[action].prevPressedState = isPressed;
-    }
-
     public bool GetButtonDown(ButtonTypes action)
     {
       TryUpdateButtons();
-      if (GetButton(action) && !GetPastButtonState(action))
+      if (!buttonStates.ContainsKey(action))
       {
-        SetPastButtonState(action, true);
-        return true;
+        return false;
       }
-      return false;
+      return buttonStates[action].down;
     }
 
     public bool GetButtonUp(ButtonTypes action)
     {
       TryUpdateButtons();
-      if (!GetButton(action) && GetPastButtonState(action))
+      if (!buttonStates.ContainsKey(action))
       {
-        SetPastButtonState(action, false);
-        return true;
+        return false;
       }
-      return false;
+      return buttonStates[action].up;
     }
 
     public float GetButtonIndexValue(int index)

Packages/webxr/Runtime/Scripts/WebXRControllerData.cs

@@ -84,7 +84,8 @@ public class WebXRHitPoseData
     public Quaternion rotation;
   }
 
-  public enum WebXRControllerHand {
+  public enum WebXRControllerHand
+  {
     NONE = 0,
     LEFT = 1,
     RIGHT = 2
@@ -94,14 +95,41 @@ public enum WebXRControllerHand {
   public class WebXRControllerButton
   {
     public bool pressed;
-    public bool prevPressedState;
-    public bool touched;
+    public bool down;
+    public bool up;
     public float value;
 
     public WebXRControllerButton(bool isPressed, float buttonValue)
     {
+      down = false;
+      up = false;
+      pressed = isPressed;
+      value = buttonValue;
+    }
+
+    public void UpdateState(bool isPressed, float buttonValue)
+    {
+      if (isPressed && pressed) // nothing
+      {
+        down = false;
+        up = false;
+      }
+      else if (isPressed && !pressed) // up
+      {
+        down = true;
+        up = false;
+      }
+      else if (!isPressed && !pressed) // nothing
+      {
+        down = false;
+        up = false;
+      }
+      else if (!isPressed && pressed) // down
+      {
+        down = false;
+        up = true;
+      }
       pressed = isPressed;
-      prevPressedState = false;
       value = buttonValue;
     }
   }