upgrade to unity 6.1
This commit is contained in:
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/Creators/HVRPhysicsLeverCreator.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -67,7 +67,7 @@ namespace HurricaneVR.Framework.Components
|
||||
if (test.x > StartPosition.x || test.y > StartPosition.y || test.z > StartPosition.z)
|
||||
{
|
||||
transform.localPosition = StartPosition;
|
||||
Rigidbody.velocity = Vector3.zero;
|
||||
Rigidbody.linearVelocity = Vector3.zero;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRButton.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRClimbable.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 123d9563fca44af1864835effb36ffbc
|
||||
timeCreated: 1600399646
|
||||
timeCreated: 1600399646
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRCollisionEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 59ef9bc5899042d588a09adb8a254aa9
|
||||
timeCreated: 1601145324
|
||||
timeCreated: 1601145324
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRControllerOffset.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ab72751261f74e5ebaa6986a0464cd15
|
||||
timeCreated: 1635035319
|
||||
timeCreated: 1635035319
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRControllerOffsets.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRDamageHandler.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRDamageHandlerBase.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRDamageProvider.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1d73b26c803e4bbb886b5776121804b2
|
||||
timeCreated: 1600231143
|
||||
timeCreated: 1600231143
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRDestroyListener.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 6751180565d247fba4285903a5b605aa
|
||||
timeCreated: 1601087539
|
||||
timeCreated: 1601087539
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRDestroyTimer.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 66f0a0ab295247a681b1b569944a2bf9
|
||||
timeCreated: 1599957568
|
||||
timeCreated: 1599957568
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRDestructible.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRDial.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2e5b279a1a044cee9d64e0ca5d85f175
|
||||
timeCreated: 1601039791
|
||||
timeCreated: 1601039791
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRDontDestroy.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 6c25cecd1cd34cd7a4346c955a0add93
|
||||
timeCreated: 1600204770
|
||||
timeCreated: 1600204770
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRGrabbableHoverBase.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRGrabbableImpactHaptics.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRHandImpactHaptics.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRHandPoseRecorder.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRImpactHaptics.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -33,7 +33,7 @@ namespace HurricaneVR.Framework.Components
|
||||
{
|
||||
if (!Rb) TryGetComponent(out Rb);
|
||||
|
||||
if (!Rb || Rb.velocity.sqrMagnitude < Data.SqrMagThreshold)
|
||||
if (!Rb || Rb.linearVelocity.sqrMagnitude < Data.SqrMagThreshold)
|
||||
return;
|
||||
|
||||
if (Time.realtimeSinceStartup - _lastHaptic < Data.Timeout)
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRImpactHapticsBase.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4e395cf0cf494656baa6b1eddceceb24
|
||||
timeCreated: 1600542387
|
||||
timeCreated: 1600542387
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRLever.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRMeshGlowHighlight.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRMeshRendererHighlight.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b06dd533ee37487db0603f3b328f972f
|
||||
timeCreated: 1602523768
|
||||
timeCreated: 1602523768
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRParentOnStart.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRPhysicsButton.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRPhysicsDial.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRPhysicsDoor.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRPhysicsDrawer.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRPhysicsLever.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRRigidBodyOverrides.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRRigidbodyLocker.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 3f12566bd4f6404580f543211008456c
|
||||
timeCreated: 1600292559
|
||||
timeCreated: 1600292559
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRRingHighlight.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRRotationLimiter.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRRotationSFX.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRRotationTracker.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 74b910c8c3f34ee5bb44c0358f637ecc
|
||||
timeCreated: 1600274255
|
||||
timeCreated: 1600274255
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRScaleHighlight.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 5f52676b29554048a64664a7a53a126e
|
||||
timeCreated: 1601260700
|
||||
timeCreated: 1601260700
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRThrowingCenterOfMass.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/HVRTwoHandStrength.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
using UnityEngine;
|
||||
|
||||
namespace HurricaneVR.Framework.Components
|
||||
{
|
||||
public interface IGunHitHandler
|
||||
{
|
||||
void HandleHit(HVRDamageProvider damageProvider, RaycastHit hit, Vector3 direction);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 879d1acc192e475e8754da57d52f1d1c
|
||||
timeCreated: 1740687877
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Components/IGunHitHandler.cs
|
||||
uploadId: 736929
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/HVRControllerEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/HVRGlobalInputs.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 0a934dfe7ddf4fb2a1ec98943c4bcd57
|
||||
timeCreated: 1604448529
|
||||
timeCreated: 1604448529
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/HVRInputAction.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -263,7 +263,6 @@ namespace HurricaneVR.Framework.ControllerInput
|
||||
return false;
|
||||
|
||||
#if USING_XR_MANAGEMENT
|
||||
|
||||
//https://forum.unity.com/threads/commonusages-userpresence-doesnt-report-correctly.818766/
|
||||
//this features requires XR Management
|
||||
//might be active but not rendering due to headset not on
|
||||
@@ -285,7 +284,7 @@ namespace HurricaneVR.Framework.ControllerInput
|
||||
//https://docs.unity3d.com/ScriptReference/XR.XRDevice-isPresent.html
|
||||
|
||||
_displaySubsystems.Clear();
|
||||
SubsystemManager.GetInstances<XRDisplaySubsystem>(_displaySubsystems);
|
||||
SubsystemManager.GetSubsystems<XRDisplaySubsystem>(_displaySubsystems);
|
||||
foreach (var xrDisplay in _displaySubsystems)
|
||||
{
|
||||
if (xrDisplay.running)
|
||||
@@ -890,15 +889,14 @@ namespace HurricaneVR.Framework.ControllerInput
|
||||
if (isXRPlugin)
|
||||
{
|
||||
var loader = XRPluginLoader.ToLower();
|
||||
if (loader == OculusLoader.ToLower())
|
||||
var loaderNoSpace = loader.Replace(" ", "");
|
||||
if (loader == OculusLoader.ToLower() || loaderNoSpace == OculusLoader.ToLower().Replace(" ", ""))
|
||||
{
|
||||
CurrentSDK = UseOVRInputs ? InputSDK.Oculus : InputSDK.XRInput;
|
||||
return;
|
||||
}
|
||||
|
||||
#if ENABLE_INPUT_SYSTEM
|
||||
var loaderNoSpace = loader.Replace(" ", "");
|
||||
|
||||
if (loader == OpenXRLoader.ToLower() || loaderNoSpace == OpenXRLoader.ToLower().Replace(" ", ""))
|
||||
{
|
||||
CurrentSDK = InputSDK.InputSystem;
|
||||
@@ -906,7 +904,7 @@ namespace HurricaneVR.Framework.ControllerInput
|
||||
}
|
||||
#endif
|
||||
|
||||
if (loader == OpenVRLoader.ToLower())
|
||||
if (loader == OpenVRLoader.ToLower() || loaderNoSpace == OpenVRLoader.ToLower().Replace(" ", ""))
|
||||
{
|
||||
if (!steamvrFound)
|
||||
{
|
||||
@@ -981,7 +979,6 @@ namespace HurricaneVR.Framework.ControllerInput
|
||||
private void CheckXRStatus()
|
||||
{
|
||||
#if USING_XR_MANAGEMENT
|
||||
|
||||
VRPlugin = VRMode.XRPlugin;
|
||||
|
||||
XRPluginLoader = XRGeneralSettings.Instance.Manager.activeLoader?.name ?? "";
|
||||
@@ -993,7 +990,7 @@ namespace HurricaneVR.Framework.ControllerInput
|
||||
#else
|
||||
loaders = string.Join(",", XRGeneralSettings.Instance.Manager.loaders.Select(e => e.name));
|
||||
#endif
|
||||
//Debug.Log($"{XRGeneralSettings.Instance.Manager.automaticLoading}");
|
||||
Debug.Log($"{XRGeneralSettings.Instance.Manager.automaticLoading}");
|
||||
Debug.Log($"XRGeneralSettings.Instance.Manager.isInitializationComplete {XRGeneralSettings.Instance.Manager.isInitializationComplete}");
|
||||
Debug.Log($"XRPlugin Detected | XRSettings.enabled {XRSettings.enabled} | Loader : {XRPluginLoader} | Loaders Enabled: {loaders}");
|
||||
|
||||
@@ -1198,7 +1195,7 @@ namespace HurricaneVR.Framework.ControllerInput
|
||||
|
||||
#if USING_XR_MANAGEMENT
|
||||
var subsystems = new List<XRInputSubsystem>();
|
||||
SubsystemManager.GetInstances<XRInputSubsystem>(subsystems);
|
||||
SubsystemManager.GetSubsystems<XRInputSubsystem>(subsystems);
|
||||
Debug.Log("Found " + subsystems.Count + " input subsystems.");
|
||||
|
||||
for (int i = 0; i < subsystems.Count; i++)
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 94e2703aa70f47be808cc7d516fced77
|
||||
timeCreated: 1600342873
|
||||
timeCreated: 1600342873
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/HVRInputManager.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/HVRInputSystemController.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 7033fdbdef534aeaaad3c868224922db
|
||||
timeCreated: 1718677714
|
||||
timeCreated: 1718677714
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/HVROpenXRFingerCurls.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f258b67bcfea4b9782cfcdcd54058670
|
||||
timeCreated: 1603043879
|
||||
timeCreated: 1603043879
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/HVRPlayerInputs.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 44ea0e34f99846a4824b42b44d2e35cd
|
||||
timeCreated: 1600355474
|
||||
timeCreated: 1600355474
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/HVRTrackedController.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 783ea3a1358f4960b7aafcc2c2778559
|
||||
timeCreated: 1597711347
|
||||
timeCreated: 1597711347
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/HVRXRInputController.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputEvents/HVRGripButtonEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputEvents/HVRJoystickButtonEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputEvents/HVRJoystickTouchEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputEvents/HVRMenuButtonEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputEvents/HVRPrimaryButtonEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputEvents/HVRPrimaryTouchButtonEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputEvents/HVRSecondaryButtonEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputEvents/HVRSecondaryTouchButtonEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputEvents/HVRThumbTouchEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputEvents/HVRTrackPadDownEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputEvents/HVRTrackPadLeftEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputEvents/HVRTrackPadRightEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputEvents/HVRTrackPadTouchEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputEvents/HVRTrackPadUpEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputEvents/HVRTrackpadButtonEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputEvents/HVRTriggerButtonEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputEvents/HVRTriggerTouchEvents.cs
|
||||
uploadId: 736929
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputSystem/HVRInputActions.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -12,3 +12,10 @@ ScriptedImporter:
|
||||
wrapperCodePath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputSystem/HVRInputActions.cs
|
||||
wrapperClassName:
|
||||
wrapperCodeNamespace:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputSystem/HVRInputActions.inputactions
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 590ae77d131f4448894cbe1df6373c2b
|
||||
timeCreated: 1635272558
|
||||
timeCreated: 1635272558
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputSystem/HVRTrackedPoseDriver.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ee407dd0e26344b884367d0f6d4a806f
|
||||
timeCreated: 1598308977
|
||||
timeCreated: 1598308977
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/Bags/HVRForceGrabberBag.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2fb655091c7347beb9e915d00e497747
|
||||
timeCreated: 1596346935
|
||||
timeCreated: 1596346935
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/Bags/HVRGrabbableBag.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c9592152fa64433fa0a6766a74007789
|
||||
timeCreated: 1599789992
|
||||
timeCreated: 1599789992
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/Bags/HVRSocketBag.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: e55483a495124baab45ceb8df9a68da9
|
||||
timeCreated: 1596346950
|
||||
timeCreated: 1596346950
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/Bags/HVRTriggerGrabbableBag.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 5969b23a56534b28b24c515e2b1826d9
|
||||
timeCreated: 1601444721
|
||||
timeCreated: 1601444721
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/GrabPointMeta.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/Grabbers/HVRCloneDelete.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -391,14 +391,14 @@ namespace HurricaneVR.Framework.Core.Grabbers
|
||||
public IEnumerator ForcePull(HVRGrabbable grabbable)
|
||||
{
|
||||
var rb = grabbable.Rigidbody;
|
||||
var angularDrag = rb.angularDrag;
|
||||
var angularDrag = rb.angularDamping;
|
||||
var com = rb.centerOfMass;
|
||||
var drag = rb.drag;
|
||||
var drag = rb.linearDamping;
|
||||
|
||||
HandGrabber.DisableHandCollision(grabbable);
|
||||
|
||||
rb.angularDrag = 0f;
|
||||
rb.drag = 0f;
|
||||
rb.angularDamping = 0f;
|
||||
rb.linearDamping = 0f;
|
||||
|
||||
IsHoldActive = true;
|
||||
|
||||
@@ -471,13 +471,13 @@ namespace HurricaneVR.Framework.Core.Grabbers
|
||||
if (isPhysicsGrab && distance < DynamicGrabThreshold && HandGrabber.TryTransferDistanceGrab(grabbable, posableGrabPoint))
|
||||
{
|
||||
rb.angularVelocity = Vector3.zero;
|
||||
rb.velocity = Vector3.zero;
|
||||
rb.linearVelocity = Vector3.zero;
|
||||
break;
|
||||
}
|
||||
|
||||
var invDt = 1f / Time.fixedDeltaTime;
|
||||
var targetVel = HandGrabber.Rigidbody.velocity;
|
||||
var velocity = rb.velocity;
|
||||
var targetVel = HandGrabber.Rigidbody.linearVelocity;
|
||||
var velocity = rb.linearVelocity;
|
||||
var mass = rb.mass;
|
||||
|
||||
var desiredVel = Vector3.ClampMagnitude(delta * invDt, settings.MaxSpeed);
|
||||
@@ -489,7 +489,7 @@ namespace HurricaneVR.Framework.Core.Grabbers
|
||||
var gravityForce = rb.useGravity ? -Physics.gravity * (mass * settings.CounterGravityFactor) : Vector3.zero;
|
||||
|
||||
rb.AddForce(force + gravityForce);
|
||||
rb.velocity = Vector3.Lerp(velocity, targetVel, dampMulti * settings.DampSpeed * Time.fixedDeltaTime);
|
||||
rb.linearVelocity = Vector3.Lerp(velocity, targetVel, dampMulti * settings.DampSpeed * Time.fixedDeltaTime);
|
||||
|
||||
if (needsRotating && !rotating)
|
||||
{
|
||||
@@ -542,9 +542,9 @@ namespace HurricaneVR.Framework.Core.Grabbers
|
||||
|
||||
if (grabbable)
|
||||
{
|
||||
rb.angularDrag = angularDrag;
|
||||
rb.drag = drag;
|
||||
rb.velocity = Vector3.ClampMagnitude(rb.velocity, settings.MaxMissSpeed);
|
||||
rb.angularDamping = angularDrag;
|
||||
rb.linearDamping = drag;
|
||||
rb.linearVelocity = Vector3.ClampMagnitude(rb.linearVelocity, settings.MaxMissSpeed);
|
||||
rb.angularVelocity = Vector3.ClampMagnitude(rb.angularVelocity, settings.MaxMissAngularSpeed);
|
||||
rb.centerOfMass = com;
|
||||
|
||||
@@ -556,7 +556,7 @@ namespace HurricaneVR.Framework.Core.Grabbers
|
||||
if (HandGrabber.TryTransferDistanceGrab(grabbable, posableGrabPoint))
|
||||
{
|
||||
rb.angularVelocity = Vector3.zero;
|
||||
rb.velocity = Vector3.zero;
|
||||
rb.linearVelocity = Vector3.zero;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -584,8 +584,8 @@ namespace HurricaneVR.Framework.Core.Grabbers
|
||||
var posableGrabPoint = grabPoint.GetComponent<HVRPosableGrabPoint>();
|
||||
|
||||
var rb = grabbable.Rigidbody;
|
||||
var drag = rb.drag;
|
||||
var angularDrag = rb.angularDrag;
|
||||
var drag = rb.linearDamping;
|
||||
var angularDrag = rb.angularDamping;
|
||||
var useGrav = rb.useGravity;
|
||||
|
||||
try
|
||||
@@ -597,8 +597,8 @@ namespace HurricaneVR.Framework.Core.Grabbers
|
||||
|
||||
|
||||
grabbable.Rigidbody.useGravity = false;
|
||||
grabbable.Rigidbody.drag = 0f;
|
||||
grabbable.Rigidbody.angularDrag = 0f;
|
||||
grabbable.Rigidbody.linearDamping = 0f;
|
||||
grabbable.Rigidbody.angularDamping = 0f;
|
||||
|
||||
fts.solve_ballistic_arc_lateral(false,
|
||||
grabPoint.position,
|
||||
@@ -608,7 +608,7 @@ namespace HurricaneVR.Framework.Core.Grabbers
|
||||
out var velocity,
|
||||
out var gravity);
|
||||
|
||||
grabbable.Rigidbody.velocity = velocity;
|
||||
grabbable.Rigidbody.linearVelocity = velocity;
|
||||
|
||||
var elapsed = 0f;
|
||||
|
||||
@@ -650,8 +650,8 @@ namespace HurricaneVR.Framework.Core.Grabbers
|
||||
if (percentTime < .3) _grabbableCollided = false;
|
||||
else if (_grabbableCollided)
|
||||
{
|
||||
if (grabbable.Rigidbody.velocity.magnitude > MaximumVelocityPostCollision)
|
||||
grabbable.Rigidbody.velocity = grabbable.Rigidbody.velocity.normalized * MaximumVelocityPostCollision;
|
||||
if (grabbable.Rigidbody.linearVelocity.magnitude > MaximumVelocityPostCollision)
|
||||
grabbable.Rigidbody.linearVelocity = grabbable.Rigidbody.linearVelocity.normalized * MaximumVelocityPostCollision;
|
||||
ForceRelease();
|
||||
//Debug.Log($"Collided while force grabbing.");
|
||||
break;
|
||||
@@ -688,7 +688,7 @@ namespace HurricaneVR.Framework.Core.Grabbers
|
||||
JointAnchorWorldPosition.y + yExtra,
|
||||
out velocity, out gravity);
|
||||
|
||||
grabbable.Rigidbody.velocity = velocity;
|
||||
grabbable.Rigidbody.linearVelocity = velocity;
|
||||
grabbable.Rigidbody.AddForce(-Vector3.up * gravity, ForceMode.Acceleration);
|
||||
|
||||
if (needsRotating)
|
||||
@@ -720,7 +720,7 @@ namespace HurricaneVR.Framework.Core.Grabbers
|
||||
if (grabbed)
|
||||
{
|
||||
rb.angularVelocity = Vector3.zero;
|
||||
rb.velocity = Vector3.zero;
|
||||
rb.linearVelocity = Vector3.zero;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -732,8 +732,8 @@ namespace HurricaneVR.Framework.Core.Grabbers
|
||||
if (grabbable)
|
||||
{
|
||||
rb.useGravity = useGrav;
|
||||
rb.drag = drag;
|
||||
rb.angularDrag = angularDrag;
|
||||
rb.linearDamping = drag;
|
||||
rb.angularDamping = angularDrag;
|
||||
grabbable.Collided.RemoveListener(OnGrabbableCollided);
|
||||
grabbable.Grabbed.RemoveListener(OnGrabbableGrabbed);
|
||||
}
|
||||
@@ -763,8 +763,8 @@ namespace HurricaneVR.Framework.Core.Grabbers
|
||||
var elapsed = 0f;
|
||||
while (grabbable && elapsed < AdditionalAutoGrabTime && !grabbable.IsBeingHeld)
|
||||
{
|
||||
if (grabbable.Rigidbody.velocity.magnitude > MaximumVelocityAutoGrab)
|
||||
grabbable.Rigidbody.velocity *= .9f;
|
||||
if (grabbable.Rigidbody.linearVelocity.magnitude > MaximumVelocityAutoGrab)
|
||||
grabbable.Rigidbody.linearVelocity *= .9f;
|
||||
|
||||
|
||||
if ((JointAnchorWorldPosition - t.position).magnitude < AutoGrabDistance)
|
||||
@@ -772,7 +772,7 @@ namespace HurricaneVR.Framework.Core.Grabbers
|
||||
if (HandGrabber.TryTransferDistanceGrab(grabbable, grabPoint))
|
||||
{
|
||||
grabbable.Rigidbody.angularVelocity = Vector3.zero;
|
||||
grabbable.Rigidbody.velocity = Vector3.zero;
|
||||
grabbable.Rigidbody.linearVelocity = Vector3.zero;
|
||||
grabbed = true;
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 82a1b90bd6e7417ca9833e08bd4a1ec3
|
||||
timeCreated: 1598243548
|
||||
timeCreated: 1598243548
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/Grabbers/HVRForceGrabber.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 59d0d668c7d045f0914e86e73f332a4f
|
||||
timeCreated: 1596310217
|
||||
timeCreated: 1596310217
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/Grabbers/HVRGrabberBase.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/Grabbers/HVRHandGrabOnStart.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1348,7 +1348,7 @@ namespace HurricaneVR.Framework.Core.Grabbers
|
||||
angle *= Mathf.Deg2Rad;
|
||||
var angularVelocity = axis * (angle * (1.0f / Time.fixedDeltaTime));
|
||||
|
||||
RecentVelocities.Enqueue(Rigidbody.velocity);
|
||||
RecentVelocities.Enqueue(Rigidbody.linearVelocity);
|
||||
RecentAngularVelocities.Enqueue(angularVelocity);
|
||||
|
||||
if (PlayerController)
|
||||
@@ -2638,11 +2638,11 @@ namespace HurricaneVR.Framework.Core.Grabbers
|
||||
{
|
||||
var throwVelocity = ComputeThrowVelocity(grabbable, out var angularVelocity);
|
||||
if(!throwVelocity.IsInvalid())
|
||||
grabbable.Rigidbody.velocity = throwVelocity;
|
||||
grabbable.Rigidbody.linearVelocity = throwVelocity;
|
||||
if(!throwVelocity.IsInvalid())
|
||||
grabbable.Rigidbody.angularVelocity = angularVelocity;
|
||||
//prevent clipping on throw
|
||||
if (timeout < .2f && grabbable.Rigidbody.velocity.magnitude > 2f) timeout = .2f;
|
||||
if (timeout < .2f && grabbable.Rigidbody.linearVelocity.magnitude > 2f) timeout = .2f;
|
||||
}
|
||||
|
||||
if (!IgnoreNextCollisionCheck)
|
||||
@@ -2970,7 +2970,7 @@ namespace HurricaneVR.Framework.Core.Grabbers
|
||||
return false;
|
||||
}
|
||||
|
||||
grabbable.Rigidbody.velocity = Vector3.zero;
|
||||
grabbable.Rigidbody.linearVelocity = Vector3.zero;
|
||||
grabbable.Rigidbody.angularVelocity = Vector3.zero;
|
||||
|
||||
if (grabPoint) GrabPoint = grabPoint.transform;
|
||||
@@ -3128,7 +3128,7 @@ namespace HurricaneVR.Framework.Core.Grabbers
|
||||
GrabbedTarget.transform.rotation = HandModel.rotation * startRot * Quaternion.AngleAxis(angle * elapsed / time, axis.GetVector());
|
||||
GrabbedTarget.transform.position = HandModel.transform.TransformPoint(Vector3.Lerp(startPos, targetPos, elapsed / time));
|
||||
if (GrabbedTarget.Rigidbody)
|
||||
GrabbedTarget.Rigidbody.velocity = GrabbedTarget.Rigidbody.angularVelocity = Vector3.zero;
|
||||
GrabbedTarget.Rigidbody.linearVelocity = GrabbedTarget.Rigidbody.angularVelocity = Vector3.zero;
|
||||
elapsed += Time.deltaTime;
|
||||
yield return null;
|
||||
}
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/Grabbers/HVRHandGrabber.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -588,7 +588,7 @@ namespace HurricaneVR.Framework.Core.Grabbers
|
||||
{
|
||||
case SocketHoldType.Kinematic:
|
||||
{
|
||||
grabbable.Rigidbody.velocity = Vector3.zero;
|
||||
grabbable.Rigidbody.linearVelocity = Vector3.zero;
|
||||
grabbable.Rigidbody.angularVelocity = Vector3.zero;
|
||||
grabbable.Rigidbody.collisionDetectionMode = CollisionDetectionMode.ContinuousSpeculative;
|
||||
grabbable.Rigidbody.isKinematic = true;
|
||||
@@ -601,8 +601,8 @@ namespace HurricaneVR.Framework.Core.Grabbers
|
||||
_hadRigidBody = true;
|
||||
_rbMass = grabbable.Rigidbody.mass;
|
||||
_rbGravity = grabbable.Rigidbody.useGravity;
|
||||
_rbDrag = grabbable.Rigidbody.drag;
|
||||
_rbAngularDrag = grabbable.Rigidbody.angularDrag;
|
||||
_rbDrag = grabbable.Rigidbody.linearDamping;
|
||||
_rbAngularDrag = grabbable.Rigidbody.angularDamping;
|
||||
|
||||
if (Rigidbody)
|
||||
{
|
||||
@@ -635,8 +635,8 @@ namespace HurricaneVR.Framework.Core.Grabbers
|
||||
|
||||
rb.useGravity = _rbGravity;
|
||||
rb.mass = _rbMass;
|
||||
rb.drag = _rbDrag;
|
||||
rb.angularDrag = _rbAngularDrag;
|
||||
rb.linearDamping = _rbDrag;
|
||||
rb.angularDamping = _rbAngularDrag;
|
||||
}
|
||||
|
||||
if (rb)
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/Grabbers/HVRSocket.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/Grabbers/HVRSocketContainerGrabber.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1d7e99ffe74c473aab93a12e849053f0
|
||||
timeCreated: 1603423829
|
||||
timeCreated: 1603423829
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/HVRAssemblyInfo.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/HVRForceGrabberLaser.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 9cf9028b057d4b7db0423f5d0a26074b
|
||||
timeCreated: 1674090737
|
||||
timeCreated: 1674090737
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/HVRGrabHandFilter.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/HVRGrabPoints.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1323,7 +1323,7 @@ namespace HurricaneVR.Framework.Core
|
||||
|
||||
if (Rigidbody)
|
||||
{
|
||||
_recentVelocities.Enqueue(Rigidbody.velocity);
|
||||
_recentVelocities.Enqueue(Rigidbody.linearVelocity);
|
||||
}
|
||||
|
||||
_recentAngularVelocities.Enqueue(angularVelocity);
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/HVRGrabbable.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/HVRGrabbableChild.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 511b6afc52cd40c889e42589b4d724c0
|
||||
timeCreated: 1603249821
|
||||
timeCreated: 1603249821
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/HVRGrabberManager.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/HVRHandGrabEvent.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 8bef30b910ae46c4acd561544cc1e389
|
||||
timeCreated: 1674090329
|
||||
timeCreated: 1674090329
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/HVRHandGrabFilter.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -9,3 +9,10 @@ MonoImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/HVRHandPhysics.cs
|
||||
uploadId: 736929
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: e342e34c74884f399b6b418e8b6b9273
|
||||
timeCreated: 1666497596
|
||||
timeCreated: 1666497596
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 177300
|
||||
packageName: Hurricane VR - Physics Interaction Toolkit
|
||||
packageVersion: 2.9.3.a
|
||||
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/HVRLinkedSocketable.cs
|
||||
uploadId: 736929
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user