Added spawn position and rotation to ConnectionApproval

TwoTenPvP · TwoTenPvP · commit 21b5942106a5 · 2018-04-13T17:08:04.000+01:00
diff --git a/MLAPI/MonoBehaviours/Core/NetworkingManager.cs b/MLAPI/MonoBehaviours/Core/NetworkingManager.cs
@@ -136,7 +136,7 @@ public bool IsClientConnected
         /// <summary>
         /// The callback to invoke during connection approval
         /// </summary>
-        public Action<byte[], uint, Action<uint, bool>> ConnectionApprovalCallback = null;
+        public Action<byte[], uint, Action<uint, bool, Vector3, Quaternion>> ConnectionApprovalCallback = null;
         /// <summary>
         /// The current NetworkingConfiguration
         /// </summary>
@@ -586,13 +586,14 @@ public void StopClient()
         /// <summary>
         /// Starts a Host
         /// </summary>
-        public void StartHost()
+        public void StartHost(Vector3? pos = null, Quaternion? rot = null)
         {
             if (isServer || isClient)
             {
                 Debug.LogWarning("MLAPI: Cannot start host while an instance is already running");
                 return;
             }
+
             ConnectionConfig cConfig = Init(true);
             if (NetworkConfig.ConnectionApproval)
             {
@@ -622,7 +623,7 @@ public void StartHost()
 
             if(NetworkConfig.HandleObjectSpawning)
             {
-                SpawnManager.SpawnPlayerObject(netId.GetClientId(), 0);
+                SpawnManager.SpawnPlayerObject(netId.GetClientId(), 0, pos.GetValueOrDefault(), rot.GetValueOrDefault());
             }
 
             if (OnServerStarted != null)
@@ -952,7 +953,7 @@ private void HandleIncomingData(uint clientId, byte[] data, int channelId)
                                             }
                                             else
                                             {
-                                                HandleApproval(clientId, true);
+                                                HandleApproval(clientId, true, Vector3.zero, Quaternion.identity);
                                             }
                                         }
                                     }
@@ -1035,7 +1036,7 @@ private void HandleIncomingData(uint clientId, byte[] data, int channelId)
 
                                                     if (isPlayerObject)
                                                     {
-                                                        SpawnManager.SpawnPlayerObject(ownerId, networkId);
+                                                        SpawnManager.SpawnPlayerObject(ownerId, networkId, new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot));
                                                     }
                                                     else
                                                     {
@@ -1086,7 +1087,7 @@ private void HandleIncomingData(uint clientId, byte[] data, int channelId)
                                                 if (isPlayerObject)
                                                 {
                                                     connectedClients.Add(ownerId, new NetworkedClient() { ClientId = ownerId });
-                                                    SpawnManager.SpawnPlayerObject(ownerId, networkId);
+                                                    SpawnManager.SpawnPlayerObject(ownerId, networkId, new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot));
                                                 }
                                                 else
                                                 {
@@ -1161,7 +1162,7 @@ private void HandleIncomingData(uint clientId, byte[] data, int channelId)
                                             float yRot = messageReader.ReadSingle();
                                             float zRot = messageReader.ReadSingle();
                                             SpawnManager.spawnedObjects[netId].transform.position = new Vector3(xPos, yPos, zPos);
-                                            SpawnManager.spawnedObjects[netId].transform.rotation = Quaternion.Euler(new Vector3(xRot, yRot, zRot));
+                                            SpawnManager.spawnedObjects[netId].transform.rotation = Quaternion.Euler(xRot, yRot, zRot);
                                             SpawnManager.spawnedObjects[netId].gameObject.SetActive(true);
                                         }
                                     }
@@ -1336,7 +1337,7 @@ private void HandleIncomingData(uint clientId, byte[] data, int channelId)
                                                     if (isPlayerObject)
                                                     {
                                                         connectedClients.Add(ownerId, new NetworkedClient() { ClientId = ownerId });
-                                                        SpawnManager.SpawnPlayerObject(ownerId, networkId);
+                                                        SpawnManager.SpawnPlayerObject(ownerId, networkId, new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot));
                                                     }
                                                     else
                                                     {
@@ -1778,7 +1779,7 @@ private void SyncTime()
             }
         }
 
