add TMX class support in TiledMap

Author: jube

include/gf2/core/TiledMap.h

@@ -34,13 +34,14 @@ namespace gf {
   struct GF_CORE_API MapLayer {
     uint32_t properties_index = NoIndex;
     std::string name;
+    std::string type;
     Vec2I offset = { 0, 0 };
   };
 
   template<typename Archive>
   Archive& operator|(Archive& ar, MaybeConst<MapLayer, Archive>& data)
   {
-    return ar | data.properties_index | data.name | data.offset;
+    return ar | data.properties_index | data.name | data.type | data.offset;
   }
 
   struct GF_CORE_API MapTile {
@@ -137,6 +138,7 @@ namespace gf {
   }
 
   struct GF_CORE_API MapTileset {
+    std::string type;
     uint32_t properties_index = NoIndex;
     uint32_t texture_index = NoIndex;
     uint32_t first_gid = 0;
@@ -155,10 +157,11 @@ namespace gf {
   template<typename Archive>
   Archive& operator|(Archive& ar, MaybeConst<MapTileset, Archive>& data)
   {
-    return ar | data.properties_index | data.texture_index | data.first_gid | data.tile_size | data.spacing | data.margin | data.tiles;
+    return ar | data.type | data.properties_index | data.texture_index | data.first_gid | data.tile_size | data.spacing | data.margin | data.tiles;
   }
 
   struct GF_CORE_API TiledMap {
+    std::string type;
     uint32_t properties_index = NoIndex;
     GridOrientation orientation = GridOrientation::Unknown;
     CellAxis cell_axis = CellAxis::X;
@@ -189,7 +192,7 @@ namespace gf {
   template<typename Archive>
   Archive& operator|(Archive& ar, MaybeConst<TiledMap, Archive>& map)
   {
-    return ar | map.properties_index | map.orientation | map.cell_axis | map.cell_index | map.hex_side_length | map.map_size | map.tile_size | map.properties | map.tilesets | map.tile_layers | map.object_layers | map.group_layers | map.layers | map.textures;
+    return ar | map.type | map.properties_index | map.orientation | map.cell_axis | map.cell_index | map.hex_side_length | map.map_size | map.tile_size | map.properties | map.tilesets | map.tile_layers | map.object_layers | map.group_layers | map.layers | map.textures;
   }
 
 }

library/core/TiledMap.cc

@@ -201,6 +201,7 @@ namespace gf {
       MapLayer layer;
       layer.properties_index = parse_tmx_properties(node, map);
       layer.name = node.attribute("name").as_string();
+      layer.type = node.attribute("class").as_string();
       layer.offset.x = node.attribute("offsetx").as_int(0);
       layer.offset.y = node.attribute("offsety").as_int(0);
       unsupported_attribute(node, "opacity");
@@ -682,10 +683,15 @@ namespace gf {
       return tile;
     }
 
-    void parse_tmx_tileset_from_element(MapTileset& tileset, const pugi::xml_node node, TiledMap& map, const std::filesystem::path& base_directory)
+    MapTileset parse_tmx_tileset_from_element(const pugi::xml_node node, TiledMap& map, const std::filesystem::path& base_directory)
     {
       assert(node.name() == "tileset"sv);
 
+      MapTileset tileset;
+      tileset.type = node.attribute("class").as_string();
+      tileset.properties_index = parse_tmx_properties(node, map);
+      tileset.first_gid = node.attribute("firstgid").as_uint();
+
       tileset.tile_size.w = node.attribute("tilewidth").as_int();
       tileset.tile_size.h = node.attribute("tileheight").as_int();
 
@@ -710,9 +716,11 @@ namespace gf {
       std::sort(tileset.tiles.begin(), tileset.tiles.end(), MapTilesetTileComparator());
 
       unsupported_node(node, "wangsets");
+
+      return tileset;
     }
 
-    void parse_tmx_tileset_from_file(MapTileset& tileset, const std::filesystem::path& source, TiledMap& map, const std::filesystem::path& base_directory)
+    MapTileset parse_tmx_tileset_from_file(const std::filesystem::path& source, TiledMap& map, const std::filesystem::path& base_directory)
     {
       std::filesystem::path tileset_path = base_directory / source;
       std::ifstream tileset_file(tileset_path);
@@ -738,25 +746,19 @@ namespace gf {
         Log::warning("Attribute 'source' present in a TSX file: '{}'.", tileset_path);
       }
 
-      parse_tmx_tileset_from_element(tileset, node, map, tileset_path.parent_path());
+      return parse_tmx_tileset_from_element(node, map, tileset_path.parent_path());
     }
 
     MapTileset parse_tmx_tileset(const pugi::xml_node node, TiledMap& map, const std::filesystem::path& base_directory)
     {
       assert(node.name() == "tileset"sv);
-      MapTileset tileset;
-      tileset.properties_index = parse_tmx_properties(node, map);
-      tileset.first_gid = node.attribute("firstgid").as_uint();
-
       const std::filesystem::path source = node.attribute("source").as_string();
 
       if (!source.empty()) {
-        parse_tmx_tileset_from_file(tileset, source, map, base_directory);
-      } else {
-        parse_tmx_tileset_from_element(tileset, node, map, base_directory);
+        return parse_tmx_tileset_from_file(source, map, base_directory);
       }
 
-      return tileset;
+      return parse_tmx_tileset_from_element(node, map, base_directory);
     }
 
     /*
@@ -767,6 +769,7 @@ namespace gf {
     {
       assert(node.name() == "map"sv);
 
+      map.type = node.attribute("class").as_string();
       map.properties_index = parse_tmx_properties(node, map);
 
       std::string orientation = node.attribute("orientation").as_string();