CGS Update (part 2)

source/Cosmos.Core/MemoryBlock.cs

@@ -270,6 +270,15 @@ public unsafe void Copy(ManagedMemoryBlock block)
             MemoryOperations.Copy(xDest, aDataPtr, (int)block.Size);
         }
 
+        public unsafe void Get(int aByteOffset, int[] aData, int aIndex, int aCount)
+        {
+            int* xSource = (int*)(Base + aByteOffset);
+            fixed (int* aDataPtr = aData)
+            {
+                MemoryOperations.Copy(aDataPtr + aIndex, xSource, aCount);
+            }
+        }
+
         /// <summary>
         /// Move bytes array down the memory block.
         /// </summary>

source/Cosmos.System2/Graphics/Canvas.cs

@@ -100,6 +100,14 @@ public virtual void Clear(Color color)
         /// <param name="y">The Y coordinate.</param>
         public abstract void DrawPoint(Color color, int x, int y);
 
+        /// <summary>
+        /// Sets the pixel at the given coordinates to the specified <paramref name="color"/>. without ToArgb()
+        /// </summary>
+        /// <param name="color">The color to draw with (raw argb).</param>
+        /// <param name="x">The X coordinate.</param>
+        /// <param name="y">The Y coordinate.</param>
+        public abstract void DrawRawPoint(uint color, int x, int y);
+
         /// <summary>
         /// The name of the Canvas implementation.
         /// </summary>
@@ -117,6 +125,13 @@ public virtual void Clear(Color color)
         /// <param name="x">The X coordinate.</param>
         /// <param name="y">The Y coordinate.</param>
         public abstract Color GetPointColor(int x, int y);
+
+        /// <summary>
+        /// Gets the color of the pixel at the given coordinates in ARGB.
+        /// </summary>
+        /// <param name="x">The X coordinate.</param>
+        /// <param name="y">The Y coordinate.</param>
+        public abstract int GetRawPointColor(int x, int y);
         /// <summary>
         /// Gets the index of the pixel at the given coordinates.
         /// </summary>
@@ -598,6 +613,29 @@ public virtual void DrawImage(Image image, int x, int y, bool preventOffBoundPix
             }
         }
 
+        /// <summary>
+        /// Draws the given image at the specified coordinates, cropped to maxWidth and maxHeight
+        /// </summary>
+        /// <param name="image">The image to draw.</param>
+        /// <param name="x">The origin X coordinate.</param>
+        /// <param name="y">The origin Y coordinate.</param>
+        /// <param name="maxWidth">Max image width to display</param>
+        /// <param name="maxHeight">Max image height to display</param>
+        public virtual void CroppedDrawImage(Image image, int x, int y, int maxWidth, int maxHeight)
+        {
+
+        }
+
+        public virtual Bitmap GetImage(int x, int y, int width, int height)
+        {
+            Bitmap bitmap = new Bitmap((uint)x, (uint)y, ColorDepth.ColorDepth32);
+
+            for (int posy = y, desty = 0; posy < y + y; posy++, desty++)
+                for (int posx = x, destx = 0; posx < x + x; posx++, destx++)
+                    bitmap.RawData[desty * x + destx] = GetRawPointColor(posx, posy);
+            return bitmap;
+        }
+
         static int[] ScaleImage(Image image, int newWidth, int newHeight)
         {
             int[] pixels = image.RawData;
@@ -666,7 +704,7 @@ public virtual void DrawImage(Image image, int x, int y, int w, int h, bool prev
         /// <param name="image">The image to draw.</param>
         /// <param name="x">The X coordinate.</param>
         /// <param name="y">The Y coordinate.</param>
-        public void DrawImageAlpha(Image image, int x, int y, bool preventOffBoundPixels = true)
+        public virtual void DrawImageAlpha(Image image, int x, int y, bool preventOffBoundPixels = true)
         {
             Color color;
             if (preventOffBoundPixels)

source/Cosmos.System2/Graphics/SVGAIICanvas.cs

@@ -80,6 +80,11 @@ public override void DrawPoint(Color color, int x, int y)
             driver.SetPixel((uint)x, (uint)y, (uint)color.ToArgb());
         }
 
+        public override void DrawRawPoint(uint color, int x, int y)
+        {
+            driver.SetPixel((uint)x, (uint)y, color);
+        }
+
         public override void DrawFilledRectangle(Color color, int xStart, int yStart, int width, int height, bool preventOffBoundPixels = true)
         {
             var argb = color.ToArgb();
@@ -97,6 +102,37 @@ public override void DrawFilledRectangle(Color color, int xStart, int yStart, in
             }
         }
 
+        public override void DrawRectangle(Color color, int x, int y, int width, int height)
+        {
+            int rawColor = color.ToArgb();
+
+            /* Draw the top edge (A to B) */
+            for (int posX = x; posX < x + width; posX++)
+            {
+                DrawRawPoint((uint)rawColor, posX, y);
+            }
+
+            /* Draw the bottom edge (C to D) */
+            int newY = y + height;
+            for (int posX = x; posX < x + width; posX++)
+            {
+                DrawRawPoint((uint)rawColor, posX, newY);
+            }
+
+            /* Draw the left edge (A to C) */
+            for (int posY = y; posY < y + height; posY++)
+            {
+                DrawRawPoint((uint)rawColor, x, posY);
+            }
+
+            /* Draw the right edge (B to D) */
+            int newX = x + width;
+            for (int posY = y; posY < y + height; posY++)
+            {
+                DrawRawPoint((uint)rawColor, newX, posY);
+            }
+        }
+
         //public override IReadOnlyList<Mode> AvailableModes { get; } = new List<Mode>
         /// <summary>
         /// Available SVGA 2 supported video modes.
@@ -315,6 +351,11 @@ public override Color GetPointColor(int x, int y)
             return Color.FromArgb((int)driver.GetPixel((uint)x, (uint)y));
         }
 
+        public override int GetRawPointColor(int x, int y)
+        {
+            return (int)driver.GetPixel((uint)x, (uint)y);
+        }
+
         public override void Display()
         {
             driver.DoubleBufferUpdate();
@@ -375,5 +416,33 @@ public override void DrawImage(Image image, int x, int y, bool preventOffBoundPi
                 }
             }
         }
