@@ -20,12 +20,12 @@ internal class PlayerSpawner : NetworkBehaviour
2020 /// <summary>
2121 /// Prefab for the player
2222 /// </summary>
23- public NetworkObject playerPrefab ;
23+ public NetworkObject PlayerPrefab ;
2424
2525 /// <summary>
2626 /// The server side NetworkObject that was spawned when the client connected.
2727 /// </summary>
28- public NetworkObject spawnedPlayer ;
28+ public NetworkObject SpawnedPlayer ;
2929
3030 /// <summary>
3131 /// Represents the different movement states of the PlayerSpawner during the test lifecycle.
@@ -39,7 +39,7 @@ public enum MoveState
3939 // We have moved far enough to test location
4040 ReachedPeak ,
4141 }
42- public MoveState moveState = MoveState . NotStarted ;
42+ public MoveState State = MoveState . NotStarted ;
4343
4444 // A count of the number of updates since the player object was spawned.
4545 private int m_Count ;
@@ -62,7 +62,7 @@ private void Update()
6262 rotation . eulerAngles = Vector3 . Slerp ( rotation . eulerAngles , m_RotationTarget , Time . deltaTime * 2 ) ;
6363 transform . rotation = rotation ;
6464
65- if ( moveState != MoveState . PlayerSpawned )
65+ if ( State != MoveState . PlayerSpawned )
6666 {
6767 return ;
6868 }
@@ -73,7 +73,7 @@ private void Update()
7373 if ( m_Count > 10 )
7474 {
7575 // Mark PlayerSpawner as having moved far enough to test.
76- moveState = MoveState . ReachedPeak ;
76+ State = MoveState . ReachedPeak ;
7777 }
7878 }
7979
@@ -102,10 +102,10 @@ public override void OnNetworkSpawn()
102102 [ ServerRpc ( RequireOwnership = false ) ]
103103 private void RequestPlayerObjectSpawnServerRpc ( ServerRpcParams rpcParams = default )
104104 {
105- spawnedPlayer = Instantiate ( playerPrefab ) ;
106- spawnedPlayer . SpawnAsPlayerObject ( rpcParams . Receive . SenderClientId ) ;
107- spawnedPlayer . TrySetParent ( NetworkObject , false ) ;
108- moveState = MoveState . PlayerSpawned ;
105+ SpawnedPlayer = Instantiate ( PlayerPrefab ) ;
106+ SpawnedPlayer . SpawnAsPlayerObject ( rpcParams . Receive . SenderClientId ) ;
107+ SpawnedPlayer . TrySetParent ( NetworkObject , false ) ;
108+ State = MoveState . PlayerSpawned ;
109109 }
110110 }
111111
@@ -138,27 +138,27 @@ protected override void OnServerAndClientsCreated()
138138 var childNetworkTransform = playerPrefab . AddComponent < ClientNetworkTransform > ( ) ;
139139 childNetworkTransform . InLocalSpace = true ;
140140
141- parentPlayerSpawner . playerPrefab = playerPrefab . GetComponent < NetworkObject > ( ) ;
141+ parentPlayerSpawner . PlayerPrefab = playerPrefab . GetComponent < NetworkObject > ( ) ;
142142
143143 base . OnServerAndClientsCreated ( ) ;
144144 }
145145
146146 private bool NewPlayerObjectSpawned ( )
147147 {
148- return m_ServerPlayerSpawner . spawnedPlayer &&
149- m_ClientNetworkManagers [ 0 ] . SpawnManager . SpawnedObjects . ContainsKey ( m_ServerPlayerSpawner . spawnedPlayer . NetworkObjectId ) ;
148+ return m_ServerPlayerSpawner . SpawnedPlayer &&
149+ m_ClientNetworkManagers [ 0 ] . SpawnManager . SpawnedObjects . ContainsKey ( m_ServerPlayerSpawner . SpawnedPlayer . NetworkObjectId ) ;
150150 }
151151
152152 private bool HasServerInstanceReachedPeakPoint ( )
153153 {
154- VerboseDebug ( $ "Client Local: { m_NewClientPlayer . transform . localPosition } Server Local: { m_ServerPlayerSpawner . spawnedPlayer . transform . localPosition } ") ;
155- return m_ServerPlayerSpawner . moveState == PlayerSpawner . MoveState . ReachedPeak ;
154+ VerboseDebug ( $ "Client Local: { m_NewClientPlayer . transform . localPosition } Server Local: { m_ServerPlayerSpawner . SpawnedPlayer . transform . localPosition } ") ;
155+ return m_ServerPlayerSpawner . State == PlayerSpawner . MoveState . ReachedPeak ;
156156 }
157157
158158 private bool ServerClientPositionMatches ( )
159159 {
160- return Approximately ( m_NewClientPlayer . transform . localPosition , m_ServerPlayerSpawner . spawnedPlayer . transform . localPosition ) &&
161- Approximately ( m_NewClientPlayer . transform . position , m_ServerPlayerSpawner . spawnedPlayer . transform . position ) ;
160+ return Approximately ( m_NewClientPlayer . transform . localPosition , m_ServerPlayerSpawner . SpawnedPlayer . transform . localPosition ) &&
161+ Approximately ( m_NewClientPlayer . transform . position , m_ServerPlayerSpawner . SpawnedPlayer . transform . position ) ;
162162 }
163163
164164 [ UnityTest ]
@@ -176,7 +176,7 @@ public IEnumerator TestParentedPlayerUsingLocalSpace()
176176 AssertOnTimeout ( $ "Client did not spawn new player object!") ;
177177
178178 // Save the spawned player object
179- m_NewClientPlayer = m_ClientNetworkManagers [ 0 ] . SpawnManager . SpawnedObjects [ m_ServerPlayerSpawner . spawnedPlayer . NetworkObjectId ] ;
179+ m_NewClientPlayer = m_ClientNetworkManagers [ 0 ] . SpawnManager . SpawnedObjects [ m_ServerPlayerSpawner . SpawnedPlayer . NetworkObjectId ] ;
180180
181181 // Let the parent PlayerSpawner move for several ticks to get an offset
182182 yield return WaitForConditionOrTimeOut ( HasServerInstanceReachedPeakPoint ) ;
@@ -185,7 +185,7 @@ public IEnumerator TestParentedPlayerUsingLocalSpace()
185185 // Check that the client and server local positions match (they should both be at {0,0,0} local space)
186186 yield return WaitForConditionOrTimeOut ( ServerClientPositionMatches ) ;
187187 AssertOnTimeout ( $ "Client local position { m_NewClientPlayer . transform . localPosition } does not match" +
188- $ " server local position { m_ServerPlayerSpawner . spawnedPlayer . transform . localPosition } ") ;
188+ $ " server local position { m_ServerPlayerSpawner . SpawnedPlayer . transform . localPosition } ") ;
189189 }
190190 }
191191}
0 commit comments