Mapbuilder fixes (#111)

* Fix some warnings and null ref exceptions in the map builder

Author: zeroZshadow

workers/unity/Assets/Fps/Scripts/Config/MapBuilder.cs

@@ -95,6 +95,7 @@ public void CleanAndBuild(
             PlaceTiles();
             PlaceGround();
             FillSurround();
+            CollapseTileMeshes();
             MakeLevelObjectStatic();
 
             spawnPointSystemTransform.gameObject.GetComponent<SpawnPoints>()?.SetSpawnPoints();
@@ -120,6 +121,11 @@ public void CleanAndBuild(
                 $"x{numTotalTilesWide * mapBuilderSettings.UnitsPerTile + mapBuilderSettings.UnitsPerBlock} units\n");
         }
 
+        private void CollapseTileMeshes()
+        {
+            tileParentTransform.GetComponent<TileCollapser>().CollapseMeshes();
+        }
+
         private void InitializeGroupsAndComponents()
         {
             if (gameObject.GetComponentInChildren<SpawnPoints>() == null)

workers/unity/Assets/Fps/Scripts/Editor/MapBuilderVisualisationWindow.cs

@@ -80,10 +80,13 @@ public void OnGUI()
                 }
             }
 
+            EditorGUI.BeginDisabledGroup(mapBuilder == null);
             if (GUILayout.Button("Clear Map"))
             {
                 mapBuilder.Clean();
             }
+
+            EditorGUI.EndDisabledGroup();
         }
 
         private bool GetGenerationUserConfirmation(int numTiles)

workers/unity/Assets/Fps/Scripts/GameLogic/Respawning/SpawnPoints/SpawnPoints.cs

@@ -53,7 +53,15 @@ public void SetSpawnPoints()
                     SpawnYaw = spawnPointTransform.eulerAngles.y,
                     SpawnPitch = 0
                 };
-                Destroy(spawnPoints[n]);
+
+                if (Application.isPlaying)
+                {
+                    Destroy(spawnPoints[n]);
+                }
+                else
+                {
+                    DestroyImmediate(spawnPoints[n]);
+                }
             }
         }
 

workers/unity/Assets/Fps/Scripts/GameLogic/WorldTiles/TileCollapser.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Improbable.Gdk.Core;
 using MeshUtilities;
 using UnityEngine;
 
@@ -7,7 +8,7 @@ public class TileCollapser : MonoBehaviour
     private readonly Dictionary<string, CombinedMeshAndMaterialsData> collapsedInstances =
         new Dictionary<string, CombinedMeshAndMaterialsData>();
 
-    private void Awake()
+    public void CollapseMeshes()
     {
         for (var i = 0; i < transform.childCount; i++)
         {
@@ -16,7 +17,7 @@ private void Awake()
             if (!collapsedInstances.ContainsKey(child.name))
             {
                 var combined = TileCombinedMeshProvider.GetCombinedMeshes(child);
-                combined.combinedMesh.name = child.name + "_Mesh";
+                combined.combinedMesh.name = $"{child.name}_Mesh";
                 collapsedInstances.Add(child.name, combined);
             }
 
@@ -29,12 +30,12 @@ private void DestroyMeshRenderers(Transform obj)
     {
         foreach (var meshRenderer in obj.GetComponentsInChildren<MeshRenderer>())
         {
-            Destroy(meshRenderer);
+            UnityObjectDestroyer.Destroy(meshRenderer);
         }
 
         foreach (var meshFilter in obj.GetComponentsInChildren<MeshFilter>())
         {
-            Destroy(meshFilter);
+            UnityObjectDestroyer.Destroy(meshFilter);
         }
     }
 

workers/unity/Assets/Fps/Scripts/GameLogic/WorldTiles/TileCombinedMeshProvider.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using UnityEngine;
+using Object = UnityEngine.Object;
 
 namespace MeshUtilities
 {
@@ -69,16 +70,20 @@ private static Dictionary<Material, List<CombineInstance>> GatherMaterialsAndMes
             for (var j = 0; j < meshFilters.Length; j++)
             {
                 var meshFilter = meshFilters[j];
-
                 var meshRenderer = meshFilter.GetComponent<MeshRenderer>();
 
-                var material = meshRenderer.sharedMaterial;
-                var combineInstance = new CombineInstance();
+                if (meshFilter.sharedMesh == null)
+                {
+                    Debug.LogWarning("Skipping missing mesh", meshFilter.gameObject);
+                    continue;
+                }
 
+                var material = meshRenderer.sharedMaterial;
+                var objMesh = Object.Instantiate(meshFilter.sharedMesh);
 
-                var objMesh = meshFilter.mesh;
                 ApplyScaleToVertexColours(ref objMesh, meshFilter.transform.localScale);
 
+                var combineInstance = new CombineInstance();
                 combineInstance.mesh = objMesh;
                 combineInstance.transform = meshFilter.transform.localToWorldMatrix;