From 372579074765f1e6646dea30f1e99005de2f9abb Mon Sep 17 00:00:00 2001
From: Pascal Serrarens <pascal@passervr.com>
Date: Thu, 28 Nov 2024 12:59:38 +0100
Subject: [PATCH] Leftover changes

---
 .../Scripts/Movements/HandMovements.cs        |  8 +++++++
 .../Netcode/HumanoidPlayerNetcode.cs          |  4 ++++
 .../Scripts/Targets/HandTarget.cs             | 21 +++----------------
 Runtime/Tools/Networking/NetworkingStarter.cs |  3 ++-
 4 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/Runtime/HumanoidControl/Scripts/Movements/HandMovements.cs b/Runtime/HumanoidControl/Scripts/Movements/HandMovements.cs
index 8c795ca..0919da0 100644
--- a/Runtime/HumanoidControl/Scripts/Movements/HandMovements.cs
+++ b/Runtime/HumanoidControl/Scripts/Movements/HandMovements.cs
@@ -71,11 +71,19 @@ namespace Passer.Humanoid {
                     handTarget.stretchlessTarget.localRotation = Quaternion.identity;
                 }
             }
+#if hNETCODE
+            HumanoidPlayer.AddNetworkObject(handTarget.handRigidbody.transform);
+#endif
+
         }
 
         public void ReattachHand() {
             if (handTarget == null || handTarget.hand.bone.transform == null)
                 return;
+#if hNETCODE
+            Unity.Netcode.NetworkObject nwObject = handTarget.handRigidbody.transform.GetComponent<Unity.Netcode.NetworkObject>();
+            Object.DestroyImmediate(nwObject, true);
+#endif
             handTarget.hand.bone.transform.parent = handTarget.forearm.bone.transform;
         }
         #endregion
diff --git a/Runtime/HumanoidControl/Scripts/Networking/Netcode/HumanoidPlayerNetcode.cs b/Runtime/HumanoidControl/Scripts/Networking/Netcode/HumanoidPlayerNetcode.cs
index 4e9b0fe..e525852 100644
--- a/Runtime/HumanoidControl/Scripts/Networking/Netcode/HumanoidPlayerNetcode.cs
+++ b/Runtime/HumanoidControl/Scripts/Networking/Netcode/HumanoidPlayerNetcode.cs
@@ -172,6 +172,10 @@ namespace Passer.Humanoid {
             //NetworkServer.RegisterHandler(msgType, ForwardAvatarPose);
         }
 
+        public static void AddNetworkObject(Transform t) {
+            t.gameObject.AddComponent<Unity.Netcode.NetworkObject>();
+        }
+
         #endregion
 
         //#region Start
diff --git a/Runtime/HumanoidControl/Scripts/Targets/HandTarget.cs b/Runtime/HumanoidControl/Scripts/Targets/HandTarget.cs
index c74a3f6..c6d101c 100644
--- a/Runtime/HumanoidControl/Scripts/Targets/HandTarget.cs
+++ b/Runtime/HumanoidControl/Scripts/Targets/HandTarget.cs
@@ -1264,23 +1264,11 @@ namespace Passer.Humanoid {
             if (humanoid == null)
                 return;
 
-            //bones = new TargetedBone[] { hand, forearm, upperArm, shoulder };
-            //bonesReverse = new TargetedBone[] { hand, forearm, upperArm, shoulder };
-
             InitSubTargets();
-            //foreach (TargetedBone bone in bones)
-            //    bone.Init(this);
-
-            //RetrieveBones();
 
             DeterminePalmPosition();
 
-            // We need to do this before the measurements
-            //foreach (TargetedBone bone in bones)
-            //    bone.SetTargetPositionToAvatar();
             SetTargetPositionsToAvatar();
-            //foreach (TargetedBone bone in bones)
-            //    bone.DoMeasurements();
             DoMeasurements();
 
             if (stretchlessTarget == null && hand.target.transform != null) {
@@ -1295,8 +1283,6 @@ namespace Passer.Humanoid {
                 }
             }
 
-            //poses.InitPoses(fingers);
-
         }
 
         public override void StartTarget() {
@@ -1308,10 +1294,9 @@ namespace Passer.Humanoid {
                 grabSocket = CreateGrabSocket();
             if (pinchSocket == null)
                 pinchSocket = CreatePinchSocket();
-
-            //RetrieveBones();
-
-            //fingers.CalculateFingerRetargeting();
+//#if hNETCODE
+//            HumanoidPlayer.AddNetworkObject(hand.bone.transform);
+//#endif
 
             CheckColliders();
             if (touchInteraction)
diff --git a/Runtime/Tools/Networking/NetworkingStarter.cs b/Runtime/Tools/Networking/NetworkingStarter.cs
index 48c727e..df32c54 100644
--- a/Runtime/Tools/Networking/NetworkingStarter.cs
+++ b/Runtime/Tools/Networking/NetworkingStarter.cs
@@ -189,7 +189,8 @@ namespace Passer {
             ((BoltStarter)starter).OnConnectedToServer(sessionList);
         }
 #endif
-        private void OnDestroy() {
+        public override void OnDestroy() {
+            base.OnDestroy();
             if (starter != null)
                 starter.StopClient();
         }