Merge pull request #290 from Thaina/patch-1

fix typo and simplified boolean logic

Author: De-Panther

Packages/webxr/Runtime/Plugins/WebGL/webxr.jspre

@@ -995,8 +995,8 @@ setTimeout(function () {
         if (xrData.controllerA.updatedProfiles == 1 || xrData.controllerB.updatedProfiles == 1)
         {
           var inputProfiles = {};
-          inputProfiles.conrtoller1 = xrData.controllerA.profiles;
-          inputProfiles.conrtoller2 = xrData.controllerB.profiles;
+          inputProfiles.controller1 = xrData.controllerA.profiles;
+          inputProfiles.controller2 = xrData.controllerB.profiles;
           if (xrData.controllerA.updatedProfiles == 1)
           {
             xrData.controllerA.updatedProfiles = 2;

Packages/webxr/Runtime/Scripts/WebXRControllerData.cs

@@ -34,8 +34,8 @@ public class WebXRControllerData
   [System.Serializable]
   public class WebXRControllersProfiles
   {
-    public string[] conrtoller1;
-    public string[] conrtoller2;
+    public string[] controller1;
+    public string[] controller2;
   }
 
   public enum WebXRHandJoint
@@ -122,26 +122,9 @@ public WebXRControllerButton(bool isPressed, bool isTouched, float buttonValue)
 
     public void UpdateState(bool isPressed, bool isTouched, 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;
-      }
+      down = isPressed && !pressed;
+      up = !isPressed && pressed;
+
       pressed = isPressed;
       touched = isTouched;
       value = buttonValue;

Packages/webxr/Runtime/XRPlugin/WebXRSubsystem.cs

@@ -395,8 +395,8 @@ public void OnXRCapabilities(WebXRDisplayCapabilities cap)
 
     public void OnInputProfiles(WebXRControllersProfiles controllersProfiles)
     {
-      controller1.profiles = controllersProfiles.conrtoller1;
-      controller2.profiles = controllersProfiles.conrtoller2;
+      controller1.profiles = controllersProfiles.controller1;
+      controller2.profiles = controllersProfiles.controller2;
     }
 
     public void setXrState(WebXRState state, int viewsCount, Rect leftRect, Rect rightRect)