Added dummy unit rendering

Author: Bencargs

.gitignore

@@ -330,3 +330,4 @@ ASALocalRun/
 
 # Local History for Visual Studio
 .localhistory/
+Concept/

Common/Common.csproj

@@ -42,6 +42,9 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Colour.cs" />
+    <Compile Include="Entities\ComponentType.cs" />
+    <Compile Include="Entities\Entity.cs" />
+    <Compile Include="Entities\IComponent.cs" />
     <Compile Include="IAnimation.cs" />
     <Compile Include="IGraphics.cs" />
     <Compile Include="IImage.cs" />

Common/Entities/ComponentType.cs

@@ -0,0 +1,9 @@
+namespace Common.Entities
+{
+    public enum ComponentType
+    {
+        None = 0,
+        Location,
+        Image
+    }
+}

Common/Entities/Entity.cs

@@ -0,0 +1,30 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Common.Entities
+{
+    public class Entity
+    {
+        public int Id { get; set; }
+        public List<IComponent> Components { get; set; }
+
+        public Entity()
+        {
+            Components = new List<IComponent>();
+        }
+
+        public T GetComponent<T>()
+            where T : IComponent
+        {
+            var component = Components.OfType<T>().LastOrDefault();
+            return component;
+        }
+
+        public void AddComponent<T>(T component)
+            where T : IComponent
+        {
+            if (!Components.Any(x => x is T))
+                Components.Add(component);
+        }
+    }
+}

Common/Entities/IComponent.cs

@@ -0,0 +1,7 @@
+namespace Common.Entities
+{
+    public interface IComponent
+    {
+        ComponentType Type { get; }
+    }
+}

Common/ITexture.cs

@@ -2,7 +2,6 @@
 {
     public interface ITexture
     {
-        int Id { get; }
         int Width { get; }
         int Height { get; }
         IImage Image { get; }

Common/Tile.cs

@@ -4,7 +4,7 @@ public class Tile
 	{
 		public int Id { get; set; }
 		public Point Location { get; set; }
-		public int TextureId { get; set; }
+		public string TextureId { get; set; }
 		public TerrainType Type { get; set; }
 	}
 }

MapEngine/Components/ImageComponent.cs

@@ -0,0 +1,10 @@
+using Common.Entities;
+
+namespace MapEngine.Components
+{
+    class ImageComponent : IComponent
+    {
+        public ComponentType Type => ComponentType.Image;
+        public string TextureId { get; set; }
+    }
+}

MapEngine/Components/LocationComponent.cs

@@ -0,0 +1,11 @@
+using Common;
+using Common.Entities;
+
+namespace MapEngine.Components
+{
+    public class LocationComponent : IComponent
+    {
+        public ComponentType Type => ComponentType.Location;
+        public Point Location { get; set; }
+    }
+}

MapEngine/Content/Maps/TestMap1.json

@@ -1,15 +1,8 @@
 {
   "Width": 768,
   "Height": 512,
-  "Heightmap": "textures/heightmap.png",
+  "Heightmap": "WaterHeightmap.png",
   "Description":"Water animation test",
-  "Textures": [
-    {
-      "Id": 0,
-      "Filename": "animations/water.gif",
-	  "Framerate": 100
-    }
-  ],
   "TileWidth":3,
   "TileHeight":2,
   "Tiles": [
@@ -19,7 +12,7 @@
         "X": 0,
         "Y": 0
       },
-      "TextureId": 0,
+      "TextureId": "Waves",
       "Type": 1
     },
     {
@@ -28,7 +21,7 @@
         "X": 253,
         "Y": 0
       },
-      "TextureId": 0,
+      "TextureId": "Waves",
       "Type": 1
     },
     {
@@ -37,7 +30,7 @@
         "X": 0,
         "Y": 253
       },
-      "TextureId": 0,
+      "TextureId": "Waves",
       "Type": 1
     },
     {
@@ -46,7 +39,7 @@
         "X": 253,
         "Y": 253
       },
-      "TextureId": 0,
+      "TextureId": "Waves",
       "Type": 1
     },
     {
@@ -55,7 +48,7 @@
         "X": 506,
         "Y": 0
       },
-      "TextureId": 0,
+      "TextureId": "Waves",
       "Type": 1
     },
     {
@@ -64,7 +57,7 @@
         "X": 506,
         "Y": 253
       },
-      "TextureId": 0,
+      "TextureId": "Waves",
       "Type": 1
     }
   ]

MapEngine/Content/Textures/Dummy.png

@@ -0,0 +1,12 @@
+{
+	"Type":"Dummy",
+	"Location": {
+        "X": 250,
+        "Y": 250
+	},
+	"Image": {
+		"Width":24,
+		"Height":24,
+		"TextureId": "Dummy",
+	}
+}

MapEngine/Content/Animations/water.gif MapEngine/Content/Textures/Waves.gif

