22using Unity . Netcode . Components ;
33using Unity . Netcode . TestHelpers . Runtime ;
44using UnityEngine ;
5+ using UnityEngine . Serialization ;
56using UnityEngine . TestTools ;
67
78namespace Unity . Netcode . RuntimeTests
@@ -20,12 +21,12 @@ internal class PlayerSpawner : NetworkBehaviour
2021 /// <summary>
2122 /// Prefab for the player
2223 /// </summary>
23- public NetworkObject playerPrefab ;
24+ public NetworkObject PlayerPrefab ;
2425
2526 /// <summary>
2627 /// The server side NetworkObject that was spawned when the client connected.
2728 /// </summary>
28- public NetworkObject spawnedPlayer ;
29+ public NetworkObject SpawnedPlayer ;
2930
3031 /// <summary>
3132 /// Represents the different movement states of the PlayerSpawner during the test lifecycle.
@@ -39,7 +40,7 @@ public enum MoveState
3940 // We have moved far enough to test location
4041 ReachedPeak ,
4142 }
42- public MoveState moveState = MoveState . NotStarted ;
43+ public MoveState State = MoveState . NotStarted ;
4344
4445 // A count of the number of updates since the player object was spawned.
4546 private int m_Count ;
@@ -62,7 +63,7 @@ private void Update()
6263 rotation . eulerAngles = Vector3 . Slerp ( rotation . eulerAngles , m_RotationTarget , Time . deltaTime * 2 ) ;
6364 transform . rotation = rotation ;
6465
65- if ( moveState != MoveState . PlayerSpawned )
66+ if ( State != MoveState . PlayerSpawned )
6667 {
6768 return ;
6869 }
@@ -73,7 +74,7 @@ private void Update()
7374 if ( m_Count > 10 )
7475 {
7576 // Mark PlayerSpawner as having moved far enough to test.
76- moveState = MoveState . ReachedPeak ;
77+ State = MoveState . ReachedPeak ;
7778 }
7879 }
7980
@@ -102,10 +103,10 @@ public override void OnNetworkSpawn()
102103 [ ServerRpc ( RequireOwnership = false ) ]
103104 private void RequestPlayerObjectSpawnServerRpc ( ServerRpcParams rpcParams = default )
104105 {
105- spawnedPlayer = Instantiate ( playerPrefab ) ;
106- spawnedPlayer . SpawnAsPlayerObject ( rpcParams . Receive . SenderClientId ) ;
107- spawnedPlayer . TrySetParent ( NetworkObject , false ) ;
108- moveState = MoveState . PlayerSpawned ;
106+ SpawnedPlayer = Instantiate ( PlayerPrefab ) ;
107+ SpawnedPlayer . SpawnAsPlayerObject ( rpcParams . Receive . SenderClientId ) ;
108+ SpawnedPlayer . TrySetParent ( NetworkObject , false ) ;
109+ State = MoveState . PlayerSpawned ;
109110 }
110111 }
111112
@@ -138,27 +139,27 @@ protected override void OnServerAndClientsCreated()
138139 var childNetworkTransform = playerPrefab . AddComponent < ClientNetworkTransform > ( ) ;
139140 childNetworkTransform . InLocalSpace = true ;
140141
141- parentPlayerSpawner . playerPrefab = playerPrefab . GetComponent < NetworkObject > ( ) ;
142+ parentPlayerSpawner . PlayerPrefab = playerPrefab . GetComponent < NetworkObject > ( ) ;
142143
143144 base . OnServerAndClientsCreated ( ) ;
144145 }
145146
146147 private bool NewPlayerObjectSpawned ( )
147148 {
148- return m_ServerPlayerSpawner . spawnedPlayer &&
149- m_ClientNetworkManagers [ 0 ] . SpawnManager . SpawnedObjects . ContainsKey ( m_ServerPlayerSpawner . spawnedPlayer . NetworkObjectId ) ;
149+ return m_ServerPlayerSpawner . SpawnedPlayer &&
150+ m_ClientNetworkManagers [ 0 ] . SpawnManager . SpawnedObjects . ContainsKey ( m_ServerPlayerSpawner . SpawnedPlayer . NetworkObjectId ) ;
150151 }
151152
152153 private bool HasServerInstanceReachedPeakPoint ( )
153154 {
154- VerboseDebug ( $ "Client Local: { m_NewClientPlayer . transform . localPosition } Server Local: { m_ServerPlayerSpawner . spawnedPlayer . transform . localPosition } ") ;
155- return m_ServerPlayerSpawner . moveState == PlayerSpawner . MoveState . ReachedPeak ;
155+ VerboseDebug ( $ "Client Local: { m_NewClientPlayer . transform . localPosition } Server Local: { m_ServerPlayerSpawner . SpawnedPlayer . transform . localPosition } ") ;
156+ return m_ServerPlayerSpawner . State == PlayerSpawner . MoveState . ReachedPeak ;
156157 }
157158
158159 private bool ServerClientPositionMatches ( )
159160 {
160- return Approximately ( m_NewClientPlayer . transform . localPosition , m_ServerPlayerSpawner . spawnedPlayer . transform . localPosition ) &&
161- Approximately ( m_NewClientPlayer . transform . position , m_ServerPlayerSpawner . spawnedPlayer . transform . position ) ;
161+ return Approximately ( m_NewClientPlayer . transform . localPosition , m_ServerPlayerSpawner . SpawnedPlayer . transform . localPosition ) &&
162+ Approximately ( m_NewClientPlayer . transform . position , m_ServerPlayerSpawner . SpawnedPlayer . transform . position ) ;
162163 }
163164
164165 [ UnityTest ]
@@ -176,7 +177,7 @@ public IEnumerator TestParentedPlayerUsingLocalSpace()
176177 AssertOnTimeout ( $ "Client did not spawn new player object!") ;
177178
178179 // Save the spawned player object
179- m_NewClientPlayer = m_ClientNetworkManagers [ 0 ] . SpawnManager . SpawnedObjects [ m_ServerPlayerSpawner . spawnedPlayer . NetworkObjectId ] ;
180+ m_NewClientPlayer = m_ClientNetworkManagers [ 0 ] . SpawnManager . SpawnedObjects [ m_ServerPlayerSpawner . SpawnedPlayer . NetworkObjectId ] ;
180181
181182 // Let the parent PlayerSpawner move for several ticks to get an offset
182183 yield return WaitForConditionOrTimeOut ( HasServerInstanceReachedPeakPoint ) ;
@@ -185,7 +186,7 @@ public IEnumerator TestParentedPlayerUsingLocalSpace()
185186 // Check that the client and server local positions match (they should both be at {0,0,0} local space)
186187 yield return WaitForConditionOrTimeOut ( ServerClientPositionMatches ) ;
187188 AssertOnTimeout ( $ "Client local position { m_NewClientPlayer . transform . localPosition } does not match" +
188- $ " server local position { m_ServerPlayerSpawner . spawnedPlayer . transform . localPosition } ") ;
189+ $ " server local position { m_ServerPlayerSpawner . SpawnedPlayer . transform . localPosition } ") ;
189190 }
190191 }
191192}
0 commit comments