Coverted PixelData into a generic to prepare for a move to using byte…

… instead of int.

Build/Templates/runner-files.json

@@ -105,7 +105,9 @@
       "{0}/System.Windows.dll",
       "{0}/System.Xml.ReaderWriter.dll",
       "{0}/System.Xml.XDocument.dll",
-      "{0}/WindowsBase.dll"
+      "{0}/WindowsBase.dll",
+      "{0}/System.Reflection.Emit.ILGeneration.dll",
+      "{0}/System.Reflection.Emit.Lightweight.dll"
     ],
     "win-x64" : [
       "{0}/clrcompression.dll",
@@ -207,7 +209,9 @@
       "{0}/System.Xml.XDocument.dll",
       "{0}/WindowsBase.dll",
       "{0}/SDL2.dll",
-      "{0}/soft_oal.dll"
+      "{0}/soft_oal.dll",
+      "{0}/System.Reflection.Emit.ILGeneration.dll",
+      "{0}/System.Reflection.Emit.Lightweight.dll"
     ],
     "linux-x64" : [
       "{0}/createdump",
@@ -314,7 +318,9 @@
       "{0}/System.Windows.dll",
       "{0}/System.Xml.ReaderWriter.dll",
       "{0}/System.Xml.XDocument.dll",
-      "{0}/WindowsBase.dll"
+      "{0}/WindowsBase.dll",
+      "{0}/System.Reflection.Emit.ILGeneration.dll",
+      "{0}/System.Reflection.Emit.Lightweight.dll"
     ],
     "linux-arm64" : [
       "{0}/{1}.dll",
@@ -433,6 +439,8 @@
       "./SDK/Player/Data/Rectangle.cs",
       "./SDK/Runner/Utils/ColorUtils.Unity.cs",
       "./SDK/Runner/Utils/ZipFileHelper.Unity.cs",
-      "./SDK/Runner/Data/DisplayTarget.Unity.cs"
+      "./SDK/Runner/Data/DisplayTarget.Unity.cs",
+      "./SDK/Runner/System.Reflection.Emit.ILGeneration.dll",
+      "./SDK/Runner/System.Reflection.Emit.Lightweight.dll"
     ]
 }

SDK/Editor/Exporters/FontExporter.cs

@@ -39,7 +39,7 @@ public override void ConfigurePixelData()
             var height = 64; //spriteChip.textureHeight;
 
 
-            var textureData = new PixelData(width, height);
+            var textureData = new PixelData<int>(width, height);
 
             //            var pixelData = new int[width * height];
 

SDK/Editor/Services/GameDataExportService.cs

