HumanoidControl/HumanoidControl_Free
HumanoidControl/HumanoidControl_Free
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Leftover changes

Browse Source
This commit is contained in:
Pascal Serrarens 2024-11-28 12:59:38 +01:00
parent 76fe0a60f4
commit 3725790747
4 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/HumanoidControl/Scripts/Movements/HandMovements.cs
View File

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

4
Runtime/HumanoidControl/Scripts/Networking/Netcode/HumanoidPlayerNetcode.cs
View File

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

21
Runtime/HumanoidControl/Scripts/Targets/HandTarget.cs
View File

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

3
Runtime/Tools/Networking/NetworkingStarter.cs
View File

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