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
@@ -6,20 +6,32 @@ namespace HurricaneVR.TechDemo.Scripts
 {
    public class DemoHolster : HVRSocket
    {
-        protected override Quaternion GetRotationOffset(HVRGrabbable grabbable)
+        public override Vector3 GetTargetPosition(HVRGrabbable grabbable)
        {
-            var orientation = grabbable.GetComponent<DemoHolsterOrientation>();
-            if (orientation && orientation.Orientation)
-                return orientation.Orientation.localRotation;
-            return base.GetRotationOffset(grabbable);
+            if (grabbable.TryGetComponent(out DemoHolsterOrientation orientation))
+            {
+                var offSet = -orientation.Orientation.localPosition;
+                var delta = Quaternion.Inverse(orientation.Orientation.localRotation);
+                offSet = delta * offSet;
+
+                offSet.x *= grabbable.transform.localScale.x;
+                offSet.y *= grabbable.transform.localScale.y;
+                offSet.z *= grabbable.transform.localScale.z;
+
+                return offSet;
+            }
+
+            return base.GetTargetPosition(grabbable);
        }

-        protected override Vector3 GetPositionOffset(HVRGrabbable grabbable)
+        public override Quaternion GetTargetRotation(HVRGrabbable grabbable)
        {
-            var orientation = grabbable.GetComponent<DemoHolsterOrientation>();
-            if (orientation && orientation.Orientation)
-                return orientation.Orientation.localPosition;
-            return base.GetPositionOffset(grabbable);
+            if (grabbable.TryGetComponent(out DemoHolsterOrientation orientation))
+            {
+                return Quaternion.Inverse(orientation.Orientation.localRotation);
+            }
+            
+            return base.GetTargetRotation(grabbable);
        }
    }
 }
@@ -117,7 +117,7 @@ namespace HurricaneVR.TechDemo.Scripts
        {
            var index = (int)Inputs.ForceGrabActivation;
            index++;
-            if (index > 1)
+            if (index > (int)HVRForceGrabActivation.GripOrTrigger)
            {
                index = 0;
            }