@@ -64,7 +64,7 @@ public void ExportGame(string path, PixelVision engine, FileFlags fileFlags, boo
             {
                 var fontChip = targetEngine.FontChip;
                 var spriteChip = targetEngine.SpriteChip;
-                var tmpTextureData = new PixelData(96, 64);
+                var tmpTextureData = new PixelData<int>(96, 64);
 
                 var fonts = fontChip.Fonts;
 
@@ -74,7 +74,7 @@ public void ExportGame(string path, PixelVision engine, FileFlags fileFlags, boo
                     var sprites = font.Value;
 
                     // Clear the texture
-                    Utilities.Clear(tmpTextureData);
+                    Utilities.Clear(tmpTextureData,Constants.EmptyPixel);
                     // tmpTextureData.Clear();
 
                     // Loop through all the characters and copy their texture data over

SDK/Player/Chips/Game/GameChip.Draw.cs

@@ -24,7 +24,7 @@ namespace PixelVision8.Player
 {
     public partial class GameChip
     {
-        private PixelData _tmpPixelData = new PixelData();
+        private PixelData<int> _tmpPixelData = new PixelData<int>();
         public int CurrentSprites => Player.SpriteCounter;
 
         #region Display

SDK/Player/Chips/Game/GameChip.Tilemaps.cs

@@ -32,9 +32,9 @@ public struct TilemapData
         private int _rows;
         private int _total;
 
-        public PixelData SpriteIds;
-        public PixelData Flags;
-        public PixelData ColorOffset;
+        public PixelData<int> SpriteIds;
+        public PixelData<int> Flags;
+        public PixelData<int> ColorOffset;
 
         public string Name;
         public int Columns => _columns;
@@ -49,9 +49,9 @@ public TilemapData(string name, int columns = 32, int rows = 30)
             _rows = rows;
             _total = _columns * _rows;
 
-            SpriteIds = new PixelData(_columns, _rows, Enumerable.Repeat(-1, _total).ToArray());
-            Flags = new PixelData(_columns, _rows, Enumerable.Repeat(-1, _total).ToArray());
-            ColorOffset = new PixelData(_columns, _rows);
+            SpriteIds = new PixelData<int>(_columns, _rows, Enumerable.Repeat(-1, _total).ToArray());
+            Flags = new PixelData<int>(_columns, _rows, Enumerable.Repeat(-1, _total).ToArray());
+            ColorOffset = new PixelData<int>(_columns, _rows);
 
         }
 

SDK/Player/Chips/Graphics/DisplayChip.cs

@@ -28,7 +28,7 @@ namespace PixelVision8.Player
 
     public class DisplayChip : AbstractChip, IDraw
     {
-        private readonly PixelData _display = new PixelData();
+        private readonly PixelData<int> _display = new PixelData<int>();
         private readonly List<DrawRequest> _drawCalls = new List<DrawRequest>();
         private int _clearColor = -1;
         private bool _clearFlag = true;

SDK/Player/Chips/Graphics/SpriteChip.cs

@@ -59,7 +59,7 @@ public class SpriteChip : AbstractChip, IDisplay
         /// </summary>
         public int MaxSpriteCount { get; set; }
 
-        public PixelData PixelData => _spriteMemory.PixelData;
+        public PixelData<int> PixelData => _spriteMemory.PixelData;
 
         /// <summary>
         ///     Return's the <see cref="Sprite" /> Ram's internal
@@ -181,7 +181,7 @@ public void ReadSpriteAt(int index, ref int[] pixelData)
             else
             {
                 // TODO need to remove the additional array copy from the Image to the Array
-                Array.Copy(Utilities.GetSpriteData(_spriteMemory.PixelData, index, ColorsPerSprite), pixelData, pixelData.Length);
+                Array.Copy(Utilities.GetSpriteData(_spriteMemory.PixelData, index), pixelData, pixelData.Length);
             }
         }
 
@@ -253,7 +253,7 @@ private void CacheSprite(int index, int[] data)
         public int FindSprite(int[] pixels, bool emptyCheck = false)
         {
             if (emptyCheck)
-                if (Utilities.IsEmpty(pixels))
+                if (Utilities.IsEmpty(pixels, Constants.EmptyPixel))
                     return -1;
 
             var sprite = SpriteDataToString(pixels);

SDK/Player/Chips/Graphics/TilemapChip.cs

@@ -52,9 +52,9 @@ public class TilemapChip : AbstractChip, IDisplay
         /// </summary>
         public int Total => Columns * Rows;
 
-        private readonly PixelData _tilemapCache = new PixelData();
+        private readonly PixelData<int> _tilemapCache = new PixelData<int>();
 
-        public PixelData PixelData
+        public PixelData<int> PixelData
         {
             get
             {
@@ -65,7 +65,7 @@ public PixelData PixelData
         }
 
         private Rectangle _tileSize;
-        private PixelData _tmpPixelData;
+        private PixelData<int> _tmpPixelData;
 
         /// <summary>
         ///     The width of the tile map by tiles.
@@ -198,7 +198,7 @@ protected override void Configure()
 
             _tileSize = new Rectangle(0, 0, Constants.SpriteSize, Constants.SpriteSize);
 
-            _tmpPixelData = new PixelData(_tileSize.Width, _tileSize.Height);
+            _tmpPixelData = new PixelData<int>(_tileSize.Width, _tileSize.Height);
 
             pixels = new int[Constants.SpriteSize * Constants.SpriteSize];
 

SDK/Player/Data/Canvas/Canvas.FloodFill.cs

@@ -134,7 +134,7 @@ public void FloodFillAction(CanvasDrawRequest request)
             }
         }
 
-        private void SetPatternPixel(PixelData currentTexture, int x, int y, int replacementColor)
+        private void SetPatternPixel(PixelData<int> currentTexture, int x, int y, int replacementColor)
         {
             // Console.WriteLine("{0},{1}", x, y);
             replacementColor = GetPixel(pattern, x % pattern.Width, y % pattern.Height);

SDK/Player/Data/Canvas/Canvas.Layers.cs

@@ -22,9 +22,9 @@ namespace PixelVision8.Player
 {
     public sealed partial class Canvas
     {
-        private readonly PixelData defaultLayer = new PixelData();
-        private readonly PixelData tmpLayer = new PixelData();
-        private PixelData currentTexture;
+        private readonly PixelData<int> defaultLayer = new PixelData<int>();
+        private readonly PixelData<int> tmpLayer = new PixelData<int>();
+        private PixelData<int> currentTexture;
 
         private void ChangeTargetCanvas(int width, int height)
         {
@@ -50,9 +50,9 @@ private void ChangeTargetCanvasAction(CanvasDrawRequest drawRequest)
             currentTexture = tmpLayer;
 
             if (drawRequest.Bounds.Width != currentTexture.Width || drawRequest.Bounds.Height != currentTexture.Height)
-                Utilities.Resize(currentTexture, drawRequest.Bounds.Width, drawRequest.Bounds.Height);
+                Utilities.Resize(currentTexture, drawRequest.Bounds.Width, drawRequest.Bounds.Height, Constants.EmptyPixel);
             else
-                Utilities.Clear(currentTexture);
+                Utilities.Clear(currentTexture, Constants.EmptyPixel);
         }
 
         private void SaveTmpLayer(int x, int y, int blockWidth, int blockHeight)

SDK/Player/Data/Canvas/Canvas.Merge.cs

@@ -22,7 +22,7 @@ namespace PixelVision8.Player
 {
     public sealed partial class Canvas
     {
-        private readonly PixelData _tmpPixelData = new PixelData();
+        private readonly PixelData<int> _tmpPixelData = new PixelData<int>();
 
         /// <summary>
         ///     Allows you to merge the pixel data of another canvas into this one without compleatly overwritting it.

SDK/Player/Data/Canvas/Canvas.Pattern.cs

@@ -22,7 +22,7 @@ namespace PixelVision8.Player
 {
     public sealed partial class Canvas
     {
-        private PixelData pattern = new PixelData();
+        private PixelData<int> pattern = new PixelData<int>();
 
         public void SetPattern(int[] newPixels, int newWidth, int newHeight)
         {
@@ -37,7 +37,7 @@ public void SetPattern(int[] newPixels, int newWidth, int newHeight)
 
             if (newRequest.PixelData.Width != newWidth || newRequest.PixelData.Height != newHeight)
             {
-                Utilities.Resize(newRequest.PixelData, newWidth, newHeight);
+                Utilities.Resize(newRequest.PixelData, newWidth, newHeight, Constants.EmptyPixel);
             }
 
             newRequest.PixelData.SetPixels(newPixels, newWidth, newHeight);

SDK/Player/Data/Canvas/Canvas.Stroke.cs

@@ -22,7 +22,7 @@ namespace PixelVision8.Player
 {
     public sealed partial class Canvas
     {
-        private PixelData stroke = new PixelData();
+        private PixelData<int> stroke = new PixelData<int>();
 
         public void SetStroke(int color, int size = 1)
         {
@@ -37,7 +37,7 @@ public void SetStroke(int color, int size = 1)
 
             if (newRequest.PixelData.Width != size || newRequest.PixelData.Height != size)
             {
-                Utilities.Resize(newRequest.PixelData, size, size);
+                Utilities.Resize(newRequest.PixelData, size, size, Constants.EmptyPixel);
             }
 
             var newPixels = new int[size * size];

SDK/Player/Data/Canvas/Canvas.Text.cs

@@ -25,7 +25,7 @@ public void DrawText(string text, int x, int y, string font = "default", int col
                 // We need at least 1 pixel to save the sprite ID
                 if (newRequest.PixelData.Width != spriteSize.X || newRequest.PixelData.Height != spriteSize.Y)
                 {
-                    Utilities.Resize(newRequest.PixelData, spriteSize.X, spriteSize.X);
+                    Utilities.Resize(newRequest.PixelData, spriteSize.X, spriteSize.X, Constants.EmptyPixel);
                 }
 
                 // Copy over the pixel

SDK/Player/Data/Canvas/Canvas.cs

@@ -73,7 +73,7 @@ public void Resize(int newWidth, int newHeight, bool savePixels = false)
                 pixels = GetPixels(0, 0, sampleWidth, sampleHeight);
             }
 
-            Utilities.Resize(defaultLayer, newWidth, newHeight);
+            Utilities.Resize(defaultLayer, newWidth, newHeight, Constants.EmptyPixel);
 
             if(savePixels && pixels != null)
             {
@@ -106,7 +106,7 @@ private void DrawPixelDataAction(CanvasDrawRequest request)
                 request.ColorOffset);
         }
 
-        private int GetPixel(PixelData pixelData, int x, int y)
+        private int GetPixel(PixelData<int> pixelData, int x, int y)
         {
             // TODO this needs to be removed
 
@@ -118,7 +118,7 @@ private int GetPixel(PixelData pixelData, int x, int y)
             return pixelData[x + pixelData.Width * y];
         }
 
-        private void SetPixel(PixelData pixelData, int x, int y, int color)
+        private void SetPixel(PixelData<int> pixelData, int x, int y, int color)
         {
             // TODO this needs to be removed
 

SDK/Player/Data/Canvas/CanvasDrawRequest.cs

@@ -30,7 +30,7 @@ public class CanvasDrawRequest
         public bool Fill;
         public bool FlipH;
         public bool FlipV;
-        public PixelData PixelData = new PixelData();
+        public PixelData<int> PixelData = new PixelData<int>();
         public int X;
         public int Y;
     }

SDK/Player/Data/DrawRequest.cs

@@ -27,12 +27,12 @@ public interface IDisplay
         ///     TextureData. When requested, a clone of the <see cref="_texture" />
         ///     field is returned. This is expensive and only used for tools.
         /// </summary>
-        PixelData PixelData { get; }
+        PixelData<int> PixelData { get; }
     }
 
     public struct DrawRequest
     {
-        private PixelData _tmpPixelData;
+        private PixelData<int> _tmpPixelData;
 
         public Rectangle SampleRect;
         public bool FlipH;
@@ -43,7 +43,7 @@ public struct DrawRequest
 
         public byte Priority;
 
-        public PixelData PixelData { get; private set; }
+        public PixelData<int> PixelData { get; private set; }
 
         public void SampleFrom(IDisplay source, int srcX, int srcY, int blockWidth, int blockHeight)
         {
@@ -57,7 +57,7 @@ public void SampleFrom(IDisplay source, int srcX, int srcY, int blockWidth, int
 
         public void SampleFrom(int[] pixels, int srcX, int srcY, int blockWidth, int blockHeight)
         {
-            _tmpPixelData ??= new PixelData(blockWidth, blockHeight);
+            _tmpPixelData ??= new PixelData<int>(blockWidth, blockHeight);
 
             _tmpPixelData.SetPixels(pixels, blockWidth, blockHeight);
 

SDK/Player/Data/ImageData.cs

@@ -29,7 +29,7 @@ namespace PixelVision8.Player
     /// </summary>
     public struct ImageData
     {
-        public PixelData PixelData { get; }
+        public PixelData<int> PixelData { get; }
         public int Width => PixelData.Width;
         public int Height => PixelData.Height;
 
@@ -44,10 +44,10 @@ public struct ImageData
         public ImageData(int width, int height, int[] pixels = null, string[] colors = null)
         {
             // Create sprite friendly grid
-            PixelData = new PixelData(width, height);
+            PixelData = new PixelData<int>(width, height);
 
             // Clear the pixel data with the default transparent color
-            Utilities.Clear(PixelData);
+            Utilities.Clear(PixelData, Constants.EmptyPixel);
 
             // See if there are any pixels
             if (pixels != null)
@@ -70,7 +70,7 @@ public ImageData(int width, int height, int[] pixels = null, string[] colors = n
 
         public int[] GetPixels() => Utilities.GetPixels(PixelData);
 
-        public void Resize(int newWidth, int newHeight) => Utilities.Resize(PixelData, newWidth, newHeight);
+        public void Resize(int newWidth, int newHeight) => Utilities.Resize(PixelData, newWidth, newHeight, Constants.EmptyPixel);
 
         public void Clear(int color = -1) => Utilities.Clear(PixelData, color);