@@ -19,23 +19,15 @@ public class NetworkPlayer : NetworkBehaviour
19
19
20
20
public static string InputUrl = string . Empty ;
21
21
public NetworkVariable < FixedString64Bytes > avatarUrl = new NetworkVariable < FixedString64Bytes > ( writePerm : NetworkVariableWritePermission . Owner ) ;
22
- public event Action OnPLayerLoadComplete ;
23
-
24
- private Animator animator ;
25
-
22
+ public event Action OnPlayerLoadComplete ;
23
+
26
24
private Transform leftEye ;
27
25
private Transform rightEye ;
28
26
29
- private SkinnedMeshRenderer [ ] skinnedMeshRenderers ;
30
-
31
27
private void Awake ( )
32
28
{
33
- animator = GetComponent < Animator > ( ) ;
34
-
35
29
leftEye = transform . Find ( FULL_BODY_LEFT_EYE_BONE_NAME ) ;
36
30
rightEye = transform . Find ( FULL_BODY_RIGHT_EYE_BONE_NAME ) ;
37
-
38
- skinnedMeshRenderers = GetComponentsInChildren < SkinnedMeshRenderer > ( ) ;
39
31
}
40
32
41
33
public override void OnNetworkSpawn ( )
@@ -71,29 +63,10 @@ private void LoadAvatar(string url)
71
63
leftEye . transform . localPosition = args . Avatar . transform . Find ( FULL_BODY_LEFT_EYE_BONE_NAME ) . localPosition ;
72
64
rightEye . transform . localPosition = args . Avatar . transform . Find ( FULL_BODY_RIGHT_EYE_BONE_NAME ) . localPosition ;
73
65
74
- TransferMesh ( args . Avatar ) ;
66
+ AvatarMeshHelper . TransferMesh ( args . Avatar , gameObject ) ;
67
+ Destroy ( args . Avatar ) ;
68
+ OnPlayerLoadComplete ? . Invoke ( ) ;
75
69
} ;
76
70
}
77
-
78
- //TODO: Multiple mesh transfer support.
79
- private void TransferMesh ( GameObject source )
80
- {
81
- var sourceAnimator = source . GetComponentInChildren < Animator > ( ) ;
82
- SkinnedMeshRenderer [ ] sourceMeshes = source . GetComponentsInChildren < SkinnedMeshRenderer > ( ) ;
83
-
84
- for ( var i = 0 ; i < sourceMeshes . Length ; i ++ )
85
- {
86
- Mesh mesh = sourceMeshes [ i ] . sharedMesh ;
87
- skinnedMeshRenderers [ i ] . sharedMesh = mesh ;
88
-
89
- Material [ ] materials = sourceMeshes [ i ] . sharedMaterials ;
90
- skinnedMeshRenderers [ i ] . sharedMaterials = materials ;
91
- }
92
-
93
- Avatar avatar = sourceAnimator . avatar ;
94
- animator . avatar = avatar ;
95
- OnPLayerLoadComplete ? . Invoke ( ) ;
96
- Destroy ( source ) ;
97
- }
98
71
}
99
72
}
0 commit comments