Using DrawBitmap instead of DrawBitmapComposited when graphics will n…

…ever overlap.
sonicretro · May 24, 2016 · e3b1c04 · e3b1c04
1 parent e051c01
commit e3b1c04
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/SonLVLAPI/DataTypes.cs b/SonLVLAPI/DataTypes.cs
@@ -2360,11 +2360,12 @@ public Sprite(params Sprite[] sprites)
 
 		public Sprite(IEnumerable<Sprite> sprites)
 		{
+			List<Sprite> sprlst = new List<Sprite>(sprites);
 			int left = 0;
 			int right = 0;
 			int top = 0;
 			int bottom = 0;
-			foreach (Sprite spr in sprites)
+			foreach (Sprite spr in sprlst)
 				if (spr.Image != null)
 				{
 					left = Math.Min(spr.Left, left);
@@ -2374,9 +2375,21 @@ public Sprite(IEnumerable<Sprite> sprites)
 				}
 			Offset = new Point(left, top);
 			Image = new BitmapBits(right - left, bottom - top);
-			foreach (Sprite spr in sprites)
-				if (spr.Image != null)
-					Image.DrawBitmapComposited(spr.Image, new Point(spr.X - left, spr.Y - top));
+			for (int i = 0; i < sprlst.Count; i++)
+				if (sprlst[i].Image != null)
+				{
+					bool comp = false;
+					for (int j = 0; j < i; j++)
+						if (sprlst[j].Image != null && sprlst[i].Bounds.IntersectsWith(sprlst[j].Bounds))
+						{
+							comp = true;
+							break;
+						}
+					if (comp)
+						Image.DrawBitmapComposited(sprlst[i].Image, new Point(sprlst[i].X - left, sprlst[i].Y - top));
+					else
+						Image.DrawBitmap(sprlst[i].Image, new Point(sprlst[i].X - left, sprlst[i].Y - top));
+				}
 		}
 
 		public static Sprite LoadChaotixSprite(string filename) { return LoadChaotixSprite(File.ReadAllBytes(filename), 0); }

diff --git a/SonLVLAPI/LevelData.cs b/SonLVLAPI/LevelData.cs
@@ -2598,7 +2598,7 @@ public static Sprite MapTileToBmp(byte[] art, MappingsTile map, int startpal)
 			{
 				for (int y = 0; y < map.Height; y++)
 				{
-					pcbmp.DrawBitmapComposited(
+					pcbmp.DrawBitmap(
 						TileToBmp8bpp(art, map.Tile.Tile + ti, (map.Tile.Palette + startpal) & 3),
 						x * 8, y * 8);
 					ti++;
@@ -2639,7 +2639,7 @@ public static void RedrawBlock(int block, bool drawChunks)
 						);
 				}
 			}
-			CompBlockBmpBits[block].DrawBitmapComposited(BlockBmpBits[block][0], Point.Empty);
+			CompBlockBmpBits[block].DrawBitmap(BlockBmpBits[block][0], Point.Empty);
 			CompBlockBmpBits[block].DrawBitmapComposited(BlockBmpBits[block][1], Point.Empty);
 			BlockBmps[block][0] = BlockBmpBits[block][0].ToBitmap(BmpPal);
 			BlockBmps[block][1] = BlockBmpBits[block][1].ToBitmap(BmpPal);
@@ -2708,7 +2708,7 @@ public static void RedrawChunk(int chunk)
 					}
 				}
 			}
-			CompChunkBmpBits[chunk].DrawBitmapComposited(ChunkBmpBits[chunk][0], Point.Empty);
+			CompChunkBmpBits[chunk].DrawBitmap(ChunkBmpBits[chunk][0], Point.Empty);
 			CompChunkBmpBits[chunk].DrawBitmapComposited(ChunkBmpBits[chunk][1], Point.Empty);
 			ChunkBmps[chunk][0] = ChunkBmpBits[chunk][0].ToBitmap(BmpPal);
 			ChunkBmps[chunk][1] = ChunkBmpBits[chunk][1].ToBitmap(BmpPal);