perf: Refactor that removes the LDtkEntityDrawerComponent, and simplifies the data delivery for all of the drawn scene window handles.

Author: Cammin

Assets/LDtkUnity/Editor/Builders/LDtkBuilderEntity.cs

@@ -1,5 +1,4 @@
-using UnityEditor;
-using UnityEngine;
+using UnityEngine;
 
 namespace LDtkUnity.Editor
 {
@@ -67,8 +66,7 @@ private void BuildEntityInstance()
 
         private void PopulateEntityComponent()
         {
-            Vector2 size = ((Vector2)_entity.UnityPxSize / Project.PixelsPerUnit);
-            
+            Vector2 size = (Vector2)_entity.UnityPxSize / Project.PixelsPerUnit;
             _entityComponent.OnImport(Importer.DefinitionObjects, _entity, LayerComponent, _fieldsComponent, _iidComponent, size);
         }
 
@@ -96,10 +94,6 @@ private void AddFieldData()
             _fieldsComponent = fieldsFactory.FieldsComponent;
             LDtkProfiler.EndSample();
 
-            LDtkProfiler.BeginSample("AddHandleDrawers");
-            AddHandleDrawers(_entityObj, _entity, Layer.GridSize);
-            LDtkProfiler.EndSample();
-            
             LDtkProfiler.BeginSample("InterfaceEvents");
             InterfaceEvents();
             LDtkProfiler.EndSample();
@@ -144,115 +138,6 @@ private void PositionEntity()
 
             _entityObj.transform.localPosition = localPos;
         }
