upgrade to unity 6.1

This commit is contained in:
2025-07-17 15:57:56 +02:00
parent 702b766981
commit eea0e3ffad
1167 changed files with 62538 additions and 8659 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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;
}

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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;
}

View File

@@ -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

View File

@@ -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)

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -1323,7 +1323,7 @@ namespace HurricaneVR.Framework.Core
if (Rigidbody)
{
_recentVelocities.Enqueue(Rigidbody.velocity);
_recentVelocities.Enqueue(Rigidbody.linearVelocity);
}
_recentAngularVelocities.Enqueue(angularVelocity);

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 923ec526580e484ca0d4716c43ccccc8
timeCreated: 1600302382
timeCreated: 1600302382
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/HVRManager.cs
uploadId: 736929

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 3ed6e70729ed4913846a8b06675e1581
timeCreated: 1602191380
timeCreated: 1602191380
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/HVRPhysicsGrabbable.cs
uploadId: 736929

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: bbf858a0f4504aa4adf9207e33864cfe
timeCreated: 1604714079
timeCreated: 1604714079
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/HVRRequireOtherGrabbable.cs
uploadId: 736929

View File

@@ -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/HVRSettings.cs
uploadId: 736929

View File

@@ -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/HVRSocketLink.cs
uploadId: 736929

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: aa807b4a09a146cd984c5554578977a7
timeCreated: 1597000245
timeCreated: 1597000245
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/HandPoser/Data/HVRHandPoseData.cs
uploadId: 736929

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 6cdb877408734211b200721827ec211f
timeCreated: 1597000264
timeCreated: 1597000264
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/HandPoser/Data/HVRPosableBoneData.cs
uploadId: 736929

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 01072954f48f4b5ebb2286e938a452f8
timeCreated: 1597000256
timeCreated: 1597000256
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/HandPoser/Data/HVRPosableFingerData.cs
uploadId: 736929

View File

@@ -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/HandPoser/Data/HVRRuntimePosesData.cs
uploadId: 736929

View File

@@ -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/HandPoser/HVRAnimationParameters.cs
uploadId: 736929

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: bb138fd2e7814b38be218571e904049c
timeCreated: 1635052804
timeCreated: 1635052804
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/HandPoser/HVRGrabPointSwapper.cs
uploadId: 736929

View File

@@ -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/HandPoser/HVRHandAnimator.cs
uploadId: 736929

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: becb07c7d7e24b889e62802a34e26d48
timeCreated: 1606578207
timeCreated: 1606578207
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/HandPoser/HVRHandMirrorSettings.cs
uploadId: 736929

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 79648a050a4a4121bb4329449344e118
timeCreated: 1637797213
timeCreated: 1637797213
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/HandPoser/HVRHandMirrorer.cs
uploadId: 736929

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: dc30735a6f974fda88a33f70e2b17a3b
timeCreated: 1596957987
timeCreated: 1596957987
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/HandPoser/HVRHandPose.cs
uploadId: 736929

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 4c0ffcacdaf04dc59ce5bad65e3d452e
timeCreated: 1597029386
timeCreated: 1597029386
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/HandPoser/HVRHandPoseBlend.cs
uploadId: 736929

View File

@@ -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/HandPoser/HVRHandPoseRecorder.cs
uploadId: 736929

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 96d1b667b6234620a01e126539c3f6d8
timeCreated: 1596897615
timeCreated: 1596897615
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/HandPoser/HVRHandPoser.cs
uploadId: 736929

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 364f55a0f60644beb4e906f6db185d28
timeCreated: 1661135657
timeCreated: 1661135657
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/HandPoser/HVRHandTrigger.cs
uploadId: 736929

View File

