NEW HVR 2.9.1f

2023-03-25 03:17:58 +03:00
parent f0bf64ed45
commit 91acc4d728
243 changed files with 16657 additions and 11137 deletions
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using HurricaneVR.Framework.ControllerInput;
 using HurricaneVR.Framework.Core;
 using HurricaneVR.Framework.Shared.Utilities;
 using UnityEngine;
@@ -199,7 +200,8 @@ namespace HurricaneVR.Framework.Shared
                    SecondaryTouchButtonState.Active,
                    TrackPadTouchState.Active,
                    JoystickTouchState.Active,
-                    Knuckles);
+                    Knuckles,
+                    HVRInputManager.Instance.IsOpenXR);
            }
        }

@@ -497,6 +499,7 @@ namespace HurricaneVR.Framework.Shared
        Vive,
        Knuckles,
        Cosmos,
-        ReverbG2
+        ReverbG2,
+		Pico
    }
 }
@@ -1,4 +1,5 @@
 using System;
+using HurricaneVR.Framework.ControllerInput;
 using UnityEngine;

 namespace HurricaneVR.Framework.Shared
@@ -59,7 +60,7 @@ namespace HurricaneVR.Framework.Shared
        public float PinkyTotal => JoystickTouchWeight.Pinky + TrackpadTouchWeight.Pinky + PrimaryTouchWeight.Pinky + SecondaryTouchWeight.Pinky +
                                   TriggerTouchWeight.Pinky + GripWeight.Pinky + TriggerWeight.Pinky;

-        public void Evaluate(float[] curls, float grip, float trigger, bool triggerTouch, bool primaryTouch, bool secondaryTouch, bool trackpadTouch, bool joystickTouch, bool knuckles)
+        public void Evaluate(float[] curls, float grip, float trigger, bool triggerTouch, bool primaryTouch, bool secondaryTouch, bool trackpadTouch, bool joystickTouch, bool knuckles, bool isOpenXR)
        {
            var joystick = joystickTouch ? 1f : 0f;
            var trackPad = trackpadTouch ? 1f : 0f;
@@ -83,7 +84,8 @@ namespace HurricaneVR.Framework.Shared
                          GripWeight.Index * grip +
                          TriggerWeight.Index * trigger;

-            if (!knuckles || KnucklesOverrideGripFingers)
+            //until openxr has index finger curls supplied (if ever..)
+            if (!knuckles || (KnucklesOverrideGripFingers || isOpenXR))
            {
                curls[2] = JoystickTouchWeight.Middle * joystick +
                           TrackpadTouchWeight.Middle * trackPad +