Clean up and fixed TODOs

IrishBruse · IrishBruse · commit 3035e150e659 · 2021-12-22T23:50:11.000Z
diff --git a/Examples/Shooter/Data/World.ldtk b/Examples/Shooter/Data/World.ldtk
@@ -1418,7 +1418,7 @@
 						{ "coordId": 324, "v": 1 },
 						{ "coordId": 325, "v": 4 },
 						{ "coordId": 326, "v": 2 },
-						{ "coordId": 327, "v": 1 },
+						{ "coordId": 329, "v": 5 },
 						{ "coordId": 330, "v": 5 },
 						{ "coordId": 331, "v": 5 },
 						{ "coordId": 332, "v": 5 },
@@ -1433,13 +1433,13 @@
 						{ "coordId": 364, "v": 5 },
 						{ "coordId": 365, "v": 5 },
 						{ "coordId": 366, "v": 5 },
-						{ "coordId": 367, "v": 5 },
 						{ "coordId": 382, "v": 4 },
 						{ "coordId": 391, "v": 4 },
 						{ "coordId": 392, "v": 4 },
 						{ "coordId": 398, "v": 3 },
 						{ "coordId": 402, "v": 5 },
 						{ "coordId": 403, "v": 5 },
+						{ "coordId": 406, "v": 5 },
 						{ "coordId": 407, "v": 5 },
 						{ "coordId": 412, "v": 2 },
 						{ "coordId": 422, "v": 4 },
@@ -1544,9 +1544,9 @@
 						0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,6,0,0,0,0,0,0,0,
 						5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,0,0,0,0,0,0,0,0,
 						0,0,0,0,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,5,0,0,
-						0,0,0,0,0,0,0,0,0,2,5,3,2,0,0,6,6,6,6,6,6,0,0,0,0,0,0,5,0,0,0,0,0,0,0,
-						0,5,5,0,0,0,0,0,0,0,0,0,3,6,6,6,6,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,0,0,
-						0,0,0,0,0,0,5,5,0,0,0,0,0,4,0,0,0,6,6,0,0,0,6,0,0,0,0,3,0,0,0,0,0,0,0,
+						0,0,0,0,0,0,0,0,0,2,5,3,0,0,6,6,6,6,6,6,6,0,0,0,0,0,0,5,0,0,0,0,0,0,0,
+						0,5,5,0,0,0,0,0,0,0,0,0,3,6,6,6,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,0,0,
+						0,0,0,0,0,0,5,5,0,0,0,0,0,4,0,0,0,6,6,0,0,6,6,0,0,0,0,3,0,0,0,0,0,0,0,
 						0,0,5,0,0,0,0,0,2,2,6,6,6,6,0,0,0,6,6,6,0,0,7,0,0,0,0,6,0,6,6,6,6,6,0,
 						3,0,0,0,3,0,6,6,6,0,3,0,0,6,6,6,0,0,6,6,6,0,7,0,6,0,0,7,0,0,0,0,6,0,7,
 						0,0,0,6,6,6,6,0,6,6,6,6,0,6,6,6,6,0,7,0,0,0,0,0,0,6,0,7,0,6,0,0,7,0,0,
@@ -1598,7 +1598,6 @@
 						{ "px": [624,288], "src": [16,16], "f": 0, "t": 14, "d": [68,759] },
 						{ "px": [560,48], "src": [48,48], "f": 0, "t": 42, "d": [109,155] },
 						{ "px": [592,48], "src": [48,48], "f": 0, "t": 42, "d": [109,157] },
-						{ "px": [112,128], "src": [48,48], "f": 0, "t": 42, "d": [109,327] },
 						{ "px": [464,160], "src": [48,48], "f": 0, "t": 42, "d": [109,429] },
 						{ "px": [544,48], "src": [48,48], "f": 0, "t": 42, "d": [59,154] },
 						{ "px": [64,128], "src": [48,48], "f": 0, "t": 42, "d": [59,324] },
@@ -1626,12 +1625,12 @@
 						{ "px": [352,128], "src": [160,0], "f": 0, "t": 10, "d": [80,342] },
 						{ "px": [560,64], "src": [112,0], "f": 0, "t": 7, "d": [91,195] },
 						{ "px": [576,64], "src": [112,0], "f": 0, "t": 7, "d": [91,196] },
+						{ "px": [160,128], "src": [112,0], "f": 0, "t": 7, "d": [91,330] },
 						{ "px": [176,128], "src": [112,0], "f": 0, "t": 7, "d": [91,331] },
 						{ "px": [192,128], "src": [112,0], "f": 0, "t": 7, "d": [91,332] },
 						{ "px": [208,128], "src": [112,0], "f": 0, "t": 7, "d": [91,333] },
 						{ "px": [224,128], "src": [112,0], "f": 0, "t": 7, "d": [91,334] },
 						{ "px": [64,144], "src": [112,0], "f": 0, "t": 7, "d": [91,364] },