@@ -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/HandPoser/HVRIKTargets.cs
uploadId: 736929

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 0afd8501793f4c08903068b0bdc79809
timeCreated: 1597718496
timeCreated: 1597718496
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/HandPoser/HVRPhysicsPoser.cs
uploadId: 736929

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 79cd113ec3a24073b5bab8cbfb533d1e
timeCreated: 1597627021
timeCreated: 1597627021
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/HandPoser/HVRPosableGrabPoint.cs
uploadId: 736929

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: a32cc63482144afa9752d0981ca1e93f
timeCreated: 1596915409
timeCreated: 1596915409
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/HandPoser/HVRPosableHand.cs
uploadId: 736929

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 81ed24babdf5471dbf0b20a8d9f02ba1
timeCreated: 1661109513
timeCreated: 1661109513
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/HandPoser/HVRPoseZone.cs
uploadId: 736929

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: d2c9568b7cab450d9687b8b607c93867
timeCreated: 1603040352
timeCreated: 1603040352
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/Player/HVRCamera.cs
uploadId: 736929

View File

@@ -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/Player/HVRCameraRig.cs
uploadId: 736929

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: bf09ab92679f4a018fef9dba9dc51697
timeCreated: 1602444300
timeCreated: 1602444300
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/Player/HVRCanvasFade.cs
uploadId: 736929

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: db95619e91bf4fb981b3b0352fed7dcd
timeCreated: 1602126538
timeCreated: 1602126538
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/Player/HVRGhostHand.cs
uploadId: 736929

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: b376a839e854430e8a3844fbbcf5658a
timeCreated: 1604120984
timeCreated: 1604120984
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/Player/HVRGlobalFadeFinder.cs
uploadId: 736929

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: f47602f0c2d040e8af5e9f9d7832b6a0
timeCreated: 1637532480
timeCreated: 1637532480
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/Player/HVRHandStrengthHandler.cs
uploadId: 736929

View File

@@ -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/Player/HVRHeadCollision.cs
uploadId: 736929

View File

@@ -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/Player/HVRInvalidTeleport.cs
uploadId: 736929

View File