@@ -0,0 +1,18 @@
+namespace MapEngine
+{
+    public static class EnumerableEx
+    {
+        public static T[,] Make2DArray<T>(this T[] input, int width, int height)
+        {
+            T[,] output = new T[width, height];
+            for (int x = 0; x < width; x++)
+            {
+                for (int y = 0; y < height; y++)
+                {
+                    output[x, y] = input[x + y * width];
+                }
+            }
+            return output;
+        }
+    }
+}

MapEngine/Content/Units/Dummy.json

@@ -0,0 +1,43 @@
+using Common;
+
+namespace MapEngine.Handlers
+{
+    public class MapHandler
+    {
+        private Map _map;
+        private TextureHandler _textures = new TextureHandler();
+
+        public MapHandler(TextureHandler textures)
+        {
+            _textures = textures;
+        }
+
+        public void Init(string mapFile)
+        {
+            // Infuture this would load only relevant map textures
+            //_textures.LoadTextures(@"C:\Source\MapEditor\MapEngine\Content\Textures\");
+
+            _map = ResourceLoader.LoadMap(mapFile);
+        }
+
+        public void Render(IGraphics graphics)
+        {
+            DrawTiles(graphics, _map.Tiles);
+        }
+
+        private void DrawTiles(IGraphics graphics, Tile[,] tiles)
+        {
+            foreach (var tile in tiles)
+            {
+                if (tile == null)
+                    continue;
+
+                if (_textures.TryGetTexture(tile.TextureId, out var texture))
+                {
+                    var area = new Rectangle(tile.Location.X, tile.Location.Y, texture.Width, texture.Height);
+                    graphics.DrawImage(texture.Image, area);
+                }
+            }
+        }
+    }
+}

MapEngine/EnumerableEx.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+namespace MapEngine.Handlers
+{
+    public class TextureHandler
+    {
+        public Dictionary<string, Texture> _textures = new Dictionary<string, Texture>(StringComparer.OrdinalIgnoreCase);
+
+        public void LoadTextures(string filepath)
+        {
+            foreach (var file in Directory.GetFiles(filepath, "*.gif"))
+            {
+                var name = Path.GetFileNameWithoutExtension(file).ToUpper();
+                var animation = ResourceLoader.LoadAnimation(file);
+                var texture = new Texture(animation);
+                _textures.Add(name, texture);
+            }
+
+            foreach (var file in Directory.GetFiles(filepath, "*.png"))
+            {
+                var name = Path.GetFileNameWithoutExtension(file);
+                var image = ResourceLoader.LoadImage(file);
+                var texture = new Texture(image);
+                _textures.Add(name, texture);
+            }
+        }
+
+        public bool TryGetTexture(string textureId, out Texture texture)
+        {
+            return _textures.TryGetValue(textureId, out texture);
+        }
+    }
+}

MapEngine/Handlers/MapHandler.cs

@@ -0,0 +1,41 @@
+using Common;
+using Common.Entities;
+using MapEngine.Components;
+using System.Collections.Generic;
+
+namespace MapEngine.Handlers
+{
+    public class UnitHandler
+    {
+        private int _unitIndex;
+        private readonly TextureHandler _textures;
+        private Dictionary<int, Entity> _units = new Dictionary<int, Entity>();
+
+        public UnitHandler(TextureHandler textures)
+        {
+            _textures = textures;
+        }
+
+        public void Init(string filename)
+        {
+            _textures.LoadTextures(@"C:\Source\MapEditor\MapEngine\Content\Textures");
+
+            var unit = ResourceLoader.LoadUnit(filename);
+            _units.Add(_unitIndex++, unit);
+        }
+
+        public void Render(IGraphics graphics)
+        {
+            foreach (var unit in _units.Values)
+            {
+                var location = unit.GetComponent<LocationComponent>().Location;
+                var textureId = unit.GetComponent<ImageComponent>().TextureId;
+                if (_textures.TryGetTexture(textureId, out var texture))
+                {
+                    var area = texture.Area(location);
+                    graphics.DrawImage(texture.Image, area);
+                }
+            }
+        }
+    }
+}

MapEngine/Handlers/TextureHandler.cs

@@ -1,5 +1,4 @@
 using Common;
-using System.Collections.Generic;
 
 namespace MapEngine
 {
@@ -8,6 +7,5 @@ public class Map
         public int Width { get; set; }
         public int Height { get; set; }
         public Tile[,] Tiles { get; set; }
-        public Dictionary<int, Texture> Textures { get; set; }
     }
 }

MapEngine/Handlers/UnitHandler.cs

@@ -58,7 +58,13 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="Components\ImageComponent.cs" />
+    <Compile Include="EnumerableEx.cs" />
+    <Compile Include="Handlers\MapHandler.cs" />
+    <Compile Include="Handlers\TextureHandler.cs" />
+    <Compile Include="Handlers\UnitHandler.cs" />
     <Compile Include="ImageEx.cs" />
+    <Compile Include="Components\LocationComponent.cs" />
     <Compile Include="Map.cs" />
     <Compile Include="ResourceLoader.cs" />
     <Compile Include="Scene.cs" />
@@ -114,7 +120,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Content\Animations\water.gif" />
     <Resource Include="Content\Textures\water.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />