Fix obsolete warnings

OndrejNepozitek · Feb 15, 2024 · 4c2380b · 4c2380b
1 parent 08988f3
commit 4c2380b
Show file tree

Hide file tree

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

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

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

diff --git a/Runtime/Grid2D/Common/Utils/PostProcessUtilsGrid2D.cs b/Runtime/Grid2D/Common/Utils/PostProcessUtilsGrid2D.cs
@@ -289,12 +289,18 @@ public static void DisableRoomTemplateColliders(GameObject roomTemplate)
                 // Iterate through all the colliders
                 foreach (var collider in tilemap.GetComponents<Collider2D>())
                 {
+                    #if UNITY_2021_3
+                    var usedByComposite = collider.compositeOperation != Collider2D.CompositeOperation.None;
+                    #else
+                    var usedByComposite = collider.usedByComposite;
+                    #endif
+
                     // If the collider is not used by composite collider and it is not a trigger, destroy it
-                    if (!collider.usedByComposite && !collider.isTrigger)
+                    if (!usedByComposite && !collider.isTrigger)
                     {
                         Destroy(collider);
                     }
-                    else if (collider.usedByComposite)
+                    else if (usedByComposite)
                     {
                         // If the collider is used by composite but that composite does not exist or is not a trigger, destroy it
                         if (collider.composite == null || !collider.composite.isTrigger)

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

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