@@ -185,7 +185,7 @@ namespace HurricaneVR.Framework.Core.Player
while (count < 100)
{
yield return new WaitForFixedUpdate();
RigidBody.velocity = Vector3.zero;
RigidBody.linearVelocity = Vector3.zero;
RigidBody.angularVelocity = Vector3.zero;
transform.position = Target.position;
count++;

View File

@@ -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/Player/HVRJointHand.cs
uploadId: 736929

View File

@@ -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/Player/HVRPhysicsHands.cs
uploadId: 736929

View File

@@ -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/Player/HVRPlayerController.cs
uploadId: 736929

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: d356a43630de4cbe85e0eb08d23cb76b
timeCreated: 1606834640
timeCreated: 1606834640
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/Player/HVRPlayerWaist.cs
uploadId: 736929

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: e3a136a7446f490f8b8ea029750f54f7
timeCreated: 1602444281
timeCreated: 1602444281
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/Player/HVRScreenFade.cs
uploadId: 736929

View File

@@ -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/Player/HVRTeleportCollisonHandler.cs
uploadId: 736929

View File

@@ -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/Player/HVRTeleportMarker.cs
uploadId: 736929

View File

@@ -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/Player/HVRTeleportMarkerBase.cs
uploadId: 736929

View File

@@ -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/Player/HVRTeleportOptions.cs
uploadId: 736929

View File

@@ -991,8 +991,8 @@ namespace HurricaneVR.Framework.Core.Player
var leftGrabbable = LeftHand.GrabbedTarget;
var rightGrabbable = RightHand.GrabbedTarget;
_leftVel = LeftHand.Rigidbody.velocity;
_rightVel = RightHand.Rigidbody.velocity;
_leftVel = LeftHand.Rigidbody.linearVelocity;
_rightVel = RightHand.Rigidbody.linearVelocity;
_leftHeldVel = Vector3.zero;
_rightHeldVel = Vector3.zero;
@@ -1000,8 +1000,8 @@ namespace HurricaneVR.Framework.Core.Player
var lrb = leftGrabbable ? leftGrabbable.Rigidbody : null;
var rrb = rightGrabbable ? rightGrabbable.Rigidbody : null;
if (lrb) _leftHeldVel = lrb.velocity;
if (rrb) _rightHeldVel = rrb.velocity;
if (lrb) _leftHeldVel = lrb.linearVelocity;
if (rrb) _rightHeldVel = rrb.linearVelocity;
//execute last, hand will disable itself in it's event handler
BeforeDashTeleport.Invoke(FeetPosition);
@@ -1020,10 +1020,10 @@ namespace HurricaneVR.Framework.Core.Player
var lrb = leftGrabbable ? leftGrabbable.Rigidbody : null;
var rrb = rightGrabbable ? rightGrabbable.Rigidbody : null;
LeftHand.Rigidbody.velocity = _leftVel;
RightHand.Rigidbody.velocity = _rightVel;
if (lrb) lrb.velocity = _leftHeldVel;
if (rrb && rrb != lrb) rrb.velocity = _rightHeldVel;
LeftHand.Rigidbody.linearVelocity = _leftVel;
RightHand.Rigidbody.linearVelocity = _rightVel;
if (lrb) lrb.linearVelocity = _leftHeldVel;
if (rrb && rrb != lrb) rrb.linearVelocity = _rightHeldVel;
}
protected virtual void OnBeforeTeleport()
@@ -1101,8 +1101,8 @@ namespace HurricaneVR.Framework.Core.Player
}
}
var lv = LeftHand.Rigidbody.velocity;
var rv = RightHand.Rigidbody.velocity;
var lv = LeftHand.Rigidbody.linearVelocity;
var rv = RightHand.Rigidbody.linearVelocity;
var leftObjV = Vector3.zero;
var rightObjV = Vector3.zero;
@@ -1110,8 +1110,8 @@ namespace HurricaneVR.Framework.Core.Player
var lrb = leftGrabbable ? leftGrabbable.Rigidbody : null;
var rrb = rightGrabbable ? rightGrabbable.Rigidbody : null;
if (lrb) leftObjV = lrb.velocity;
if (rrb) rightObjV = rrb.velocity;
if (lrb) leftObjV = lrb.linearVelocity;
if (rrb) rightObjV = rrb.linearVelocity;
BeforeTeleport.Invoke(FeetPosition);
@@ -1149,10 +1149,10 @@ namespace HurricaneVR.Framework.Core.Player
PositionUpdate.Invoke(FeetPosition);
AfterTeleport.Invoke();
LeftHand.Rigidbody.velocity = lv;
RightHand.Rigidbody.velocity = rv;
if (lrb) lrb.velocity = leftObjV;
if (rrb && rrb != lrb) rrb.velocity = rightObjV;
LeftHand.Rigidbody.linearVelocity = lv;
RightHand.Rigidbody.linearVelocity = rv;
if (lrb) lrb.linearVelocity = leftObjV;
if (rrb && rrb != lrb) rrb.linearVelocity = rightObjV;
}
protected virtual Vector3 FeetPosition => CharacterController.transform.position;

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: ddcc26ecb5c24116a2b1c03eaeeef771
timeCreated: 1601130279
timeCreated: 1601130279
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/Player/HVRTeleporter.cs
uploadId: 736929

View File

@@ -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/ScriptableObjects/HVRForcePullSettings.cs
uploadId: 736929

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: e581938f8c0341839ae0a0294479b8d3
timeCreated: 1605395903
timeCreated: 1605395903
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/ScriptableObjects/HVRJointSettings.cs
uploadId: 736929

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: dd81e9e4d5c74d6e99fd2fadd5e6c0f0
timeCreated: 1605723601
timeCreated: 1605723601
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/ScriptableObjects/HVRRecoilSettings.cs
uploadId: 736929

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 595f9e32dd154ba28dcd9b9fb86e85eb
timeCreated: 1666138458
timeCreated: 1666138458
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/ScriptableObjects/PDStrength.cs
uploadId: 736929

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 64418a9651c34e40ab41adb93a2b052b
timeCreated: 1599782661
timeCreated: 1599782661
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/Sockets/HVREnumFlagsSocketFilter.cs
uploadId: 736929

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 13f8f0be93a6441aac4d5d8f7e34d1ca
timeCreated: 1599784231
timeCreated: 1599784231
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/Sockets/HVREnumFlagsSocketable.cs
uploadId: 736929

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 208c15afbb1e41f6bea3019bc24d367c
timeCreated: 1598213101
timeCreated: 1598213101
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/Sockets/HVREnumSocketFilter.cs
uploadId: 736929

View File

@@ -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/Sockets/HVREnumSocketable.cs
uploadId: 736929

View File

