preventOffBoundPixels bugfix

kumja1 · May 11, 2024 · f85b607 · f85b607
1 parent 111b703
commit f85b607
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/source/Cosmos.System2/Graphics/Canvas.cs b/source/Cosmos.System2/Graphics/Canvas.cs
@@ -583,12 +583,11 @@ public virtual void DrawImage(Image image, int x, int y, bool preventOffBoundPix
             }
             else
             {
-                var Width = image.Width;
-                for (int xi = 0; xi < Width; xi++)
+                for (int xi = 0; xi < image.Width; xi++)
                 {
                     for (int yi = 0; yi < image.Height; yi++)
                     {
-                        color = Color.FromArgb(image.RawData[xi + (yi * Width)]);
+                        color = Color.FromArgb(image.RawData[xi + (yi * image.Width)]);
                         DrawPoint(color, x + xi, y + yi);
                     }
                 }
@@ -681,12 +680,11 @@ public void DrawImageAlpha(Image image, int x, int y, bool preventOffBoundPixels
             }
             else
             {
-                var Width = image.Width;
-                for (int xi = 0; xi < Width; xi++)
+                for (int xi = 0; xi < image.Width; xi++)
                 {
                     for (int yi = 0; yi < image.Height; yi++)
                     {
-                        color = Color.FromArgb(image.RawData[xi + (yi * Width)]);
+                        color = Color.FromArgb(image.RawData[xi + (yi * image.Width)]);
                         DrawPoint(color, x + xi, y + yi);
                     }
                 }
@@ -892,4 +890,4 @@ public static Color AlphaBlend(Color to, Color from, byte alpha)
             return Color.FromArgb(R, G, B);
         }
     }
-}
+}
diff --git a/source/Cosmos.System2/Graphics/SVGAIICanvas.cs b/source/Cosmos.System2/Graphics/SVGAIICanvas.cs
@@ -84,12 +84,11 @@ public override void DrawFilledRectangle(Color color, int xStart, int yStart, in
         {
             var argb = color.ToArgb();
             var frameSize = (int)driver.FrameSize;
-            width = Math.Min(width, (int)mode.Width - xStart);
-            height = Math.Min(height, (int)mode.Height - yStart);
+
             // For now write directly into video memory, once _xSVGADriver.Fill will be faster it will have to be changed
             for (int i = yStart; i < yStart + height; i++)
             {
-                driver.videoMemory.Fill(GetPointOffset(xStart, i) + frameSize, width, argb);
+                driver.videoMemory.Fill(GetPointOffset(xStart, i) + (int)frameSize, width, argb);
             }
         }
 
@@ -355,8 +354,9 @@ public override void DrawImage(Image image, int x, int y, bool preventOffBoundPi
             var data = image.RawData;
             if(preventOffBoundPixels)
             {
-                var maxWidth = Math.Min(width, width - x);
-                var maxHeight = Math.Min(height, height - y);
+                var maxWidth = Math.Min(width, (int)mode.Width - x);
+                var maxHeight = Math.Min(height, (int)mode.Height - y);
+
                 for (int i = 0; i < maxHeight; i++)
                 {
                     driver.videoMemory.Copy(GetPointOffset(x, y + i) + frameSize, data, i * width, maxWidth);
@@ -371,4 +371,4 @@ public override void DrawImage(Image image, int x, int y, bool preventOffBoundPi
             }
         }
     }
-}
+}
diff --git a/source/Cosmos.System2/Graphics/VBECanvas.cs b/source/Cosmos.System2/Graphics/VBECanvas.cs
@@ -265,19 +265,20 @@ public override void DrawImage(Image aImage, int aX, int aY, bool preventOffBoun
             var xBitmap = aImage.RawData;
             var xWidth = (int)aImage.Width;
             var xHeight = (int)aImage.Height;
-            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++)
                 {
                     driver.CopyVRAM((i * (int)Mode.Width) + xOffset, xBitmap, i * xWidth, maxWidth);
                 }
             }
             else
             {
-                for (int i = 0; i < xHeight; i++)
+                int xOffset = aY * xHeight + aX;
+                for (int i = 0; i < Mode.Height; i++)
                 {
                     driver.CopyVRAM((i * (int)Mode.Width) + xOffset, xBitmap, i * xWidth, xWidth);
                 }