-						{ "px": [96,144], "src": [112,0], "f": 0, "t": 7, "d": [91,366] },
 						{ "px": [608,160], "src": [112,0], "f": 0, "t": 7, "d": [91,438] },
 						{ "px": [160,176], "src": [112,0], "f": 0, "t": 7, "d": [91,450] },
 						{ "px": [176,176], "src": [112,0], "f": 0, "t": 7, "d": [91,451] },
@@ -1677,7 +1676,6 @@
 						{ "px": [592,256], "src": [96,16], "f": 0, "t": 19, "d": [95,677] },
 						{ "px": [144,272], "src": [96,16], "f": 0, "t": 19, "d": [95,689] },
 						{ "px": [288,272], "src": [96,16], "f": 0, "t": 19, "d": [95,698] },
-						{ "px": [112,160], "src": [80,16], "f": 0, "t": 18, "d": [96,407] },
 						{ "px": [112,176], "src": [80,16], "f": 0, "t": 18, "d": [96,447] },
 						{ "px": [624,176], "src": [80,16], "f": 0, "t": 18, "d": [96,479] },
 						{ "px": [112,192], "src": [80,16], "f": 0, "t": 18, "d": [96,487] },
@@ -1703,16 +1701,18 @@
 						{ "px": [416,256], "src": [128,16], "f": 0, "t": 21, "d": [97,666] },
 						{ "px": [560,256], "src": [128,16], "f": 0, "t": 21, "d": [97,675] },
 						{ "px": [256,272], "src": [128,16], "f": 0, "t": 21, "d": [97,696] },
+						{ "px": [96,160], "src": [64,32], "f": 0, "t": 30, "d": [82,406] },
 						{ "px": [528,176], "src": [64,32], "f": 0, "t": 30, "d": [82,473] },
 						{ "px": [208,192], "src": [96,32], "f": 0, "t": 32, "d": [82,493] },
 						{ "px": [368,192], "src": [96,32], "f": 0, "t": 32, "d": [82,503] },
 						{ "px": [48,160], "src": [80,32], "f": 0, "t": 31, "d": [81,403] },
 						{ "px": [480,176], "src": [48,32], "f": 0, "t": 29, "d": [81,470] },
 						{ "px": [336,192], "src": [80,32], "f": 0, "t": 31, "d": [81,501] },
-						{ "px": [160,128], "src": [112,32], "f": 0, "t": 33, "d": [71,330] },
+						{ "px": [144,128], "src": [112,32], "f": 0, "t": 33, "d": [71,329] },
 						{ "px": [240,128], "src": [128,32], "f": 0, "t": 34, "d": [70,335] },
 						{ "px": [592,64], "src": [80,0], "f": 0, "t": 5, "d": [72,197] },
-						{ "px": [112,144], "src": [80,0], "f": 0, "t": 5, "d": [72,367] },
+						{ "px": [96,144], "src": [80,0], "f": 0, "t": 5, "d": [72,366] },
+						{ "px": [112,160], "src": [128,0], "f": 0, "t": 8, "d": [72,407] },
 						{ "px": [528,160], "src": [80,0], "f": 0, "t": 5, "d": [72,433] },
 						{ "px": [624,160], "src": [80,0], "f": 0, "t": 5, "d": [72,439] },
 						{ "px": [208,176], "src": [80,0], "f": 0, "t": 5, "d": [72,453] },
