Merge branch 'master' into refactor-dropdown-test-scene

frenzibyte · Nov 27, 2023 · 9b569cc · 9b569cc
2 parents d253e06 + 450ef26
commit 9b569cc
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 25 deletions.
diff --git a/osu.Framework.Benchmarks/BenchmarkTextBuilder.cs b/osu.Framework.Benchmarks/BenchmarkTextBuilder.cs
@@ -47,7 +47,7 @@ private void initialiseBuilder(bool withDifferentBaselines)
 
         private class TestStore : ITexturedGlyphLookupStore
         {
-            public ITexturedCharacterGlyph Get(string fontName, char character) => new TexturedCharacterGlyph(
+            public ITexturedCharacterGlyph Get(string? fontName, char character) => new TexturedCharacterGlyph(
                 new CharacterGlyph(character, character, character, character, character, null),
                 new DummyRenderer().CreateTexture(1, 1));
 

diff --git a/osu.Framework/Graphics/UserInterface/CircularProgress.cs b/osu.Framework/Graphics/UserInterface/CircularProgress.cs
@@ -89,7 +89,7 @@ public bool RoundedCaps
             }
         }
 
-        private class CircularProgressDrawNode : SpriteDrawNode
+        protected class CircularProgressDrawNode : SpriteDrawNode
         {
             public new CircularProgress Source => (CircularProgress)base.Source;
 
@@ -98,28 +98,28 @@ public CircularProgressDrawNode(CircularProgress source)
             {
             }
 
-            private float innerRadius;
-            private float progress;
-            private float texelSize;
-            private bool roundedCaps;
+            protected float InnerRadius { get; private set; }
+            protected float Progress { get; private set; }
+            protected float TexelSize { get; private set; }
+            protected bool RoundedCaps { get; private set; }
 
             public override void ApplyState()
             {
                 base.ApplyState();
 
-                innerRadius = Source.innerRadius;
-                progress = Math.Abs((float)Source.current.Value);
-                roundedCaps = Source.roundedCaps;
+                InnerRadius = Source.innerRadius;
+                Progress = Math.Abs((float)Source.current.Value);
+                RoundedCaps = Source.roundedCaps;
 
                 // smoothstep looks too sharp with 1px, let's give it a bit more
-                texelSize = 1.5f / ScreenSpaceDrawQuad.Size.X;
+                TexelSize = 1.5f / ScreenSpaceDrawQuad.Size.X;
             }
 
             private IUniformBuffer<CircularProgressParameters> parametersBuffer;
 
             protected override void Blit(IRenderer renderer)
             {
-                if (innerRadius == 0 || (!roundedCaps && progress == 0))
+                if (InnerRadius == 0 || (!RoundedCaps && Progress == 0))
                     return;
 
                 base.Blit(renderer);
@@ -132,10 +132,10 @@ protected override void BindUniformResources(IShader shader, IRenderer renderer)
                 parametersBuffer ??= renderer.CreateUniformBuffer<CircularProgressParameters>();
                 parametersBuffer.Data = new CircularProgressParameters
                 {
-                    InnerRadius = innerRadius,
-                    Progress = progress,
-                    TexelSize = texelSize,
-                    RoundedCaps = roundedCaps,
+                    InnerRadius = InnerRadius,
+                    Progress = Progress,
+                    TexelSize = TexelSize,
+                    RoundedCaps = RoundedCaps,
                 };
 
                 shader.BindUniformBlock("m_CircularProgressParameters", parametersBuffer);

diff --git a/osu.Framework/IO/Stores/FontStore.cs b/osu.Framework/IO/Stores/FontStore.cs
@@ -6,7 +6,6 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using JetBrains.Annotations;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics.Rendering;
 using osu.Framework.Graphics.Textures;
@@ -20,7 +19,7 @@ public class FontStore : TextureStore, ITexturedGlyphLookupStore
     {
         private readonly List<IGlyphStore> glyphStores = new List<IGlyphStore>();
 
-        private readonly List<FontStore> nestedFontStores = new List<FontStore>();
+        private readonly List<ITexturedGlyphLookupStore> nestedFontStores = new List<ITexturedGlyphLookupStore>();
 
         private Storage cacheStorage;
 
@@ -77,12 +76,18 @@ public override void AddTextureSource(IResourceStore<TextureUpload> store)
 
         public override void AddStore(ITextureStore store)
         {
-            if (store is FontStore fs)
+            switch (store)
             {
-                // if null, share the main store's atlas.
-                fs.Atlas ??= Atlas;
-                fs.cacheStorage ??= cacheStorage;
-                nestedFontStores.Add(fs);
+                case FontStore fs:
+                    // if null, share the main store's atlas.
+                    fs.Atlas ??= Atlas;
+                    fs.cacheStorage ??= cacheStorage;
+                    nestedFontStores.Add(fs);
+                    break;
+
+                case ITexturedGlyphLookupStore gs:
+                    nestedFontStores.Add(gs);
+                    break;
             }
 
             base.AddStore(store);
@@ -132,7 +137,7 @@ public override void RemoveStore(ITextureStore store)
             base.RemoveStore(store);
         }
 
-        public ITexturedCharacterGlyph Get([CanBeNull] string fontName, char character)
+        public ITexturedCharacterGlyph Get(string fontName, char character)
         {
             var key = (fontName, character);
 

diff --git a/osu.Framework/IO/Stores/GlyphStore.cs b/osu.Framework/IO/Stores/GlyphStore.cs
@@ -66,7 +66,7 @@ public GlyphStore(ResourceStore<byte[]> store, string assetName = null, IResourc
             AssetName = assetName;
             TextureLoader = textureLoader;
 
-            FontName = assetName?.Split('/').Last();
+            FontName = assetName?.Split('/').Last() ?? string.Empty;
         }
 
         private Task fontLoadTask;

diff --git a/osu.Framework/Text/ITexturedGlyphLookupStore.cs b/osu.Framework/Text/ITexturedGlyphLookupStore.cs
@@ -13,7 +13,7 @@ public interface ITexturedGlyphLookupStore
         /// <param name="fontName">The name of the font.</param>
         /// <param name="character">The character to retrieve.</param>
         /// <returns>The character glyph.</returns>
-        ITexturedCharacterGlyph? Get(string fontName, char character);
+        ITexturedCharacterGlyph? Get(string? fontName, char character);
 
         /// <summary>
         /// Retrieves a glyph from the store asynchronously.