fix tileset loading

Ragath · Jan 15, 2023 · 75daee1 · 75daee1
1 parent ffbe63e
commit 75daee1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/TiledLib.Pipeline/TiledMapImporter.cs b/TiledLib.Pipeline/TiledMapImporter.cs
@@ -2,24 +2,23 @@
 using System.Linq;
 using Microsoft.Xna.Framework.Content.Pipeline;
 
-namespace TiledLib.Pipeline
+namespace TiledLib.Pipeline;
+
+[ContentImporter(new[] { ".tmx", ".json" }, CacheImportedData = false, DisplayName = "Tiled Map Importer", DefaultProcessor = "PassThroughProcessor")]
+public class TiledMapImporter : ContentImporter<Map>
 {
-    [ContentImporter(new[] { ".tmx", ".json" }, CacheImportedData = false, DisplayName = "Tiled Map Importer", DefaultProcessor = "PassThroughProcessor")]
-    public class TiledMapImporter : ContentImporter<Map>
+    public override Map Import(string filename, ContentImporterContext context)
     {
-        public override Map Import(string filename, ContentImporterContext context)
-        {
-            string GetPath(string path) => Path.IsPathRooted(path) ? path : Path.Combine(Path.GetDirectoryName(filename), path);
+        string GetPath(string path) => Path.IsPathRooted(path) ? path : Path.Combine(Path.GetDirectoryName(filename), path);
 
-            using (var stream = File.OpenRead(filename))
-            {
-                var map = Map.FromStream(stream, ts => File.OpenRead(GetPath(ts.Source)));
+        using (var stream = File.OpenRead(filename))
+        {
+            var map = Map.FromStream(stream, ts => File.OpenRead(GetPath(ts.Source)));
 
-                foreach (var ts in map.Tilesets.OfType<ExternalTileset>())
-                    ts.LoadTileset();
+            foreach (var ts in map.Tilesets.OfType<ExternalTileset>())
+                ts.LoadTileset();
 
-                return map;
-            }
+            return map;
         }
     }
 }
diff --git a/TiledLib/Tileset.cs b/TiledLib/Tileset.cs
@@ -92,7 +92,7 @@ public Tile this[int gid]
     public static Tileset FromStream(Stream stream)
     {
         if (Utils.ContainsJson(stream))
-            return JsonSerializer.Deserialize<Tileset>(stream);
+            return JsonSerializer.Deserialize<Tileset>(stream, new JsonSerializerOptions(JsonSerializerDefaults.Web));
         else
             return (Tileset)new XmlSerializer(typeof(Tileset)).Deserialize(stream);