Fixed font rendering issues and bitmap loading

aegis-dev · Mar 18, 2024 · d33acb6 · d33acb6
1 parent a091564
commit d33acb6
Show file tree

Hide file tree

Showing 96 changed files with 7 additions and 1 deletion.
diff --git a/Pixie/Internal/Assets/font/3x5/font_1.png b/Pixie/Internal/Assets/font/3x5/font_1.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_10.png b/Pixie/Internal/Assets/font/3x5/font_10.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_11.png b/Pixie/Internal/Assets/font/3x5/font_11.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_12.png b/Pixie/Internal/Assets/font/3x5/font_12.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_13.png b/Pixie/Internal/Assets/font/3x5/font_13.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_14.png b/Pixie/Internal/Assets/font/3x5/font_14.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_15.png b/Pixie/Internal/Assets/font/3x5/font_15.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_16.png b/Pixie/Internal/Assets/font/3x5/font_16.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_17.png b/Pixie/Internal/Assets/font/3x5/font_17.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_18.png b/Pixie/Internal/Assets/font/3x5/font_18.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_19.png b/Pixie/Internal/Assets/font/3x5/font_19.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_2.png b/Pixie/Internal/Assets/font/3x5/font_2.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_20.png b/Pixie/Internal/Assets/font/3x5/font_20.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_21.png b/Pixie/Internal/Assets/font/3x5/font_21.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_22.png b/Pixie/Internal/Assets/font/3x5/font_22.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_23.png b/Pixie/Internal/Assets/font/3x5/font_23.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_24.png b/Pixie/Internal/Assets/font/3x5/font_24.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_25.png b/Pixie/Internal/Assets/font/3x5/font_25.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_26.png b/Pixie/Internal/Assets/font/3x5/font_26.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_27.png b/Pixie/Internal/Assets/font/3x5/font_27.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_28.png b/Pixie/Internal/Assets/font/3x5/font_28.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_29.png b/Pixie/Internal/Assets/font/3x5/font_29.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_3.png b/Pixie/Internal/Assets/font/3x5/font_3.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_30.png b/Pixie/Internal/Assets/font/3x5/font_30.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_31.png b/Pixie/Internal/Assets/font/3x5/font_31.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_32.png b/Pixie/Internal/Assets/font/3x5/font_32.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_33.png b/Pixie/Internal/Assets/font/3x5/font_33.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_34.png b/Pixie/Internal/Assets/font/3x5/font_34.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_35.png b/Pixie/Internal/Assets/font/3x5/font_35.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_36.png b/Pixie/Internal/Assets/font/3x5/font_36.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_37.png b/Pixie/Internal/Assets/font/3x5/font_37.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_38.png b/Pixie/Internal/Assets/font/3x5/font_38.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_39.png b/Pixie/Internal/Assets/font/3x5/font_39.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_4.png b/Pixie/Internal/Assets/font/3x5/font_4.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_40.png b/Pixie/Internal/Assets/font/3x5/font_40.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_41.png b/Pixie/Internal/Assets/font/3x5/font_41.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_42.png b/Pixie/Internal/Assets/font/3x5/font_42.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_43.png b/Pixie/Internal/Assets/font/3x5/font_43.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_44.png b/Pixie/Internal/Assets/font/3x5/font_44.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_45.png b/Pixie/Internal/Assets/font/3x5/font_45.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_46.png b/Pixie/Internal/Assets/font/3x5/font_46.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_47.png b/Pixie/Internal/Assets/font/3x5/font_47.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_48.png b/Pixie/Internal/Assets/font/3x5/font_48.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_49.png b/Pixie/Internal/Assets/font/3x5/font_49.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_5.png b/Pixie/Internal/Assets/font/3x5/font_5.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_50.png b/Pixie/Internal/Assets/font/3x5/font_50.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_51.png b/Pixie/Internal/Assets/font/3x5/font_51.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_52.png b/Pixie/Internal/Assets/font/3x5/font_52.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_53.png b/Pixie/Internal/Assets/font/3x5/font_53.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_54.png b/Pixie/Internal/Assets/font/3x5/font_54.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_55.png b/Pixie/Internal/Assets/font/3x5/font_55.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_56.png b/Pixie/Internal/Assets/font/3x5/font_56.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_57.png b/Pixie/Internal/Assets/font/3x5/font_57.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_58.png b/Pixie/Internal/Assets/font/3x5/font_58.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_59.png b/Pixie/Internal/Assets/font/3x5/font_59.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_6.png b/Pixie/Internal/Assets/font/3x5/font_6.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_60.png b/Pixie/Internal/Assets/font/3x5/font_60.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_61.png b/Pixie/Internal/Assets/font/3x5/font_61.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_62.png b/Pixie/Internal/Assets/font/3x5/font_62.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_63.png b/Pixie/Internal/Assets/font/3x5/font_63.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_64.png b/Pixie/Internal/Assets/font/3x5/font_64.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_65.png b/Pixie/Internal/Assets/font/3x5/font_65.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_66.png b/Pixie/Internal/Assets/font/3x5/font_66.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_67.png b/Pixie/Internal/Assets/font/3x5/font_67.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_68.png b/Pixie/Internal/Assets/font/3x5/font_68.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_69.png b/Pixie/Internal/Assets/font/3x5/font_69.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_7.png b/Pixie/Internal/Assets/font/3x5/font_7.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_70.png b/Pixie/Internal/Assets/font/3x5/font_70.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_71.png b/Pixie/Internal/Assets/font/3x5/font_71.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_72.png b/Pixie/Internal/Assets/font/3x5/font_72.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_73.png b/Pixie/Internal/Assets/font/3x5/font_73.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_74.png b/Pixie/Internal/Assets/font/3x5/font_74.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_75.png b/Pixie/Internal/Assets/font/3x5/font_75.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_76.png b/Pixie/Internal/Assets/font/3x5/font_76.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_77.png b/Pixie/Internal/Assets/font/3x5/font_77.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_78.png b/Pixie/Internal/Assets/font/3x5/font_78.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_79.png b/Pixie/Internal/Assets/font/3x5/font_79.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_8.png b/Pixie/Internal/Assets/font/3x5/font_8.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_80.png b/Pixie/Internal/Assets/font/3x5/font_80.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_81.png b/Pixie/Internal/Assets/font/3x5/font_81.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_82.png b/Pixie/Internal/Assets/font/3x5/font_82.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_83.png b/Pixie/Internal/Assets/font/3x5/font_83.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_84.png b/Pixie/Internal/Assets/font/3x5/font_84.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_85.png b/Pixie/Internal/Assets/font/3x5/font_85.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_86.png b/Pixie/Internal/Assets/font/3x5/font_86.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_87.png b/Pixie/Internal/Assets/font/3x5/font_87.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_88.png b/Pixie/Internal/Assets/font/3x5/font_88.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_89.png b/Pixie/Internal/Assets/font/3x5/font_89.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_9.png b/Pixie/Internal/Assets/font/3x5/font_9.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_90.png b/Pixie/Internal/Assets/font/3x5/font_90.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_91.png b/Pixie/Internal/Assets/font/3x5/font_91.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_92.png b/Pixie/Internal/Assets/font/3x5/font_92.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_93.png b/Pixie/Internal/Assets/font/3x5/font_93.png
diff --git a/Pixie/Internal/Assets/font/3x5/font_94.png b/Pixie/Internal/Assets/font/3x5/font_94.png
diff --git a/Pixie/Internal/Palette.cs b/Pixie/Internal/Palette.cs
@@ -82,6 +82,11 @@ private static List<Color> GetPalette()
 
         internal static byte ColorFromRgb(Color color)
         {
+            if (color.R == 0 && color.G == 0 && color.B == 0 && color.A == 0)
+            {
+                return (byte)PixieColor.None;
+            }
+
             for (int colorIdx = 0; colorIdx < ColorPalette.Count; ++colorIdx)
             {
                 Color paletteColor = ColorPalette[colorIdx];

diff --git a/Pixie/Sprite.cs b/Pixie/Sprite.cs
@@ -66,7 +66,8 @@ public static Sprite FromBitmapPNG(in Bitmap bitmap)
                 for (long y = bitmap.Height - 1; y >= 0; --y)
                 {
                     Color rgbColor = bitmap.GetPixel((int)x, (int)y);
-                    column.Add(Palette.ColorFromRgb(rgbColor));
+                    byte colorIdx = Palette.ColorFromRgb(rgbColor);
+                    column.Add(colorIdx);
                 }
                 pixels.Add(column);
             }