make MouseCursor default null, cache it in a property instead of loading it over and over again from the lookup

Author: pandinocoder

Framework/Intersect.Framework.Core/Configuration/ClientConfiguration.cs

@@ -203,7 +203,7 @@ public void Validate()
     /// <summary>
     /// Sets a custom mouse cursor.
     /// </summary>
-    public string MouseCursor { get; set; } = string.Empty;
+    public string? MouseCursor { get; set; }
 
     /// <summary>
     /// Determines the time it takes to fade-in or fade-out a song when no other instructions are given.

Intersect.Client.Core/Core/Graphics.cs

@@ -121,9 +121,14 @@ public static FloatRect CurrentView
     //Init Functions
     public static void InitGraphics()
     {
-        Renderer?.Init();
+        Renderer.Init();
         sContentManager = Globals.ContentManager;
         sContentManager.LoadAll();
+
+        // If we're going to be rendering a custom mouse cursor, hide the default one!
+        string? mouseCursor = ClientConfiguration.Instance.MouseCursor;
+        Renderer.CursorName = mouseCursor;
+
         (GameFont, GameFontSize) = FindFont(ClientConfiguration.Instance.GameFont);
         (UIFont, UIFontSize) = FindFont(ClientConfiguration.Instance.UIFont);
         (EntityNameFont, EntityNameFontSize) = FindFont(ClientConfiguration.Instance.EntityNameFont);
@@ -617,22 +622,14 @@ public static void Render(TimeSpan deltaTime, TimeSpan totalTime)
         );
 
         // Draw our mousecursor at the very end, but not when taking screenshots.
-        if (!takingScreenshot && !string.IsNullOrWhiteSpace(ClientConfiguration.Instance.MouseCursor))
+        if (!takingScreenshot && Renderer.Cursor is { } cursorTexture)
         {
-            var cursorTexture = Globals.ContentManager.GetTexture(
-                TextureType.Misc,
-                ClientConfiguration.Instance.MouseCursor
+            var cursorPosition = ConvertToWorldPointNoZoom(Globals.InputManager.GetMousePosition());
+            DrawGameTexture(
+                cursorTexture,
+                cursorPosition.X,
+                cursorPosition.Y
             );
-
-            if (cursorTexture is not null)
-            {
-                var cursorPosition = ConvertToWorldPointNoZoom(Globals.InputManager.GetMousePosition());
-                DrawGameTexture(
-                    cursorTexture,
-                    cursorPosition.X,
-                    cursorPosition.Y
-                );
-            }
         }
 
         renderer.End();

Intersect.Client.Core/MonoGame/Graphics/MonoRenderer.cs

@@ -2,6 +2,8 @@
 using System.Globalization;
 using System.Runtime.CompilerServices;
 using Intersect.Client.Classes.MonoGame.Graphics;
+using Intersect.Client.Framework.Content;
+using Intersect.Client.Framework.File_Management;
 using Intersect.Client.Framework.GenericClasses;
 using Intersect.Client.Framework.Graphics;
 using Intersect.Client.General;
@@ -1032,6 +1034,11 @@ public override System.Numerics.Vector2 MeasureText(string? text, IFont? font, i
     private readonly Dictionary<SpriteFont, char> _defaultCharacterForSpriteFont = [];
     private GameShader _basicShader;
 
+    protected override void OnCursorChanged(IGameTexture? newCursor)
+    {
+        _game.IsMouseVisible = newCursor is null;
+    }
+
     private string SanitizeText(string text, SpriteFont spriteFont)
     {
         if (!_defaultCharacterForSpriteFont.TryGetValue(spriteFont, out var defaultCharacter))

Intersect.Client.Core/MonoGame/IntersectGame.cs

@@ -127,17 +127,8 @@ private IntersectGame(IClientContext context, Action postStartupAction)
         ) / new Microsoft.Xna.Framework.Point(2);
         Window.AllowAltF4 = false;
 
-        // Store frequently used property values in local variables.
-        string mouseCursor = ClientConfiguration.Instance.MouseCursor;
-        string? updateUrl = ClientConfiguration.Instance.UpdateUrl;
-
-        // If we're going to be rendering a custom mouse cursor, hide the default one!
-        if (!string.IsNullOrWhiteSpace(mouseCursor))
-        {
-            IsMouseVisible = false;
-        }
-
         // Reuse Updater object instead of creating a new one each time.
+        string? updateUrl = ClientConfiguration.Instance.UpdateUrl;
         if (!string.IsNullOrWhiteSpace(updateUrl))
         {
             _updater ??= new Updater(updateUrl, "client/update.json", "version.client.json", 7);

Intersect.Client.Framework/Graphics/GameRenderer.cs

@@ -1,6 +1,8 @@
 using System.Collections.Concurrent;
 using System.Diagnostics;
 using System.Numerics;
+using Intersect.Client.Framework.Content;
+using Intersect.Client.Framework.File_Management;
 using Intersect.Client.Framework.GenericClasses;
 using Intersect.Core;
 using Intersect.Framework.Collections;
@@ -153,6 +155,45 @@ public float Scale
 
     public Resolution PreferredResolution { get; set; }
 
+    private string? _cursorName;
+    private IGameTexture? _cursor;
+
+    public string? CursorName
+    {
+        get => _cursorName;
+        set
+        {
+            if (value == _cursorName)
+            {
+                return;
+            }
+
+            _cursorName = value;
+            _cursor = string.IsNullOrWhiteSpace(_cursorName)
+                ? null
+                : GameContentManager.Current.GetTexture(TextureType.Misc, _cursorName);
+            OnCursorChanged(_cursor);
+        }
+    }
+
+    public IGameTexture? Cursor
+    {
+        get => _cursor;
+        set
+        {
+            if (value == _cursor)
+            {
+                return;
+            }
+
+            _cursor = value;
+            _cursorName = _cursor?.Name;
+            OnCursorChanged(_cursor);
+        }
+    }
+
+    protected abstract void OnCursorChanged(IGameTexture? newCursor);
+
     /// <summary>
     ///     Clears everything off the render target with a specified color.
     /// </summary>

Intersect.Client.Framework/Graphics/IGameRenderer.cs

@@ -66,6 +66,10 @@ public interface IGameRenderer
     /// </summary>
     List<string> ValidVideoModes { get; }
 
+    string? CursorName { get; set; }
+
+    IGameTexture? Cursor { get; set; }
+
     /// <summary>
     ///     Clear the screen.
     /// </summary>