-
-        /// <summary>
-        /// Only doing this for importer performance. an early return to not build the rest
-        /// </summary>
-        private static bool DrawerEligibility(FieldInstance field)
-        {
-            EditorDisplayMode? mode = field.Definition.EditorDisplayMode;
-            
-            switch (mode)
-            {
-                case EditorDisplayMode.Hidden: //do not show
-                    return false;
-                
-                case EditorDisplayMode.ValueOnly: //all but point/point array
-                    return !field.IsPoint;
-                    
-                case EditorDisplayMode.NameAndValue: //all
-                    return true;
-                    
-                case EditorDisplayMode.EntityTile: //enum/enum array, tile/tile array
-                    return field.IsEnum || field.IsTile;
-
-                case EditorDisplayMode.RadiusGrid: //int, float
-                case EditorDisplayMode.RadiusPx: //int, float
-                    return field.IsInt || field.IsFloat;
-
-                case EditorDisplayMode.PointStar: //point, point array
-                case EditorDisplayMode.Points: //point, point array
-                    return field.IsPoint;
-                    
-                case EditorDisplayMode.PointPath: //point array only
-                case EditorDisplayMode.PointPathLoop: //point array only
-                    return field.IsPoint && field.Definition.IsArray;
-                
-                case EditorDisplayMode.ArrayCountNoLabel: //any arrays
-                case EditorDisplayMode.ArrayCountWithLabel: //any arrays
-                    return field.Definition.IsArray;
-                    
-                case EditorDisplayMode.RefLinkBetweenCenters: //entity ref, entity ref array
-                case EditorDisplayMode.RefLinkBetweenPivots: //entity ref, entity ref array
-                    return field.IsEntityRef;
-                    
-                default:
-                    LDtkDebug.LogError("No Drawer eligibility found!");
-                    return false;
-            }
-        }
-        
-        private void AddHandleDrawers(GameObject gameObject, EntityInstance entityInstance, int gridSize)
-        {
-            LDtkEntityDrawerComponent drawerComponent = gameObject.gameObject.AddComponent<LDtkEntityDrawerComponent>();
-            EntityDefinition entityDef = entityInstance.Definition;
-
-            string entityPath = GetEntityImageAndRect(entityInstance, Project.assetPath, out Rect entityIconRect);
-            Vector2 size = (Vector2)entityInstance.UnityPxSize / Project.PixelsPerUnit;
-
-            Color smartColor = entityInstance.UnitySmartColor;
-
-            //entity handle data
-            LDtkEntityDrawerData entityDrawerData = new LDtkEntityDrawerData(drawerComponent.transform, entityDef, entityPath, entityIconRect, size, smartColor);
-            drawerComponent.AddEntityDrawer(entityDrawerData);
-
-            foreach (FieldInstance fieldInstance in entityInstance.FieldInstances)
-            {
-                if (!DrawerEligibility(fieldInstance))
-                {
-                    continue;
-                }
-
-                EditorDisplayMode displayMode = fieldInstance.Definition.EditorDisplayMode;
-                Vector2 pivotOffset = LDtkCoordConverter.EntityPivotOffset(entityDef.UnityPivot, size);
-                Vector3 middleCenter = gameObject.transform.position + (Vector3)pivotOffset;
-                
-                LDtkFieldDrawerData data = new LDtkFieldDrawerData(_fieldsComponent, smartColor, displayMode, fieldInstance.Identifier, gridSize, Project.PixelsPerUnit, middleCenter);
-                drawerComponent.AddReference(data);
-            }
-        }
-        
-        //this would be used instead in the entity drawer for getting the texture that way
-        private string GetEntityImageAndRect(EntityInstance entityInstance, string assetPath, out Rect rect)
-        {
-            rect = new Rect();
-            
-            TilesetRectangle tile = entityInstance.Tile;
-            if (tile == null)
-            {
-                return null;
-            }
-            
-            //todo while awaiting this fix, safely null check it https://github.com/deepnight/ldtk/issues/1107
-            TilesetDefinition tileset = tile.Tileset;
-            if (tileset == null)
-            {
-                return null;
-            }
-
-            LDtkRelativeGetterTilesetTexture textureGetter = new LDtkRelativeGetterTilesetTexture();
-            Texture2D tex = textureGetter.GetRelativeAsset(tileset, assetPath);
-            if (tex == null)
-            {
-                return null;
-            }
-
-            Rect src = tile.UnityRect;
-            rect = LDtkCoordConverter.ImageSlice(src, tex.height);
-
-            string texPath = AssetDatabase.GetAssetPath(tex);
-            return texPath;
-        }
 
         public PointParseData GetParsedPointData()
         {

Assets/LDtkUnity/Editor/CustomEditor/LDtkEntityDrawerComponentEditor.cs

@@ -1,70 +1,69 @@
 using System;
-using UnityEditor;
+using System.Linq;
 using UnityEngine;
 
 namespace LDtkUnity.Editor
 {
+    /// <summary>
+    /// Draws entity stuff, no field stuff
+    /// </summary>
     internal static class LDtkSceneDrawerEntity
     {
-        public static ILDtkHandleDrawer DrawEntity(LDtkEntityDrawerData entity)
+        public static void DrawEntityDrawer(LDtkComponentEntity entityComponent)
         {
             Vector2 offset = Vector2.zero;
 
-            if (entity.Transform == null)
+            if (!entityComponent.Def)
             {
-                return null;
+                return;
             }
 
-            switch (entity.EntityMode)
+            switch (entityComponent.Def.RenderMode)
             {
                 case RenderMode.Cross:
                 case RenderMode.Ellipse:
                 case RenderMode.Rectangle:
                 case RenderMode.Tile:
-                    LDtkEntityDrawerShapes.Data shapeData = new LDtkEntityDrawerShapes.Data()
-                    {
-                        EntityMode = entity.EntityMode,
-                        FillOpacity = entity.FillOpacity,
-                        LineOpacity = entity.LineOpacity,
-                        Hollow = entity.Hollow,
-                        Pivot = entity.Pivot,
-                        Size = entity.Size
-                    };
-                    LDtkEntityDrawerShapes entityDrawer = new LDtkEntityDrawerShapes(entity.Transform, shapeData);
+                    LDtkEntityDrawerShapes entityDrawer = new LDtkEntityDrawerShapes(entityComponent);
                     entityDrawer.OnDrawHandles();
                     break;
                 default:
                     throw new ArgumentOutOfRangeException();
             }
 
-            offset = TryDrawTile(entity, offset);
-            TryDrawName(entity, offset);
+            offset = TryDrawTile(entityComponent, offset);
+            TryDrawName(entityComponent, offset);
 
-            return null;
+            return;
         }
 
-        private static void TryDrawName(LDtkEntityDrawerData entity, Vector2 offset)
+        private static void TryDrawName(LDtkComponentEntity entity, Vector2 offset)
         {
-            if (entity.ShowName && LDtkPrefs.ShowEntityIdentifier)
+            if (entity.Def.ShowName && LDtkPrefs.ShowEntityIdentifier)
             {
-                HandleUtil.DrawText(entity.Identifier, entity.Transform.position, entity.SmartColor, offset);
+                HandleUtil.DrawText(entity.Identifier, entity.transform.position, entity.SmartColor, offset);
             }
         }
 
-        private static Vector2 TryDrawTile(LDtkEntityDrawerData entity, Vector2 offset)
+        private static Vector2 TryDrawTile(LDtkComponentEntity entityComponent, Vector2 offset)
         {
-            if (!entity.DrawTile)
+            bool entityDrawsTile = entityComponent.Def.RenderMode == RenderMode.Tile;
+            bool fieldDrawsTile = entityComponent.Def.FieldDefs.Any(field => field.EditorDisplayMode == EditorDisplayMode.EntityTile);
+            
+            bool drawsTile = entityDrawsTile || fieldDrawsTile;
+            
+            if (!drawsTile)
             {
                 return offset;
             }
 
-            Texture2D tex = AssetDatabase.LoadAssetAtPath<Texture2D>(entity.TexPath);
-            if (tex == null)
+            Sprite tile = entityComponent.Tile;
+            if (!tile)
             {
                 return offset;
             }
 
-            LDtkEntityDrawerIcon iconDrawer = new LDtkEntityDrawerIcon(entity.Transform, tex, entity.TexRect);
+            LDtkEntityDrawerIcon iconDrawer = new LDtkEntityDrawerIcon(entityComponent.transform, tile.texture, tile.rect);
 
             iconDrawer.PrecalculateValues();
             offset += iconDrawer.OffsetToNextUI;

Assets/LDtkUnity/Editor/CustomEditor/LDtkEntityDrawerComponentEditor.cs.meta

@@ -3,7 +3,7 @@
 
 namespace LDtkUnity.Editor
 {
-    internal sealed class LDtkEntityDrawerIcon : ILDtkHandleDrawer
+    internal sealed class LDtkEntityDrawerIcon
     {
         private readonly Transform _transform;
         private readonly Texture _tex;
@@ -94,5 +94,24 @@ public void OnDrawHandles()
 
             Handles.EndGUI();
         }
+        
+        //todo incorporate this eventually to simplify the code
+        public static void DrawSprite(Rect position, Sprite sprite)
+        {
+            if (!sprite || !sprite.texture)
+            {
+                Debug.LogWarning("Sprite or its texture is null.");
+                return;
+            }
+
+            Rect texCoords = new Rect(
+                sprite.textureRect.x / sprite.texture.width,
+                sprite.textureRect.y / sprite.texture.height,
+                sprite.textureRect.width / sprite.texture.width,
+                sprite.textureRect.height / sprite.texture.height
+            );
+
+            GUI.DrawTextureWithTexCoords(position, sprite.texture, texCoords);
+        }
     }
 }