Tidy up content pipeline support

Author: IrishBruse

Examples/Api/ApiGame.cs

@@ -38,7 +38,7 @@ protected override void Initialize()
         levels = new LDtkLevel[world.Levels.Length];
         for (int i = 0; i < world.Levels.Length; i++)
         {
-            levels[i] = world.LoadLevel("Level_" + i, Content);
+            levels[i] = world.LoadLevel("Level_" + i);
 
             rects.AddRange(levels[i].GetEntities<RectRegion>());
 

Examples/Platformer/LevelManager.cs

@@ -41,7 +41,7 @@ public void Update()
         {
             for (int i = 0; i < CurrentLevel._Neighbours.Length; i++)
             {
-                LDtkLevel neighbour = world.LoadLevel(CurrentLevel._Neighbours[i].LevelUid, content);
+                LDtkLevel neighbour = world.LoadLevel(CurrentLevel._Neighbours[i].LevelUid);
                 renderer.PrerenderLevel(neighbour);
 
                 if (neighbour.Contains(center))
@@ -58,20 +58,20 @@ public void Draw()
 
         for (int i = 0; i < CurrentLevel._Neighbours.Length; i++)
         {
-            LDtkLevel neighbour = world.LoadLevel(CurrentLevel._Neighbours[i].LevelUid, content);
+            LDtkLevel neighbour = world.LoadLevel(CurrentLevel._Neighbours[i].LevelUid);
             renderer.RenderPrerenderedLevel(neighbour);
         }
     }
 
     public void ChangeLevelTo(string identifier)
     {
-        CurrentLevel = content != null ? world.LoadLevel(identifier, content) : world.LoadLevel(identifier);
+        CurrentLevel = world.LoadLevel(identifier);
 
         renderer.PrerenderLevel(CurrentLevel);
 
         for (int ii = 0; ii < CurrentLevel._Neighbours.Length; ii++)
         {
-            LDtkLevel neighbourLevel = world.LoadLevel(CurrentLevel._Neighbours[ii].LevelUid, content);
+            LDtkLevel neighbourLevel = world.LoadLevel(CurrentLevel._Neighbours[ii].LevelUid);
             renderer.PrerenderLevel(neighbourLevel);
         }
 

LDtk/LDtk.csproj

@@ -6,6 +6,8 @@
         <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <LangVersion>10</LangVersion>
+
+        <IsPackable>true</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>

LDtk/LDtkWorld.cs

@@ -23,6 +23,11 @@ public partial class LDtkWorld
     /// </summary>
     public string RootFolder { get; set; }
 
+    /// <summary>
+    /// The content manager used if you are using the contentpipeline
+    /// </summary>
+    public ContentManager Content { get; set; }
+
     /// <summary>
     /// Loads the ldtk world file from disk directly
     /// </summary>
@@ -44,16 +49,12 @@ public static LDtkWorld LoadWorld(string filePath)
     /// <returns>LDtkWorld</returns>
     public static LDtkWorld LoadWorld(string filePath, ContentManager content)
     {
-        if (content != null)
-        {
-            LDtkWorld world;
-            world = content.Load<LDtkWorld>(filePath);
-            world.RootFolder = Path.GetDirectoryName(filePath);
+        LDtkWorld world;
+        world = content.Load<LDtkWorld>(filePath);
+        world.Content = content;
+        world.RootFolder = Path.GetDirectoryName(filePath);
 
-            return world;
-        }
-
-        throw new ContentLoadException($"Could not load ldtk world at {filePath}.");
+        return world;
     }
 
     /// <summary>
@@ -81,7 +82,7 @@ public LDtkLevel LoadLevel(string identifier)
 
             string path = Path.Join(RootFolder, Levels[i].ExternalRelPath);
 
-            level = JsonSerializer.Deserialize<LDtkLevel>(File.ReadAllText(path), SerializeOptions);
+            level = Content.Load<LDtkLevel>(path.Replace(".ldtkl", "")) ?? JsonSerializer.Deserialize<LDtkLevel>(File.ReadAllText(path), SerializeOptions);
             break;
         }
 
@@ -94,29 +95,6 @@ public LDtkLevel LoadLevel(string identifier)
         throw new LevelNotFoundException($"Could not find {identifier} Level in {this}.");
     }
 
-    /// <summary>
-    /// Gets a collection of entities of type <typeparamref name="T"/> in the current level
-    /// </summary>
-    /// <returns></returns>
-    /// <exception cref="EntityNotFoundException"></exception>
-    public T GetEntity<T>() where T : new()
-    {
-        List<T> entities = new List<T>();
-        for (int i = 0; i < Levels.Length; i++)
-        {
-            entities.AddRange(Levels[i].GetEntities<T>());
-        }
-
-        if (entities.Count == 1)
-        {
-            return entities[0];
-        }
-        else
-        {
-            throw new EntityNotFoundException($"Could not find entity with identifier {typeof(T).Name}");
-        }
-    }
-
     /// <summary>
     /// Loads the ldtkl world file from disk directly or from the embeded one depending on if externalLevels is set
     /// </summary>
@@ -142,45 +120,7 @@ public LDtkLevel LoadLevel(int uid)
 
             string path = Path.Join(RootFolder, Levels[i].ExternalRelPath);
 
-            level = JsonSerializer.Deserialize<LDtkLevel>(File.ReadAllText(path), SerializeOptions);
-            break;
-        }
-
-        if (level != null)
-        {
-            level.Parent = this;
-            return level;
-        }
-
-        throw new LevelNotFoundException($"Could not find {uid} Level in {this}.");
-    }
-
-    /// <summary>
-    /// Loads the ldtkl world file from disk directly or from the embeded one depending on if externalLevels is set
-    /// </summary>
-    /// <param name="uid">The Levels uid</param>
-    /// <param name="content">Content Pipeline</param>
-    /// <returns><see cref="LDtkLevel"/></returns>
-    /// <exception cref="LevelNotFoundException"></exception>
-    public LDtkLevel LoadLevel(int uid, ContentManager content)
-    {
-        LDtkLevel level = null;
-
-        for (int i = 0; i < Levels.Length; i++)
-        {
-            if (Levels[i].Uid != uid)
-            {
-                continue;
-            }
-
-            if (ExternalLevels == false)
-            {
-                level = Levels[i];
-                break;
-            }
-
-            string path = Path.Join(RootFolder, Levels[i].ExternalRelPath);
-            level = content.Load<LDtkLevel>(path.Replace(".ldtkl", ""));
+            level = Content.Load<LDtkLevel>(path.Replace(".ldtkl", "")) ?? JsonSerializer.Deserialize<LDtkLevel>(File.ReadAllText(path), SerializeOptions);
             break;
         }
 
@@ -212,43 +152,6 @@ public EntityDefinition GetEntityDefinitionFromUid(int uid)
         return null;
     }
 