diff --git a/Examples/Shooter/ShooterGame.cs b/Examples/Shooter/ShooterGame.cs
@@ -15,7 +15,6 @@ public class ShooterGame : Game
 {
     // LDtk stuff
     private LDtkWorld world;
-    private LDtkLevel[] levels;
     private LDtkRenderer renderer;
     private readonly List<EnemyEntity> enemies = new List<EnemyEntity>();
     private readonly List<BulletEntity> bullets = new List<BulletEntity>();
@@ -34,7 +33,6 @@ public class ShooterGame : Game
     private readonly GraphicsDeviceManager graphics;
     private float pixelScale = 1f;
     public static Texture2D Pixel { get; set; }
-
     private KeyboardState oldKeyboard;
 
     public ShooterGame()
@@ -74,27 +72,26 @@ protected override void Initialize()
         renderer = new LDtkRenderer(spriteBatch);
 
         world = LDtkWorld.LoadWorld("Data\\World.ldtk");
-        levels = new LDtkLevel[world.Levels.Length];
 
         spriteSheet = Texture2D.FromFile(GraphicsDevice, Path.Combine(world.RootFolder, "Characters.png"));
 
         for (int i = 0; i < world.Levels.Length; i++)
         {
-            levels[i] = world.LoadLevel(world.Levels[i].Identifier);
+            world.Levels[i] = world.LoadLevel(world.Levels[i].Identifier);
 
-            foreach (Enemy enemy in levels[i].GetEntities<Enemy>())
+            foreach (Enemy enemy in world.Levels[i].GetEntities<Enemy>())
             {
                 enemies.Add(new EnemyEntity(enemy, spriteSheet, renderer));
             }
 
-            renderer.PrerenderLevel(levels[i]);
+            renderer.PrerenderLevel(world.Levels[i]);
         }
 
-        Gun_Pickup gunData = levels[1].GetEntity<Gun_Pickup>();
+        Gun_Pickup gunData = world.GetEntity<Gun_Pickup>();
         gun = new GunEntity(gunData, spriteSheet, renderer);
 
-        Player playerData = world.Levels[1].GetEntity<Player>();// TODO: get entity in levels
-        player = new PlayerEntity(playerData, spriteSheet, renderer, gun);// TODO: levels
+        Player playerData = world.GetEntity<Player>();
+        player = new PlayerEntity(playerData, spriteSheet, renderer, gun);
 
         player.onShoot += () =>
         {
@@ -165,9 +162,9 @@ protected override void Draw(GameTime gameTime)
         spriteBatch.Begin(camera, SpriteSortMode.Deferred, null, SamplerState.PointClamp);
         {
             // Draw Levels layers
-            for (int i = 0; i < levels.Length; i++)
+            for (int i = 0; i < world.Levels.Length; i++)
             {
-                renderer.RenderPrerenderedLevel(levels[i]);
+                renderer.RenderPrerenderedLevel(world.Levels[i]);
             }
 
             player.Draw(totalTime);
diff --git a/LDtk.ContentPipeline/Level/LDtkLevelWritter.cs b/LDtk.ContentPipeline/Level/LDtkLevelWritter.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.Text.Json;
 using Microsoft.Xna.Framework.Content.Pipeline;
 using Microsoft.Xna.Framework.Content.Pipeline.Serialization.Compiler;
 
@@ -12,8 +13,7 @@ protected override void Write(ContentWriter output, LDtkLevel json)
         try
         {
             ContentLogger.LogMessage($"Writting");
-            // TODO: binary serialize this eventually
-            output.Write(System.Text.Json.JsonSerializer.Serialize(json, LDtkWorld.SerializeOptions));
+            output.Write(JsonSerializer.Serialize(json, LDtkWorld.SerializeOptions));
         }
         catch (Exception ex)
         {
diff --git a/LDtk.ContentPipeline/World/LDtkWorldWritter.cs b/LDtk.ContentPipeline/World/LDtkWorldWritter.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.Text.Json;
 using Microsoft.Xna.Framework.Content.Pipeline;
 using Microsoft.Xna.Framework.Content.Pipeline.Serialization.Compiler;
 
@@ -12,8 +13,7 @@ protected override void Write(ContentWriter output, LDtkWorld json)
         try
         {
             ContentLogger.LogMessage($"Writting");
-            // TODO: binary serialize this eventually
-            output.Write(System.Text.Json.JsonSerializer.Serialize(json, LDtkWorld.SerializeOptions));
+            output.Write(JsonSerializer.Serialize(json, LDtkWorld.SerializeOptions));
         }
         catch (Exception ex)
         {
diff --git a/LDtk/LDtkFieldParser.cs b/LDtk/LDtkFieldParser.cs
@@ -131,8 +131,14 @@ private static void ParseCustomFields<T>(T classFields, FieldInstance[] fields,
                 case Field.PointArrayType:
                     List<Point> points = JsonSerializer.Deserialize<List<Point>>(fieldInstance._Value.ToString(), new JsonSerializerOptions() { Converters = { new CxCyConverter() } });
 
-                    // TODO: check all layers
-                    int gridSize = level.LayerInstances[0]._GridSize;
+                    int gridSize = 0;
+                    for (int j = 0; j < level.LayerInstances.Length; j++)
+                    {
+                        if (level.LayerInstances[j]._Type == LayerType.Entities)
+                        {
+                            gridSize = level.LayerInstances[j]._GridSize;
+                        }
+                    }
 
                     for (int j = 0; j < points.Count; j++)
                     {
diff --git a/LDtk/LDtkWorld.cs b/LDtk/LDtkWorld.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -93,6 +94,29 @@ 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>

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ public class ShooterGame : Game`
`15`	`15`	`{`
`16`	`16`	`// LDtk stuff`
`17`	`17`	`private LDtkWorld world;`
`18`		`- private LDtkLevel[] levels;`
`19`	`18`	`private LDtkRenderer renderer;`
`20`	`19`	`private readonly List<EnemyEntity> enemies = new List<EnemyEntity>();`
`21`	`20`	`private readonly List<BulletEntity> bullets = new List<BulletEntity>();`
`@@ -34,7 +33,6 @@ public class ShooterGame : Game`
`34`	`33`	`private readonly GraphicsDeviceManager graphics;`
`35`	`34`	`private float pixelScale = 1f;`
`36`	`35`	`public static Texture2D Pixel { get; set; }`
`37`		`-`
`38`	`36`	`private KeyboardState oldKeyboard;`
`39`	`37`
`40`	`38`	`public ShooterGame()`
`@@ -74,27 +72,26 @@ protected override void Initialize()`
`74`	`72`	`renderer = new LDtkRenderer(spriteBatch);`
`75`	`73`
`76`	`74`	`world = LDtkWorld.LoadWorld("Data\\World.ldtk");`
`77`		`- levels = new LDtkLevel[world.Levels.Length];`
`78`	`75`
`79`	`76`	`spriteSheet = Texture2D.FromFile(GraphicsDevice, Path.Combine(world.RootFolder, "Characters.png"));`
`80`	`77`
`81`	`78`	`for (int i = 0; i < world.Levels.Length; i++)`
`82`	`79`	`{`
`83`		`- levels[i] = world.LoadLevel(world.Levels[i].Identifier);`
	`80`	`+ world.Levels[i] = world.LoadLevel(world.Levels[i].Identifier);`
`84`	`81`
`85`		`- foreach (Enemy enemy in levels[i].GetEntities<Enemy>())`
	`82`	`+ foreach (Enemy enemy in world.Levels[i].GetEntities<Enemy>())`
`86`	`83`	`{`
`87`	`84`	`enemies.Add(new EnemyEntity(enemy, spriteSheet, renderer));`
`88`	`85`	`}`
`89`	`86`
`90`		`- renderer.PrerenderLevel(levels[i]);`
	`87`	`+ renderer.PrerenderLevel(world.Levels[i]);`
`91`	`88`	`}`
`92`	`89`
`93`		`- Gun_Pickup gunData = levels[1].GetEntity<Gun_Pickup>();`
	`90`	`+ Gun_Pickup gunData = world.GetEntity<Gun_Pickup>();`
`94`	`91`	`gun = new GunEntity(gunData, spriteSheet, renderer);`
`95`	`92`
`96`		`- Player playerData = world.Levels[1].GetEntity<Player>();// TODO: get entity in levels`
`97`		`- player = new PlayerEntity(playerData, spriteSheet, renderer, gun);// TODO: levels`
	`93`	`+ Player playerData = world.GetEntity<Player>();`
	`94`	`+ player = new PlayerEntity(playerData, spriteSheet, renderer, gun);`
`98`	`95`
`99`	`96`	`player.onShoot += () =>`
`100`	`97`	`{`
`@@ -165,9 +162,9 @@ protected override void Draw(GameTime gameTime)`
`165`	`162`	`spriteBatch.Begin(camera, SpriteSortMode.Deferred, null, SamplerState.PointClamp);`
`166`	`163`	`{`
`167`	`164`	`// Draw Levels layers`
`168`		`- for (int i = 0; i < levels.Length; i++)`
	`165`	`+ for (int i = 0; i < world.Levels.Length; i++)`
`169`	`166`	`{`
`170`		`- renderer.RenderPrerenderedLevel(levels[i]);`
	`167`	`+ renderer.RenderPrerenderedLevel(world.Levels[i]);`
`171`	`168`	`}`
`172`	`169`
`173`	`170`	`player.Draw(totalTime);`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+using System.Text.Json;`
`2`	`3`	`using Microsoft.Xna.Framework.Content.Pipeline;`
`3`	`4`	`using Microsoft.Xna.Framework.Content.Pipeline.Serialization.Compiler;`
`4`	`5`
`@@ -12,8 +13,7 @@ protected override void Write(ContentWriter output, LDtkLevel json)`
`12`	`13`	`try`
`13`	`14`	`{`
`14`	`15`	`ContentLogger.LogMessage($"Writting");`
`15`		`- // TODO: binary serialize this eventually`
`16`		`- output.Write(System.Text.Json.JsonSerializer.Serialize(json, LDtkWorld.SerializeOptions));`
	`16`	`+ output.Write(JsonSerializer.Serialize(json, LDtkWorld.SerializeOptions));`
`17`	`17`	`}`
`18`	`18`	`catch (Exception ex)`
`19`	`19`	`{`