Merge branch 'feature/update-sdk' into main

Author: HarrisonHough

Runtime/NetworkPlayer.cs

@@ -2,7 +2,7 @@
 using UnityEngine;
 using Unity.Netcode;
 using Unity.Collections;
-using ReadyPlayerMe.AvatarLoader;
+using ReadyPlayerMe.Core;
 
 namespace ReadyPlayerMe.NetcodeSupport
 {
@@ -16,28 +16,28 @@ public class NetworkPlayer : NetworkBehaviour
         private const string FULL_BODY_RIGHT_EYE_BONE_NAME = "Armature/Hips/Spine/Spine1/Spine2/Neck/Head/RightEye";
 
         [SerializeField] private AvatarConfig config;
-        
+
         public static string InputUrl = string.Empty;
         public NetworkVariable<FixedString64Bytes> avatarUrl = new NetworkVariable<FixedString64Bytes>(writePerm: NetworkVariableWritePermission.Owner);
         public event Action OnPLayerLoadComplete;
-        
+
         private Animator animator;
-        
+
         private Transform leftEye;
         private Transform rightEye;
-        
+
         private SkinnedMeshRenderer[] skinnedMeshRenderers;
-        
+
         private void Awake()
         {
             animator = GetComponent<Animator>();
-            
+
             leftEye = transform.Find(FULL_BODY_LEFT_EYE_BONE_NAME);
             rightEye = transform.Find(FULL_BODY_RIGHT_EYE_BONE_NAME);
-            
+
             skinnedMeshRenderers = GetComponentsInChildren<SkinnedMeshRenderer>();
         }
-        
+
         public override void OnNetworkSpawn()
         {
             if (IsOwner)
@@ -47,14 +47,14 @@ public override void OnNetworkSpawn()
                 {
                     LoadAvatar(newValue.ToString());
                 };
-                
+
                 LoadAvatar(InputUrl);
             }
             else if (Uri.IsWellFormedUriString(avatarUrl.Value.ToString(), UriKind.Absolute))
             {
                 LoadAvatar(avatarUrl.Value.ToString());
             }
-            
+
             avatarUrl.OnValueChanged += (value, newValue) =>
             {
                 LoadAvatar(newValue.ToString());
@@ -70,7 +70,7 @@ private void LoadAvatar(string url)
             {
                 leftEye.transform.localPosition = args.Avatar.transform.Find(FULL_BODY_LEFT_EYE_BONE_NAME).localPosition;
                 rightEye.transform.localPosition = args.Avatar.transform.Find(FULL_BODY_RIGHT_EYE_BONE_NAME).localPosition;
-            
+
                 TransferMesh(args.Avatar);
             };
         }
@@ -79,18 +79,18 @@ private void LoadAvatar(string url)
         private void TransferMesh(GameObject source)
         {
             var sourceAnimator = source.GetComponentInChildren<Animator>();
-            var sourceMeshes = source.GetComponentsInChildren<SkinnedMeshRenderer>();
+            SkinnedMeshRenderer[] sourceMeshes = source.GetComponentsInChildren<SkinnedMeshRenderer>();
 
             for (var i = 0; i < sourceMeshes.Length; i++)
             {
-                var mesh = sourceMeshes[i].sharedMesh;
+                Mesh mesh = sourceMeshes[i].sharedMesh;
                 skinnedMeshRenderers[i].sharedMesh = mesh;
 
-                var materials = sourceMeshes[i].sharedMaterials;
+                Material[] materials = sourceMeshes[i].sharedMaterials;
                 skinnedMeshRenderers[i].sharedMaterials = materials;
             }
 
-            var avatar = sourceAnimator.avatar;
+            Avatar avatar = sourceAnimator.avatar;
             animator.avatar = avatar;
             OnPLayerLoadComplete?.Invoke();
             Destroy(source);

Runtime/ReadyPlayerMe.NetcodeSupport.asmdef

@@ -4,7 +4,8 @@
     "references": [
         "GUID:1491147abca9d7d4bb7105af628b223e",
         "GUID:e0cd26848372d4e5c891c569017e11f1",
-        "GUID:69ab3f10cf42d0b42a6cd1353c374377"
+        "GUID:69ab3f10cf42d0b42a6cd1353c374377",
+        "GUID:96af4ea235d92d245a095007c6ca3701"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],