-    /// <summary>
-    /// Loads the ldtkl world file from disk directly or from the embeded one depending on if externalLevels is set
-    /// </summary>
-    /// <param name="identifier">The Level identifier</param>
-    /// <param name="content">The optional XNA content manager if you are using the content pipeline</param>
-    /// <returns>LDtkWorld</returns>
-    public LDtkLevel LoadLevel(string identifier, ContentManager content)
-    {
-        LDtkLevel level = null;
-
-        for (int i = 0; i < Levels.Length; i++)
-        {
-            if (Levels[i].Identifier != identifier)
-            {
-                continue;
-            }
-
-            if (ExternalLevels == false)
-            {
-                level = Levels[i];
-                break;
-            }
-
-            string path = Path.Join(RootFolder, Levels[i].ExternalRelPath);
-            level = content.Load<LDtkLevel>(path.Replace(".ldtkl", ""));
-            break;
-        }
-
-        if (level != null)
-        {
-            level.Parent = this;
-            return level;
-        }
-
-        throw new LevelNotFoundException($"Could not Content.Load `{identifier}` in {this}.");
-    }
-
     /// <summary>
     /// Gets the intgrid value definitions
     /// </summary>
@@ -272,4 +175,27 @@ public IntGridValueDefinition[] GetIntgridValueDefinitions(string identifier)
 
         throw new FieldNotFoundException();
     }
+
+    /// <summary>
+    /// Gets a collection of entities of type <typeparamref name="T"/> in the current level
+    /// </summary>
+    /// <returns></returns>
+    /// <exception cref="EntityNotFoundException"></exception>
+    public T GetEntity<T>() where T : new()
+    {
+        List<T> entities = new List<T>();
+        for (int i = 0; i < Levels.Length; i++)
+        {
+            entities.AddRange(Levels[i].GetEntities<T>());
+        }
+
+        if (entities.Count == 1)
+        {
+            return entities[0];
+        }
+        else
+        {
+            throw new EntityNotFoundException($"Could not find entity with identifier {typeof(T).Name}");
+        }
+    }
 }