Added support for building Wobble on ARM

Wobble.Tests/Wobble.Tests.csproj

@@ -2,6 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
+    <RuntimeIdentifiers>win-x64;linux-x64;osx-x64;osx-arm64</RuntimeIdentifiers>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="System.Runtime.Extensions" Version="4.3.0" />
@@ -23,10 +24,8 @@
     <None Update="Content\exo2-regular_0.xnb">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="MonoGame.Framework">
-      <HintPath>..\MonoGame.Framework.dll</HintPath>
-    </Reference>
+      <Reference Include="MonoGame.Framework">
+        <HintPath>..\MonoGame.Framework.dll</HintPath>
+      </Reference>
   </ItemGroup>
 </Project>

Wobble.Tests/WobbleTestsGame.cs

@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Input;
 using Wobble.Graphics;
-using Wobble.Graphics.BitmapFonts;
 using Wobble.Graphics.Sprites;
 using Wobble.Graphics.Sprites.Text;
 using Wobble.Graphics.UI.Debugging;
@@ -24,7 +22,7 @@ public class WobbleTestsGame : WobbleGame
 
         private FpsCounter FpsCounter { get; set; }
 
-        private SpriteText WaylandState { get; set; }
+        private SpriteTextPlus WaylandState { get; set; }
 
         public WobbleTestsGame() : base(true)
         {
@@ -72,36 +70,30 @@ protected override void LoadContent()
 
             Resources.AddStore(new DllResourceStore("Wobble.Tests.Resources.dll"));
 
-            if (!BitmapFontFactory.CustomFonts.ContainsKey("exo2-bold"))
-                BitmapFontFactory.AddFont("exo2-bold", GameBase.Game.Resources.Get("Wobble.Tests.Resources/Fonts/exo2-bold.ttf"));
-
-            if (!BitmapFontFactory.CustomFonts.ContainsKey("exo2-regular"))
-                BitmapFontFactory.AddFont("exo2-regular", GameBase.Game.Resources.Get("Wobble.Tests.Resources/Fonts/exo2-regular.ttf"));
-
-            if (!BitmapFontFactory.CustomFonts.ContainsKey("exo2-semibold"))
-                BitmapFontFactory.AddFont("exo2-semibold", GameBase.Game.Resources.Get("Wobble.Tests.Resources/Fonts/exo2-semibold.ttf"));
-
-            if (!BitmapFontFactory.CustomFonts.ContainsKey("exo2-medium"))
-                BitmapFontFactory.AddFont("exo2-medium", GameBase.Game.Resources.Get("Wobble.Tests.Resources/Fonts/exo2-medium.ttf"));
+            var fonts = new List<string> { "exo2-bold", "exo2-regular", "exo2-semibold", "exo2-medium" };
+            foreach (var fontName in fonts)
+            {
+                FontManager.CacheWobbleFont(fontName, new WobbleFontStore(20, GameBase.Game.Resources.Get($"Wobble.Tests.Resources/Fonts/{fontName}.ttf")));
+            }
 
-            var font = new WobbleFontStore(20, GameBase.Game.Resources.Get("Wobble.Tests.Resources/Fonts/exo2-semibold.ttf"), new Dictionary<string, byte[]>()
+            var japaneseFont = new WobbleFontStore(20, GameBase.Game.Resources.Get("Wobble.Tests.Resources/Fonts/exo2-semibold.ttf"), new Dictionary<string, byte[]>()
                 {
                     {"Emoji", GameBase.Game.Resources.Get("Wobble.Tests.Resources/Fonts/symbola-emoji.ttf")},
                     {"Japanese", GameBase.Game.Resources.Get("Wobble.Tests.Resources/Fonts/droid-sans-japanese.ttf")}
                 });
 
-            FontManager.CacheWobbleFont("exo2-semibold", font);
+            FontManager.CacheWobbleFont("exo2-semibold-japanese", japaneseFont);
 
             IsReadyToUpdate = true;
 
-            FpsCounter = new FpsCounter(FontManager.LoadBitmapFont("Content/gotham"), 18)
+            FpsCounter = new FpsCounter(FontManager.GetWobbleFont("exo2-semibold"), 18)
             {
                 Parent = GlobalUserInterface,
                 Alignment = Alignment.BotRight,
                 Size = new ScalableVector2(70, 30),
             };
 
-            WaylandState = new SpriteText("exo2-semibold", $"Wayland: {WaylandVsync}", 18)
+            WaylandState = new SpriteTextPlus(FontManager.GetWobbleFont("exo2-semibold"), $"Wayland: {WaylandVsync}", 18)
             {
                 Parent = GlobalUserInterface,
                 Alignment = Alignment.BotRight,
@@ -137,7 +129,7 @@ protected override void Update(GameTime gameTime)
             if (KeyboardManager.IsUniqueKeyPress(Keys.W) && OperatingSystem.IsLinux())
             {
                 WaylandVsync = !WaylandVsync;
-                WaylandState.ScheduleUpdate(() => WaylandState.Text = $"Wayland: {WaylandVsync}");
+                WaylandState.Text = $"Wayland: {WaylandVsync}";
             }
         }
 

Wobble/Graphics/Sprites/Text/SpriteTextPlusLine.cs

@@ -112,7 +112,10 @@ public SpriteTextPlusLine(WobbleFontStore font, string text, float size = 0)
         private static float GetScale()
         {
             var scale = WindowManager.ScreenScale.X;
-            Debug.Assert(scale > 0, "You're setting up text too early (WindowManager.ScreenScale.X is 0).");
+
+            // Some stuff (namely DrawableLog and the FPS counter) wants to draw text before anything is initialized.
+            if (scale == 0)
+                scale = 1;
 
             if (GameBase.Game.Graphics.PreferredBackBufferWidth < 1600)
                 return scale * 2;

Wobble/Graphics/UI/Debugging/FpsCounter.cs

@@ -1,9 +1,9 @@
 using System;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using MonoGame.Extended.BitmapFonts;
-using Wobble.Graphics.BitmapFonts;
 using Wobble.Graphics.Sprites;
+using Wobble.Graphics.Sprites.Text;
+using Wobble.Managers;
 
 namespace Wobble.Graphics.UI.Debugging
 {
@@ -20,9 +20,9 @@ public class FpsCounter : Container
         private int FrameCounter { get; set; }
 
         /// <summary>
-        ///     The SpriteText that displays the FPS value.
+        ///     The SpriteTextPlus that displays the FPS value.
         /// </summary>
-        public SpriteTextBitmap TextFps { get; }
+        public SpriteTextPlus TextFps { get; }
 
         /// <summary>
         ///     The current update rate.
@@ -35,9 +35,9 @@ public class FpsCounter : Container
         private int UpdateCounter { get; set; }
 
         /// <summary>
-        ///     The SpriteText that displays the UPS value.
+        ///     The SpriteTextPlus that displays the UPS value.
         /// </summary>
-        public SpriteTextBitmap TextUps { get; }
+        public SpriteTextPlus TextUps { get; }
 
         /// <summary>
         ///     The amount of time elapsed so we can begin counting each second.
@@ -48,20 +48,18 @@ public class FpsCounter : Container
         /// <summary>
         ///     Ctor
         /// </summary>
-        public FpsCounter(BitmapFont font, int size)
+        public FpsCounter(WobbleFontStore font, int size)
         {
-            TextFps = new SpriteTextBitmap(font, "0 FPS", false)
+            TextFps = new SpriteTextPlus(font, "0 FPS", size)
             {
                 Parent = this,
                 Alignment = Alignment.TopRight,
-                FontSize = size
             };
 
-            TextUps = new SpriteTextBitmap(font, "0 UPS", false)
+            TextUps = new SpriteTextPlus(font, "0 UPS", size)
             {
                 Parent = this,
                 Alignment = Alignment.TopRight,
-                FontSize = size,
                 Y = TextFps.Size.Y.Value
             };
         }

Wobble/Wobble.csproj

@@ -3,6 +3,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>7.1</LangVersion>
+    <RuntimeIdentifiers>osx-x64;osx-arm64</RuntimeIdentifiers>
   </PropertyGroup>
   <PropertyGroup>
     <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
@@ -17,8 +18,7 @@
     <PackageReference Include="MonoGame.Extended" Version="3.8.0" />
     <PackageReference Include="MonoGame.Extended.Content.Pipeline" Version="3.8.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Version="6.0.5.128" />
-    <PackageReference Include="System.Drawing.Common" Version="4.5.0" />
+    <PackageReference Include="System.Drawing.Common" Version="5.0.3" />
     <PackageReference Include="System.Runtime.Extensions" Version="4.3.0" />
   </ItemGroup>
   <ItemGroup>
@@ -37,13 +37,14 @@
     <None Update="libSDL2-2.0.0.dylib">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Update="libgdiplus.dylib">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Update="x64/*">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="MonoGame.Framework">
-      <HintPath>..\MonoGame.Framework.dll</HintPath>
-    </Reference>
+      <Reference Include="MonoGame.Framework">
+          <HintPath>..\MonoGame.Framework.dll</HintPath>
+      </Reference>
   </ItemGroup>
 </Project>