Use CompositeOperation only in Unity 2022_1 or newer

OndrejNepozitek · Feb 16, 2024 · bbe7f70 · bbe7f70
1 parent 4c2380b
commit bbe7f70
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/Examples/Grid2D/CurrentRoomDetection/Scripts/CurrentRoomDetectionPostProcessing.cs b/Examples/Grid2D/CurrentRoomDetection/Scripts/CurrentRoomDetectionPostProcessing.cs
@@ -35,7 +35,7 @@ public override void Run(DungeonGeneratorLevelGrid2D level)
         private void AddFloorCollider(GameObject floor)
         {
             var tilemapCollider2D = floor.AddComponent<TilemapCollider2D>();
-            #if UNITY_2021_3
+            #if UNITY_2022_1_OR_NEWER
             tilemapCollider2D.compositeOperation = Collider2D.CompositeOperation.Merge;
             #else
             tilemapCollider2D.usedByComposite = true;

diff --git a/Examples/Grid2D/Resources/Docs/CurrentRoomDetection.cs b/Examples/Grid2D/Resources/Docs/CurrentRoomDetection.cs
@@ -29,7 +29,7 @@ public override void Run(DungeonGeneratorLevelGrid2D level)
             private void AddFloorCollider(GameObject floor)
             {
                 var tilemapCollider2D = floor.AddComponent<TilemapCollider2D>();
-                #if UNITY_2021_3
+                #if UNITY_2022_1_OR_NEWER
                     tilemapCollider2D.compositeOperation = Collider2D.CompositeOperation.Merge;
                 #else
                     tilemapCollider2D.usedByComposite = true;

diff --git a/Examples/Grid2D/Resources/Docs/CustomizeRoomTemplates/CustomTilemapLayersHandlerExample.cs b/Examples/Grid2D/Resources/Docs/CustomizeRoomTemplates/CustomTilemapLayersHandlerExample.cs
@@ -51,7 +51,7 @@ protected GameObject CreateTilemapGameObject(string name, GameObject parentObjec
         protected void AddCompositeCollider(GameObject tilemapGameObject, bool isTrigger = false)
         {
             var tilemapCollider2D = tilemapGameObject.AddComponent<TilemapCollider2D>();
-            #if UNITY_2021_3
+            #if UNITY_2022_1_OR_NEWER
             tilemapCollider2D.compositeOperation = Collider2D.CompositeOperation.Merge;
             #else
             tilemapCollider2D.usedByComposite = true;

diff --git a/Runtime/Grid2D/DungeonGenerator/DungeonTilemapLayersHandlerGrid2D.cs b/Runtime/Grid2D/DungeonGenerator/DungeonTilemapLayersHandlerGrid2D.cs
@@ -42,7 +42,7 @@ protected GameObject CreateTilemapGameObject(string name, GameObject parentObjec
         protected void AddCompositeCollider(GameObject gameObject)
         {
             var tilemapCollider2D = gameObject.AddComponent<TilemapCollider2D>();
-            #if UNITY_2021_3
+            #if UNITY_2022_1_OR_NEWER
             tilemapCollider2D.compositeOperation = Collider2D.CompositeOperation.Merge;
             #else
             tilemapCollider2D.usedByComposite = true;

diff --git a/Tests/Runtime/Scenes/TilemapLayersStructure/CustomTilemapLayersHandler.cs b/Tests/Runtime/Scenes/TilemapLayersStructure/CustomTilemapLayersHandler.cs
@@ -43,7 +43,7 @@ protected GameObject CreateTilemapGameObject(string name, GameObject parentObjec
         protected void AddCompositeCollider(GameObject gameObject)
         {
             var tilemapCollider2D = gameObject.AddComponent<TilemapCollider2D>();
-            #if UNITY_2021_3
+            #if UNITY_2022_1_OR_NEWER
                 tilemapCollider2D.compositeOperation = Collider2D.CompositeOperation.Merge;
             #else
                 tilemapCollider2D.usedByComposite = true;