More BitmapBits optimizations, adding DrawBitmapBehind.

sonicretro · May 19, 2015 · 989e7eb · 989e7eb
1 parent f24cf55
commit 989e7eb
Showing 1 changed file with 47 additions and 7 deletions.
diff --git a/SonLVLAPI/BitmapBits.cs b/SonLVLAPI/BitmapBits.cs
@@ -288,6 +288,11 @@ public Bitmap ToBitmap1bpp(params Color[] palette)
 
 		public void DrawBitmap(BitmapBits source, int x, int y)
         {
+			if (x == 0 && source.Width == Width)
+			{
+				source.Bits.CopyTo(Bits, GetPixelIndex(0, y));
+				return;
+			}
             for (int i = 0; i < source.Height; i++)
             {
                 int di = GetPixelIndex(x, y + i);
@@ -323,20 +328,55 @@ public void DrawBitmapComposited(BitmapBits source, Point location)
             DrawBitmapComposited(source, location.X, location.Y);
         }
 
-        public void DrawBitmapBounded(BitmapBits source, int x, int y)
+		public void DrawBitmapBehind(BitmapBits source, int x, int y)
+		{
+			int srcl = 0;
+			if (x < 0)
+				srcl = -x;
+			int srct = 0;
+			if (y < 0)
+				srct = -y;
+			int srcr = source.Width;
+			if (srcr > Width - x)
+				srcr = Width - x;
+			int srcb = source.Height;
+			if (srcb > Height - y)
+				srcb = Height - y;
+			for (int c = srct; c < srcb; c++)
+				for (int r = srcl; r < srcr; r++)
+					if (this[x + r, y + c] == 0)
+						this[x + r, y + c] = source[r, c];
+		}
+
+		public void DrawBitmapBehind(BitmapBits source, Point location)
+		{
+			DrawBitmapBehind(source, location.X, location.Y);
+		}
+
+		public void DrawBitmapBounded(BitmapBits source, int x, int y)
         {
+			if (x >= 0 && y >= 0 && x + source.Width < Width && y + source.Height < Height)
+			{
+				DrawBitmap(source, x, y);
+				return;
+			}
+			int srct = 0;
+			if (y < 0)
+				srct = -y;
+			int srcb = source.Height;
+			if (srcb > Height - y)
+				srcb = Height - y;
+			if (x == 0 && source.Width == Width)
+			{
+				Array.Copy(source.Bits, source.GetPixelIndex(0, srct), Bits, GetPixelIndex(0, y + srct), srcb - srct);
+				return;
+			}
             int srcl = 0;
             if (x < 0)
                 srcl = -x;
-            int srct = 0;
-            if (y < 0)
-                srct = -y;
             int srcr = source.Width;
             if (srcr > Width - x)
                 srcr = Width - x;
-            int srcb = source.Height;
-            if (srcb > Height - y)
-                srcb = Height - y;
             for (int c = srct; c < srcb; c++)
                 Array.Copy(source.Bits, source.GetPixelIndex(srcl, c), Bits, GetPixelIndex(x + srcl, y + c), srcr - srcl);
         }