-        private void HandleApproval(uint clientId, bool approved)
+        private void HandleApproval(uint clientId, bool approved, Vector3 position, Quaternion rotation)
         {
             if(approved)
             {
@@ -1819,7 +1820,7 @@ private void HandleApproval(uint clientId, bool approved)
                 if(NetworkConfig.HandleObjectSpawning)
                 {
                     uint networkId = SpawnManager.GetNetworkObjectId();
-                    GameObject go = SpawnManager.SpawnPlayerObject(clientId, networkId);
+                    GameObject go = SpawnManager.SpawnPlayerObject(clientId, networkId, position, rotation);
                     connectedClients[clientId].PlayerObject = go;
                 }
                 int sizeOfStream = 17 + ((connectedClients.Count - 1) * 4);
diff --git a/MLAPI/NetworkingManagerComponents/Core/SpawnManager.cs b/MLAPI/NetworkingManagerComponents/Core/SpawnManager.cs
@@ -217,14 +217,14 @@ internal static void SpawnPrefabIndexServer(NetworkedObject netObject, uint? cli
             }
         }
 
-        internal static GameObject SpawnPlayerObject(uint clientId, uint networkId)
+        internal static GameObject SpawnPlayerObject(uint clientId, uint networkId, Vector3 position, Quaternion rotation)
         {
             if (string.IsNullOrEmpty(netManager.NetworkConfig.PlayerPrefabName) || !netManager.NetworkConfig.NetworkPrefabIds.ContainsKey(netManager.NetworkConfig.PlayerPrefabName))
             {
                 Debug.LogWarning("MLAPI: There is no player prefab in the NetworkConfig, or it's not registered at as a spawnable prefab");
                 return null;
             }
-            GameObject go = MonoBehaviour.Instantiate(netManager.NetworkConfig.NetworkedPrefabs[netManager.NetworkConfig.NetworkPrefabIds[netManager.NetworkConfig.PlayerPrefabName]].prefab);
+            GameObject go = MonoBehaviour.Instantiate(netManager.NetworkConfig.NetworkedPrefabs[netManager.NetworkConfig.NetworkPrefabIds[netManager.NetworkConfig.PlayerPrefabName]].prefab, position, rotation);
             NetworkedObject netObject = go.GetComponent<NetworkedObject>();
             if (netObject == null)
             {

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ public bool IsClientConnected`
`136`	`136`	`/// <summary>`
`137`	`137`	`/// The callback to invoke during connection approval`
`138`	`138`	`/// </summary>`
`139`		`- public Action<byte[], uint, Action<uint, bool>> ConnectionApprovalCallback = null;`
	`139`	`+ public Action<byte[], uint, Action<uint, bool, Vector3, Quaternion>> ConnectionApprovalCallback = null;`
`140`	`140`	`/// <summary>`
`141`	`141`	`/// The current NetworkingConfiguration`
`142`	`142`	`/// </summary>`
`@@ -586,13 +586,14 @@ public void StopClient()`
`586`	`586`	`/// <summary>`
`587`	`587`	`/// Starts a Host`
`588`	`588`	`/// </summary>`
`589`		`- public void StartHost()`
	`589`	`+ public void StartHost(Vector3? pos = null, Quaternion? rot = null)`
`590`	`590`	`{`
`591`	`591`	`if (isServer \|\| isClient)`
`592`	`592`	`{`
`593`	`593`	`Debug.LogWarning("MLAPI: Cannot start host while an instance is already running");`
`594`	`594`	`return;`
`595`	`595`	`}`
	`596`	`+`
`596`	`597`	`ConnectionConfig cConfig = Init(true);`
`597`	`598`	`if (NetworkConfig.ConnectionApproval)`
`598`	`599`	`{`
`@@ -622,7 +623,7 @@ public void StartHost()`
`622`	`623`
`623`	`624`	`if(NetworkConfig.HandleObjectSpawning)`
`624`	`625`	`{`
`625`		`- SpawnManager.SpawnPlayerObject(netId.GetClientId(), 0);`
	`626`	`+ SpawnManager.SpawnPlayerObject(netId.GetClientId(), 0, pos.GetValueOrDefault(), rot.GetValueOrDefault());`
`626`	`627`	`}`
`627`	`628`
`628`	`629`	`if (OnServerStarted != null)`
`@@ -952,7 +953,7 @@ private void HandleIncomingData(uint clientId, byte[] data, int channelId)`
`952`	`953`	`}`
`953`	`954`	`else`
`954`	`955`	`{`
`955`		`- HandleApproval(clientId, true);`
	`956`	`+ HandleApproval(clientId, true, Vector3.zero, Quaternion.identity);`
`956`	`957`	`}`
`957`	`958`	`}`
`958`	`959`	`}`
`@@ -1035,7 +1036,7 @@ private void HandleIncomingData(uint clientId, byte[] data, int channelId)`
`1035`	`1036`
`1036`	`1037`	`if (isPlayerObject)`
`1037`	`1038`	`{`
`1038`		`- SpawnManager.SpawnPlayerObject(ownerId, networkId);`
	`1039`	`+ SpawnManager.SpawnPlayerObject(ownerId, networkId, new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot));`
`1039`	`1040`	`}`
`1040`	`1041`	`else`
`1041`	`1042`	`{`
`@@ -1086,7 +1087,7 @@ private void HandleIncomingData(uint clientId, byte[] data, int channelId)`
`1086`	`1087`	`if (isPlayerObject)`
`1087`	`1088`	`{`
`1088`	`1089`	`connectedClients.Add(ownerId, new NetworkedClient() { ClientId = ownerId });`
`1089`		`- SpawnManager.SpawnPlayerObject(ownerId, networkId);`
	`1090`	`+ SpawnManager.SpawnPlayerObject(ownerId, networkId, new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot));`
`1090`	`1091`	`}`
`1091`	`1092`	`else`
`1092`	`1093`	`{`
`@@ -1161,7 +1162,7 @@ private void HandleIncomingData(uint clientId, byte[] data, int channelId)`
`1161`	`1162`	`float yRot = messageReader.ReadSingle();`
`1162`	`1163`	`float zRot = messageReader.ReadSingle();`
`1163`	`1164`	`SpawnManager.spawnedObjects[netId].transform.position = new Vector3(xPos, yPos, zPos);`
`1164`		`- SpawnManager.spawnedObjects[netId].transform.rotation = Quaternion.Euler(new Vector3(xRot, yRot, zRot));`
	`1165`	`+ SpawnManager.spawnedObjects[netId].transform.rotation = Quaternion.Euler(xRot, yRot, zRot);`
`1165`	`1166`	`SpawnManager.spawnedObjects[netId].gameObject.SetActive(true);`
`1166`	`1167`	`}`
`1167`	`1168`	`}`
`@@ -1336,7 +1337,7 @@ private void HandleIncomingData(uint clientId, byte[] data, int channelId)`
`1336`	`1337`	`if (isPlayerObject)`
`1337`	`1338`	`{`
`1338`	`1339`	`connectedClients.Add(ownerId, new NetworkedClient() { ClientId = ownerId });`
`1339`		`- SpawnManager.SpawnPlayerObject(ownerId, networkId);`
	`1340`	`+ SpawnManager.SpawnPlayerObject(ownerId, networkId, new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot));`
`1340`	`1341`	`}`
`1341`	`1342`	`else`
`1342`	`1343`	`{`
`@@ -1778,7 +1779,7 @@ private void SyncTime()`
`1778`	`1779`	`}`
`1779`	`1780`	`}`
`1780`	`1781`
`1781`		`- private void HandleApproval(uint clientId, bool approved)`
	`1782`	`+ private void HandleApproval(uint clientId, bool approved, Vector3 position, Quaternion rotation)`
`1782`	`1783`	`{`
`1783`	`1784`	`if(approved)`
`1784`	`1785`	`{`
`@@ -1819,7 +1820,7 @@ private void HandleApproval(uint clientId, bool approved)`
`1819`	`1820`	`if(NetworkConfig.HandleObjectSpawning)`
`1820`	`1821`	`{`
`1821`	`1822`	`uint networkId = SpawnManager.GetNetworkObjectId();`
`1822`		`- GameObject go = SpawnManager.SpawnPlayerObject(clientId, networkId);`
	`1823`	`+ GameObject go = SpawnManager.SpawnPlayerObject(clientId, networkId, position, rotation);`
`1823`	`1824`	`connectedClients[clientId].PlayerObject = go;`
`1824`	`1825`	`}`
`1825`	`1826`	`int sizeOfStream = 17 + ((connectedClients.Count - 1) * 4);`
Original file line number	Diff line number	Diff line change
`@@ -217,14 +217,14 @@ internal static void SpawnPrefabIndexServer(NetworkedObject netObject, uint? cli`
`217`	`217`	`}`
`218`	`218`	`}`
`219`	`219`
`220`		`- internal static GameObject SpawnPlayerObject(uint clientId, uint networkId)`
	`220`	`+ internal static GameObject SpawnPlayerObject(uint clientId, uint networkId, Vector3 position, Quaternion rotation)`
`221`	`221`	`{`
`222`	`222`	`if (string.IsNullOrEmpty(netManager.NetworkConfig.PlayerPrefabName) \|\| !netManager.NetworkConfig.NetworkPrefabIds.ContainsKey(netManager.NetworkConfig.PlayerPrefabName))`
`223`	`223`	`{`
`224`	`224`	`Debug.LogWarning("MLAPI: There is no player prefab in the NetworkConfig, or it's not registered at as a spawnable prefab");`
`225`	`225`	`return null;`
`226`	`226`	`}`
`227`		`- GameObject go = MonoBehaviour.Instantiate(netManager.NetworkConfig.NetworkedPrefabs[netManager.NetworkConfig.NetworkPrefabIds[netManager.NetworkConfig.PlayerPrefabName]].prefab);`
	`227`	`+ GameObject go = MonoBehaviour.Instantiate(netManager.NetworkConfig.NetworkedPrefabs[netManager.NetworkConfig.NetworkPrefabIds[netManager.NetworkConfig.PlayerPrefabName]].prefab, position, rotation);`
`228`	`228`	`NetworkedObject netObject = go.GetComponent<NetworkedObject>();`
`229`	`229`	`if (netObject == null)`
`230`	`230`	`{`