@@ -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/Sockets/HVRGrabbableSocketExcluder.cs
uploadId: 736929

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 74899f375639405fb52b9f5380a61661
timeCreated: 1600009758
timeCreated: 1600009758
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/Sockets/HVRGrabbableSocketFilter.cs
uploadId: 736929

View File

@@ -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/Sockets/HVRSocketContainer.cs
uploadId: 736929

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 8545e61ae77d412799986cb13d845640
timeCreated: 1598213088
timeCreated: 1598213088
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/Sockets/HVRSocketFilter.cs
uploadId: 736929

View File

@@ -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/Sockets/HVRSocketHoverAction.cs
uploadId: 736929

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 884736595cf844dab3bbe8fee2083e52
timeCreated: 1599837182
timeCreated: 1599837182
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/Sockets/HVRSocketHoverMaterial.cs
uploadId: 736929

View File

@@ -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/Sockets/HVRSocketHoverScale.cs
uploadId: 736929

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 258d25e1a2b14754b247fd5f28e9f682
timeCreated: 1598213117
timeCreated: 1598213117
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/Sockets/HVRSocketable.cs
uploadId: 736929

View File

@@ -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/Sockets/HVRSocketableTags.cs
uploadId: 736929

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 8c187661277640aab87258100070d766
timeCreated: 1598214773
timeCreated: 1598214773
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/Sockets/HVRStringSocketFilter.cs
uploadId: 736929

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 782b616f680d4ed0a890789e57800e0e
timeCreated: 1598214586
timeCreated: 1598214586
AssetOrigin:
serializedVersion: 1
productId: 177300
packageName: Hurricane VR - Physics Interaction Toolkit
packageVersion: 2.9.3.a
assetPath: Assets/HurricaneVR/Framework/Scripts/Core/Sockets/HVRStringSocketable.cs
uploadId: 736929

View File

@@ -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/Sockets/HVRTagSocketFilter.cs
uploadId: 736929

View File

@@ -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/Sockets/HVRTagSocketable.cs
uploadId: 736929

View File

@@ -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/Stabbing/HVRNotStabbable.cs
uploadId: 736929

View File

@@ -192,11 +192,11 @@ namespace HurricaneVR.Framework.Core.Stabbing
if (!Settings.CanLock || ManuallyLocked)
return;
if (Joint.xMotion != ConfigurableJointMotion.Locked && Stabber.Rigidbody.velocity.sqrMagnitude < Settings.LockVelocitySquared)
if (Joint.xMotion != ConfigurableJointMotion.Locked && Stabber.Rigidbody.linearVelocity.sqrMagnitude < Settings.LockVelocitySquared)
{
if (Stabber.LogJointLock)
{
Debug.Log($"Stabber locked: square mag {Stabber.Rigidbody.velocity.sqrMagnitude} < {Settings.LockVelocitySquared}");
Debug.Log($"Stabber locked: square mag {Stabber.Rigidbody.linearVelocity.sqrMagnitude} < {Settings.LockVelocitySquared}");
}
Lock();

View File

@@ -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/Stabbing/HVRStabTracker.cs
uploadId: 736929

View File

@@ -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/Stabbing/HVRStabbable.cs
uploadId: 736929

View File

@@ -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/Stabbing/HVRStabbableSettings.cs
uploadId: 736929

View File

@@ -128,7 +128,7 @@ namespace HurricaneVR.Framework.Core.Stabbing
{
if (Rigidbody)
{
_velocity = Rigidbody.velocity;
_velocity = Rigidbody.linearVelocity;
}
foreach (var tracker in _trackers)
@@ -283,10 +283,10 @@ namespace HurricaneVR.Framework.Core.Stabbing
continue;
}
Rigidbody.velocity = _velocity;
Rigidbody.linearVelocity = _velocity;
if (stabbable && otherRB)
{
otherRB.velocity = stabbable.Velocity;
otherRB.linearVelocity = stabbable.Velocity;
//Debug.Log($"{stabbable.Velocity}");
}

View File

@@ -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/Stabbing/HVRStabber.cs
uploadId: 736929

View File

@@ -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/Stabbing/HVRStabberSettings.cs
uploadId: 736929

Some files were not shown because too many files have changed in this diff Show More