Version 1.7.1 for Godot 4.2.x

CSharp/addons/YATI/TilemapCreator.cs

@@ -826,13 +826,18 @@ private static void SetSpriteOffset(Sprite2D objSprite, float width, float heigh
         };
     }
 
-    private static void ConvertMetaDataToObjProperties(TileData td, Dictionary obj)
+    private void ConvertMetaDataToObjProperties(TileData td, Dictionary obj)
     {
         var metaList = td.GetMetaList();
         foreach (var metaName in metaList)
         {
-            if (((string)metaName)?.ToLower() is ClassInternal or GodotNodeTypeProperty)
+            switch (((string)metaName)?.ToLower())
+            {
+                case GodotNodeTypeProperty:
+                case ClassInternal when !_addClassAsMetadata:
                 continue;
+            }
+
             var metaVal = td.GetMeta(metaName);
             var metaType = metaVal.VariantType;
             var propDict = new Dictionary();
@@ -1111,7 +1116,7 @@ private void HandleObject(Dictionary obj, Node layerNode, TileSet tileset, Vecto
                 td = gidSource.GetTileData(Vector2I.Zero, 0);
             }
 
-            // Tile objects could also be classified as instance...
+            // Tile objects may already have been classified as instance in the tileset
             var objIsInstance = godotType == GodotType.Instance && !obj.ContainsKey("template") && !obj.ContainsKey("text");
             var tileClass = "";
             if (td.HasMeta(ClassInternal))
@@ -1163,6 +1168,12 @@ private void HandleObject(Dictionary obj, Node layerNode, TileSet tileset, Vecto
 
                 return;
             }
+
+            // Tile objects may already have been classified as ...body in the tileset
+            if (tileClass != "" && godotType == GodotType.Empty)
+                godotType = GetGodotType(tileClass);
+
+            ConvertMetaDataToObjProperties(td, obj);
 
             var idx = (int)td.GetCustomData(CustomDataInternal);
             if (idx > 0)
@@ -1194,8 +1205,6 @@ private void HandleObject(Dictionary obj, Node layerNode, TileSet tileset, Vecto
                 }
             }
 
-            ConvertMetaDataToObjProperties(td, obj);
-
             objSprite.FlipH = flippedH;
             objSprite.FlipV = flippedV;
 

CSharp/addons/YATI/plugin.cfg

@@ -3,5 +3,5 @@
 name="YATI"
 description=""
 author="Roland Helmerichs"
-version="1.7.0"
+version="1.7.1"
 script="TiledImport.cs"

CSharp/runtime/TilemapCreator.cs

@@ -824,13 +824,18 @@ private static void SetSpriteOffset(Sprite2D objSprite, float width, float heigh
         };
     }
 