+
+        public override void CroppedDrawImage(Image image, int x, int y, int maxWidth, int maxHeight)
+        {
+            var width = maxWidth;
+            var height = maxHeight;
+            var frameSize = (int)driver.FrameSize;
+            var data = image.RawData;
+            for (int i = 0; i < height; i++)
+            {
+                driver.videoMemory.Copy(GetPointOffset(x, y + i) + frameSize, data, i * width, width);
+            }
+        }
+
+        public override Bitmap GetImage(int x, int y, int width, int height)
+        {
+            var frameSize = (int)driver.FrameSize;
+            int[] buffer = new int[width];
+            int[] all = new int[width * height];
+            for (int i = 0; i < height; i++)
+            {
+                driver.videoMemory.Get(GetPointOffset(x, y + i) + frameSize, buffer, 0, width);
+                buffer.CopyTo(all, width * i);
+            }
+            Bitmap toReturn = new Bitmap((uint)width, (uint)height, ColorDepth.ColorDepth32);
+            toReturn.RawData = all;
+
+            return toReturn;
+        }
     }
 }

source/Cosmos.System2/Graphics/VBECanvas.cs

@@ -234,6 +234,34 @@ public override void DrawPoint(Color aColor, int aX, int aY)
             }
         }
 
+        public override void DrawRawPoint(uint aColor, int aX, int aY)
+        {
+            uint offset;
+
+            switch (Mode.ColorDepth)
+            {
+                case ColorDepth.ColorDepth32:
+                    offset = (uint)GetPointOffset(aX, aY);
+
+                    driver.SetVRAM(offset, (byte)((aColor >> 16) & 0xFF));
+                    driver.SetVRAM(offset + 1, (byte)((aColor >> 8) & 0xFF));
+                    driver.SetVRAM(offset + 2, (byte)(aColor & 0xFF));
+                    driver.SetVRAM(offset + 3, (byte)((aColor >> 24) & 0xFF));
+
+                    break;
+                case ColorDepth.ColorDepth24:
+                    offset = (uint)GetPointOffset(aX, aY);
+
+                    driver.SetVRAM(offset, (byte)((aColor >> 16) & 0xFF));
+                    driver.SetVRAM(offset + 1, (byte)((aColor >> 8) & 0xFF));
+                    driver.SetVRAM(offset + 2, (byte)(aColor & 0xFF));
+
+                    break;
+                default:
+                    throw new NotImplementedException("Drawing pixels with color depth " + (int)Mode.ColorDepth + " is not yet supported.");
+            }
+        }
+
         public override void DrawArray(Color[] aColors, int aX, int aY, int aWidth, int aHeight)
         {
             ThrowIfCoordNotValid(aX, aY);
@@ -261,30 +289,72 @@ public override void DrawFilledRectangle(Color aColor, int aX, int aY, int aWidt
             }
         }
 
