Fixed duplicate layer clearing from merge. Also setup physics for stencil layers

Author: Tshadow05

Runtime/Code/ProjectSetup/Editor/SetupManager.cs

@@ -3,26 +3,28 @@
 using UnityEditor;
 
 [InitializeOnLoad]
-public class SetupManager : AssetPostprocessor{
-    private static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromAssetPaths){
+public class SetupManager : AssetPostprocessor {
+    private static void OnPostprocessAllAssets(
+        string[] importedAssets,
+        string[] deletedAssets,
+        string[] movedAssets,
+        string[] movedFromAssetPaths) {
         if (!SessionState.GetBool("FirstAirshipSettingsInitDone", false)) {
             // Startup code here
             FixProject();
-         
+
             SessionState.SetBool("FirstAirshipSettingsInitDone", true);
         }
     }
-    
+
     [MenuItem("Airship/Misc/Repair Project")]
-    public static void FixProject()
-    {
+    public static void FixProject() {
         var config = MiscProjectSetup.Setup();
         PhysicsSetup.Setup(config);
     }
 
     [MenuItem("Airship/Misc/Reset Physics To Airship Defaults")]
-    public static void ResetPhysics()
-    {
+    public static void ResetPhysics() {
         var config = MiscProjectSetup.GetOrCreateGameConfig();
         PhysicsSetup.ResetDefaults(config, PhysicsSetup.defaultGravity);
     }

Runtime/Code/ProjectSetup/PhysicsSetup.cs

@@ -3,7 +3,7 @@
 
 public static class PhysicsSetup {
     public static readonly Vector3 defaultGravity = new(0, -9.81f, 0);
-    private const int NumberOfCoreLayers = 12;
+    private const int NumberOfCoreLayers = 13;
     private const int GameLayerStartIndex = 17;
     private static List<int> corelayers;
     private static List<int> gameLayers;
@@ -33,12 +33,6 @@ public static void Setup(GameConfig config) {
         PhysicsLayerEditor.SetLayer(10, "AvatarEditor");
         PhysicsLayerEditor.SetLayer(11, "LocalStencilMask");
         PhysicsLayerEditor.SetLayer(12, "StencilMask");
-        var lastCoreLayerNumber = 12; // Update this if we add more layers
-
-        // Clear all unused layers reserved for Airship core
-        for (var i = lastCoreLayerNumber + 1; i <= 16; i++) {
-            PhysicsLayerEditor.SetLayer(i, "");
-        }
 
         //Reserved for future use
         for (var i = NumberOfCoreLayers; i < GameLayerStartIndex; i++) {
@@ -58,13 +52,24 @@ public static void Setup(GameConfig config) {
         IgnoreAllLayers(LayerMask.NameToLayer("WorldUI"), true);
         //Only collide with game layers
         IgnoreAllLayers(LayerMask.NameToLayer("Character"), false);
+        IgnoreAllLayers(LayerMask.NameToLayer("LocalStencilMask"), false);
+        IgnoreAllLayers(LayerMask.NameToLayer("StencilMask"), false);
 
         //Character
         //Collides with
         Physics.IgnoreLayerCollision(LayerMask.NameToLayer("Character"), LayerMask.NameToLayer("Default"), false);
         Physics.IgnoreLayerCollision(LayerMask.NameToLayer("Character"), LayerMask.NameToLayer("VisuallyHidden"),
             false);
         Physics.IgnoreLayerCollision(LayerMask.NameToLayer("Character"), LayerMask.NameToLayer("Water"), false);
+        Physics.IgnoreLayerCollision(LayerMask.NameToLayer("LocalStencilMask"), LayerMask.NameToLayer("Default"),
+            false);
+        Physics.IgnoreLayerCollision(LayerMask.NameToLayer("LocalStencilMask"), LayerMask.NameToLayer("VisuallyHidden"),
+            false);
+        Physics.IgnoreLayerCollision(LayerMask.NameToLayer("LocalStencilMask"), LayerMask.NameToLayer("Water"), false);
+        Physics.IgnoreLayerCollision(LayerMask.NameToLayer("StencilMask"), LayerMask.NameToLayer("Default"), false);
+        Physics.IgnoreLayerCollision(LayerMask.NameToLayer("StencilMask"), LayerMask.NameToLayer("VisuallyHidden"),
+            false);
+        Physics.IgnoreLayerCollision(LayerMask.NameToLayer("StencilMask"), LayerMask.NameToLayer("Water"), false);
     }