Merge pull request #29660 from EVAST9919/fast-circle

Use `FastCircle` in demanding places in the editor
ppy · Sep 1, 2024 · 6c5ce36 · 6c5ce36
2 parents 62f737d + f7da719
commit 6c5ce36
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 7 deletions.
diff --git a/osu.Android.props b/osu.Android.props
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2024.809.2" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2024.831.0" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -40,7 +40,7 @@ public partial class PathControlPointPiece<T> : BlueprintPiece<T>, IHasTooltip
         public readonly PathControlPoint ControlPoint;
 
         private readonly T hitObject;
-        private readonly Circle circle;
+        private readonly FastCircle circle;
         private readonly Drawable markerRing;
 
         [Resolved]
@@ -62,7 +62,7 @@ public PathControlPointPiece(T hitObject, PathControlPoint controlPoint)
 
             InternalChildren = new[]
             {
-                circle = new Circle
+                circle = new FastCircle
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,

diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/KiaiPart.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/KiaiPart.cs
@@ -103,7 +103,7 @@ private void load(OsuColour colours)
                 Anchor = Anchor.CentreLeft;
                 Origin = Anchor.CentreLeft;
                 Height = 0.2f;
-                AddInternal(new Circle
+                AddInternal(new FastCircle
                 {
                     RelativeSizeAxes = Axes.Both,
                     Colour = colours.Purple1

diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations
     /// <summary>
     /// Represents a singular point on a timeline part.
     /// </summary>
-    public partial class PointVisualisation : Circle
+    public partial class PointVisualisation : FastCircle
     {
         public readonly double StartTime;
 

diff --git a/osu.Game/Screens/Loader.cs b/osu.Game/Screens/Loader.cs
@@ -122,6 +122,7 @@ private void load(ShaderManager manager)
                 loadTargets.Add(manager.Load(@"CursorTrail", FragmentShaderDescriptor.TEXTURE));
 
                 loadTargets.Add(manager.Load(VertexShaderDescriptor.TEXTURE_2, "TriangleBorder"));
+                loadTargets.Add(manager.Load(VertexShaderDescriptor.TEXTURE_2, "FastCircle"));
 
                 loadTargets.Add(manager.Load(VertexShaderDescriptor.TEXTURE_3, FragmentShaderDescriptor.TEXTURE));
             }

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
@@ -35,7 +35,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="11.5.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2024.809.2" />
+    <PackageReference Include="ppy.osu.Framework" Version="2024.831.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2024.810.0" />
     <PackageReference Include="Sentry" Version="4.3.0" />
     <!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->

diff --git a/osu.iOS.props b/osu.iOS.props
@@ -17,6 +17,6 @@
     <MtouchInterpreter>-all</MtouchInterpreter>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2024.809.2" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2024.831.0" />
   </ItemGroup>
 </Project>