+        public override void DrawRectangle(Color color, int x, int y, int width, int height)
+        {
+            int rawColor = color.ToArgb();
+
+            /* Draw the top edge (A to B) */
+            for (int posX = x; posX < x + width; posX++)
+            {
+                DrawRawPoint((uint)rawColor, posX, y);
+            }
+
+            /* Draw the bottom edge (C to D) */
+            int newY = y + height;
+            for (int posX = x; posX < x + width; posX++)
+            {
+                DrawRawPoint((uint)rawColor, posX, newY);
+            }
+
+            /* Draw the left edge (A to C) */
+            for (int posY = y; posY < y + height; posY++)
+            {
+                DrawRawPoint((uint)rawColor, x, posY);
+            }
+
+            /* Draw the right edge (B to D) */
+            int newX = x + width;
+            for (int posY = y; posY < y + height; posY++)
+            {
+                DrawRawPoint((uint)rawColor, newX, posY);
+            }
+        }
+
         public override void DrawImage(Image aImage, int aX, int aY, bool preventOffBoundPixels = true)
         {
             var xBitmap = aImage.RawData;
             var xWidth = (int)aImage.Width;
             var xHeight = (int)aImage.Height;
-            if (preventOffBoundPixels)
+            int xOffset = aY * (int)Mode.Width + aX;
+
+            if (!preventOffBoundPixels)
             {
-                var maxWidth = Math.Min(xWidth, (int)mode.Width - aX);
-                var maxHeight = Math.Min(xHeight, (int)mode.Height - aY);
-                int xOffset = aY * (int)Mode.Width + aX;
-                for (int i = 0; i < maxHeight; i++)
+                for (int i = 0; i < xHeight; i++)
                 {
-                    driver.CopyVRAM((i * (int)Mode.Width) + xOffset, xBitmap, i * xWidth, maxWidth);
+                    driver.CopyVRAM((i * (int)Mode.Width) + xOffset, xBitmap, i * xWidth, xWidth);
                 }
             }
             else
             {
-                int xOffset = aY * xHeight + aX;
-                for (int i = 0; i < Mode.Height; i++)
+                var maxWidth = Math.Min(xWidth, (int)mode.Width - aX);
+                var maxHeight = Math.Min(xHeight, (int)mode.Height - aY);
+                for (int i = 0; i < maxHeight; i++)
                 {
-                    driver.CopyVRAM((i * (int)Mode.Width) + xOffset, xBitmap, i * xWidth, xWidth);
+                    driver.CopyVRAM((i * (int)Mode.Width) + xOffset, xBitmap, i * xWidth, maxWidth);
                 }
             }
+        }
 
+        public override void CroppedDrawImage(Image aImage, int aX, int aY, int aWidth, int aHeight)
+        {
+            var xBitmap = aImage.RawData;
+            var xWidth = aWidth;
+            var xHeight = aHeight;
+            int xOffset = aY * xHeight + aX;
+            for (int i = 0; i < Mode.Height; i++)
+            {
+                driver.CopyVRAM((i * (int)Mode.Width) + xOffset, xBitmap, i * xWidth, xWidth);
+            }
         }
 
         #endregion
@@ -302,6 +372,12 @@ public override Color GetPointColor(int aX, int aY)
             return Color.FromArgb((int)driver.GetVRAM(offset));
         }
 
+        public override int GetRawPointColor(int aX, int aY)
+        {
+            uint offset = (uint)GetPointOffset(aX, aY);
+            return (int)driver.GetVRAM(offset);
+        }
+
         #endregion
 
     }

source/Cosmos.System2/Graphics/VGACanvas.cs

@@ -96,6 +96,37 @@ public override void DrawFilledRectangle(Color aColor, int aXStart, int aYStart,
             driver.DrawFilledRectangle(aXStart, aYStart, aWidth, aHeight, driver.GetClosestColorInPalette(aColor));
         }
 
+        public override void DrawRectangle(Color color, int x, int y, int width, int height)
+        {
+            int rawColor = color.ToArgb();
+
+            /* Draw the top edge (A to B) */
+            for (int posX = x; posX < x + width; posX++)
+            {
+                DrawRawPoint((uint)rawColor, posX, y);
+            }
+
+            /* Draw the bottom edge (C to D) */
+            int newY = y + height;
+            for (int posX = x; posX < x + width; posX++)
+            {
+                DrawRawPoint((uint)rawColor, posX, newY);
+            }
+
+            /* Draw the left edge (A to C) */
+            for (int posY = y; posY < y + height; posY++)
+            {
+                DrawRawPoint((uint)rawColor, x, posY);
+            }
+
+            /* Draw the right edge (B to D) */
+            int newX = x + width;
+            for (int posY = y; posY < y + height; posY++)
+            {
+                DrawRawPoint((uint)rawColor, newX, posY);
+            }
+        }
+
         public override void DrawPoint(Color aColor, int aX, int aY)
         {
             driver.SetPixel((uint)aX, (uint)aY, aColor);
@@ -106,13 +137,23 @@ public void DrawPoint(uint aColor, int aX, int aY)
             driver.SetPixel((uint)aX, (uint)aY, aColor);
         }
 
+        public override void DrawRawPoint(uint aColor, int aX, int aY)
+        {
+            driver.SetPixel((uint)aX, (uint)aY, aColor);
+        }
+
         public override List<Mode> AvailableModes => availableModes;
 
         public override Color GetPointColor(int aX, int aY)
         {
             return Color.FromArgb((int)driver.GetPixel((uint)aX, (uint)aY));
         }
 
+        public override int GetRawPointColor(int aX, int aY)
+        {
+            return (int)driver.GetPixel((uint)aX, (uint)aY);
+        }
+
         public override Mode DefaultGraphicsMode => new Mode(640, 480, ColorDepth.ColorDepth4);
 
         /// <summary>