From 5244bbcfbb7adc1f570051b10f063e855c3e22a6 Mon Sep 17 00:00:00 2001 From: Felix Boucher Date: Tue, 13 Jun 2023 18:35:08 -0400 Subject: [PATCH] change names + add commentaries --- .../Drag&Drop/GameObjectPlacementButton.cs | 19 ++++++++++--------- .../Scripts/Drag&Drop/TilePlacementButton.cs | 8 ++++---- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Assets/Scripts/Drag&Drop/GameObjectPlacementButton.cs b/Assets/Scripts/Drag&Drop/GameObjectPlacementButton.cs index f51d073..a4c1d7c 100644 --- a/Assets/Scripts/Drag&Drop/GameObjectPlacementButton.cs +++ b/Assets/Scripts/Drag&Drop/GameObjectPlacementButton.cs @@ -8,23 +8,24 @@ public class GameObjectPlacementButton : UnitPlacementButton { var instance = Instantiate(_prefab); - //we need to do that before stripping the object + //we need to fetch the detection size before stripping the object var detectComp = instance.GetComponentInChildren(); Rect detectionRect = default; if(detectComp) detectionRect = instance.GetComponentInChildren().DetectionRectangle; - //strip the objecty - foreach (var comp in instance.transform.GetAllComponents()) Destroy(comp); - foreach (var comp in instance.transform.GetAllComponents()) Destroy(comp); - foreach (var comp in instance.transform.GetAllComponents()) Destroy(comp); + //strip the object + foreach (var r_body in instance.transform.GetAllComponents()) Destroy(r_body); + foreach (var coll in instance.transform.GetAllComponents()) Destroy(coll); + foreach (var script in instance.transform.GetAllComponents()) Destroy(script); - foreach (var comp in instance.transform.GetAllComponents()) + //assign outline material tou all renderers of the placeholder + foreach (var rend in instance.transform.GetAllComponents()) { - var color = (comp as SpriteRenderer).color; + var color = (rend as SpriteRenderer).color; color.a = 0.6f; - (comp as SpriteRenderer).color = color; + (rend as SpriteRenderer).color = color; - (comp as SpriteRenderer).material = _outlineMaterial; + (rend as SpriteRenderer).material = _outlineMaterial; } diff --git a/Assets/Scripts/Drag&Drop/TilePlacementButton.cs b/Assets/Scripts/Drag&Drop/TilePlacementButton.cs index d1181a9..5015048 100644 --- a/Assets/Scripts/Drag&Drop/TilePlacementButton.cs +++ b/Assets/Scripts/Drag&Drop/TilePlacementButton.cs @@ -7,10 +7,10 @@ public class TilePlacementButton : UnitPlacementButton public LevelTile tile; protected override void Place() { - var placeholder = new GameObject(tile.name); - var comp = placeholder.AddComponent(); - comp.Tile = tile; - var rend = placeholder.AddComponent(); + var instance = new GameObject(tile.name); + var placeholder = instance.AddComponent(); + placeholder.Tile = tile; + var rend = instance.AddComponent(); rend.sprite = tile.Sprite; rend.sortingLayerName = "Character"; rend.material = _outlineMaterial;