Merge pull request #194 from De-Panther/interactables_velocity

Added velocity for interactables when dropped

Author: De-Panther

Packages/webxr-interactions/CHANGELOG.md

@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 ### Added
 - Support for AR headsets in SceneHitTest.
+- Velocity for interactables when dropped.
 
 ## [0.13.0] - 2021-10-18
 ### Changed

Packages/webxr-interactions/Runtime/Scripts/ControllerInteraction.cs

@@ -33,6 +33,9 @@ public class ControllerInteraction : MonoBehaviour
     private Dictionary<int, Transform> handJoints = new Dictionary<int, Transform>();
     public GameObject inputProfileHandModelParent;
 
+    private Vector3 currentVelocity;
+    private Vector3 previousPos;
+
 #if WEBXR_INPUT_PROFILES
     private InputProfileLoader inputProfileLoader;
     private InputProfileModel inputProfileModel;
@@ -125,6 +128,9 @@ private void Update()
         Drop();
       }
 
+      currentVelocity = (transform.position - previousPos) / Time.deltaTime;
+      previousPos = transform.position;
+
 #if WEBXR_INPUT_PROFILES
       if (loadedModel && useInputProfile)
       {
@@ -512,7 +518,7 @@ public void Drop()
     {
       if (!currentRigidBody)
         return;
-
+      currentRigidBody.velocity = currentVelocity;
       attachJoint.connectedBody = null;
       currentRigidBody = null;
     }

Packages/webxr-interactions/Runtime/Scripts/MouseDragObject.cs

@@ -9,6 +9,8 @@ public class MouseDragObject : MonoBehaviour
     private Rigidbody m_rigidbody;
     private Vector3 m_screenPoint;
     private Vector3 m_offset;
+    private Vector3 m_currentVelocity;
+    private Vector3 m_previousPos;
 
     void Awake()
     {
@@ -27,6 +29,7 @@ void OnMouseDown()
 
     void OnMouseUp()
     {
+      m_rigidbody.velocity = m_currentVelocity;
       m_currentCamera = null;
     }
 
@@ -37,6 +40,8 @@ void FixedUpdate()
         Vector3 currentScreenPoint = GetMousePosWithScreenZ(m_screenPoint.z);
         m_rigidbody.velocity = Vector3.zero;
         m_rigidbody.MovePosition(m_currentCamera.ScreenToWorldPoint(currentScreenPoint) + m_offset);
+        m_currentVelocity = (transform.position - m_previousPos) / Time.deltaTime;
+        m_previousPos = transform.position;
       }
     }