-    private static void ConvertMetaDataToObjProperties(TileData td, Dictionary obj)
+    private void ConvertMetaDataToObjProperties(TileData td, Dictionary obj)
     {
         var metaList = td.GetMetaList();
         foreach (var metaName in metaList)
         {
-            if (((string)metaName)?.ToLower() is ClassInternal or GodotNodeTypeProperty)
+            switch (((string)metaName)?.ToLower())
+            {
+                case GodotNodeTypeProperty:
+                case ClassInternal when !_addClassAsMetadata:
                 continue;
+            }
+
             var metaVal = td.GetMeta(metaName);
             var metaType = metaVal.VariantType;
             var propDict = new Dictionary();
@@ -1109,7 +1114,7 @@ private void HandleObject(Dictionary obj, Node layerNode, TileSet tileset, Vecto
                 td = gidSource.GetTileData(Vector2I.Zero, 0);
             }
 
-            // Tile objects could also be classified as instance...
+            // Tile objects may already have been classified as instance in the tileset
             var objIsInstance = godotType == GodotType.Instance && !obj.ContainsKey("template") && !obj.ContainsKey("text");
             var tileClass = "";
             if (td.HasMeta(ClassInternal))
@@ -1161,6 +1166,12 @@ private void HandleObject(Dictionary obj, Node layerNode, TileSet tileset, Vecto
 
                 return;
             }
+
+            // Tile objects may already have been classified as ...body in the tileset
+            if (tileClass != "" && godotType == GodotType.Empty)
+                godotType = GetGodotType(tileClass);
+
+            ConvertMetaDataToObjProperties(td, obj);
 
             var idx = (int)td.GetCustomData(CustomDataInternal);
             if (idx > 0)
@@ -1192,8 +1203,6 @@ private void HandleObject(Dictionary obj, Node layerNode, TileSet tileset, Vecto
                 }
             }
 
-            ConvertMetaDataToObjProperties(td, obj);
-
             objSprite.FlipH = flippedH;
             objSprite.FlipV = flippedV;
 

CSharp/runtime/XmlParserCtrl.cs

@@ -30,7 +30,6 @@ public class XmlParserCtrl
     private readonly XmlParser _parser = new();
     private string _parsedFileName;
 
-
     public Error Open(string sourceFile)
     {
         _parsedFileName = sourceFile;

GDScript/addons/YATI/TilemapCreator.gd

@@ -691,7 +691,9 @@ func set_sprite_offset(obj_sprite: Sprite2D, width: float, height: float, alignm
 func convert_metadata_to_obj_properties(td: TileData, obj: Dictionary) -> void:
 	var meta_list = td.get_meta_list()
 	for meta_name in meta_list:
-		if meta_name.to_lower() in [CLASS_INTERNAL, GODOT_NODE_TYPE_PROPERTY]:
+		if meta_name.to_lower() == GODOT_NODE_TYPE_PROPERTY:
+			continue
+		if meta_name.to_lower() == CLASS_INTERNAL and not _add_class_as_metadata:
 			continue
 		var meta_val = td.get_meta(meta_name)
 		var meta_type = typeof(meta_val)
@@ -913,7 +915,7 @@ func handle_object(obj: Dictionary, layer_node: Node, tileset: TileSet, offset:
 				obj_sprite.scale = Vector2(scale_x, scale_y)
 			td = gid_source.get_tile_data(Vector2i.ZERO, 0)
 
-		# Tile objects could also be classified as instance...
+		# Tile objects may already have been classified as instance in the tileset
 		var obj_is_instance = godot_type == _godot_type.INSTANCE and not obj.has("template") and not obj.has("text")
 		var tile_class = ""
 		if td.has_meta(CLASS_INTERNAL):
@@ -955,6 +957,12 @@ func handle_object(obj: Dictionary, layer_node: Node, tileset: TileSet, offset:
 					handle_properties(instance, obj["properties"])
 			return
 
+		# Tile objects may already have been classified as ...body in the tileset
+		if tile_class != "" and godot_type == _godot_type.EMPTY:
+			godot_type = get_godot_type(tile_class)
+
+		convert_metadata_to_obj_properties(td, obj)
+
 		var idx = td.get_custom_data(CUSTOM_DATA_INTERNAL)
 		if idx > 0:
 			var parent = {
@@ -979,8 +987,6 @@ func handle_object(obj: Dictionary, layer_node: Node, tileset: TileSet, offset:
 				if obj.has("properties"):
 					handle_properties(parent, obj["properties"])
 
-		convert_metadata_to_obj_properties(td, obj)
-
 		obj_sprite.flip_h = flippedH
 		obj_sprite.flip_v = flippedV
 

GDScript/addons/YATI/TilesetCreator.gd

@@ -196,7 +196,7 @@ func create_or_append(tile_set: Dictionary):
 
 		_current_atlas_source.texture = texture
 		_columns = _current_atlas_source.texture.get_width() / _tile_size.x
-		_tile_count = _columns * _current_atlas_source.texture.get_width() / _tile_size.x
+		_tile_count = _columns * _current_atlas_source.texture.get_height() / _tile_size.x
 
 		register_atlas_source(added_source_id, _tile_count, -1, _tile_offset)
 		var atlas_grid_size = _current_atlas_source.get_atlas_grid_size()

GDScript/addons/YATI/plugin.cfg

@@ -3,5 +3,5 @@
 name="YATI"
 description=""
 author="Roland Helmerichs"
-version="1.7.0"
+version="1.7.1"
 script="TiledImport.gd"

GDScript/runtime/TilemapCreator.gd

@@ -690,7 +690,9 @@ func set_sprite_offset(obj_sprite: Sprite2D, width: float, height: float, alignm
 func convert_metadata_to_obj_properties(td: TileData, obj: Dictionary) -> void:
 	var meta_list = td.get_meta_list()
 	for meta_name in meta_list:
-		if meta_name.to_lower() in [CLASS_INTERNAL, GODOT_NODE_TYPE_PROPERTY]:
+		if meta_name.to_lower() == GODOT_NODE_TYPE_PROPERTY:
+			continue
+		if meta_name.to_lower() == CLASS_INTERNAL and not _add_class_as_metadata:
 			continue
 		var meta_val = td.get_meta(meta_name)
 		var meta_type = typeof(meta_val)
@@ -912,7 +914,7 @@ func handle_object(obj: Dictionary, layer_node: Node, tileset: TileSet, offset:
 				obj_sprite.scale = Vector2(scale_x, scale_y)
 			td = gid_source.get_tile_data(Vector2i.ZERO, 0)
 
-		# Tile objects could also be classified as instance...
+		# Tile objects may already have been classified as instance in the tileset
 		var obj_is_instance = godot_type == _godot_type.INSTANCE and not obj.has("template") and not obj.has("text")
 		var tile_class = ""
 		if td.has_meta(CLASS_INTERNAL):
@@ -954,6 +956,12 @@ func handle_object(obj: Dictionary, layer_node: Node, tileset: TileSet, offset:
 					handle_properties(instance, obj["properties"])
 			return
 
+		# Tile objects may already have been classified as ...body in the tileset
+		if tile_class != "" and godot_type == _godot_type.EMPTY:
+			godot_type = get_godot_type(tile_class)
+
+		convert_metadata_to_obj_properties(td, obj)
+
 		var idx = td.get_custom_data(CUSTOM_DATA_INTERNAL)
 		if idx > 0:
 			var parent = {
@@ -978,8 +986,6 @@ func handle_object(obj: Dictionary, layer_node: Node, tileset: TileSet, offset:
 				if obj.has("properties"):
 					handle_properties(parent, obj["properties"])
 
-		convert_metadata_to_obj_properties(td, obj)
-
 		obj_sprite.flip_h = flippedH
 		obj_sprite.flip_v = flippedV
 

GDScript/runtime/TilesetCreator.gd

@@ -195,7 +195,7 @@ func create_or_append(tile_set: Dictionary):
 
 		_current_atlas_source.texture = texture
 		_columns = _current_atlas_source.texture.get_width() / _tile_size.x
-		_tile_count = _columns * _current_atlas_source.texture.get_width() / _tile_size.x
+		_tile_count = _columns * _current_atlas_source.texture.get_height() / _tile_size.x
 
 		register_atlas_source(added_source_id, _tile_count, -1, _tile_offset)
 		var atlas_grid_size = _current_atlas_source.get_atlas_grid_size()