Merge branch 'master' into remove-nullable-disable-in-the-utils

.github/workflows/ci.yml

@@ -126,12 +126,6 @@ jobs:
         with:
           dotnet-version: "6.0.x"
 
-      # macOS agents recently have empty NuGet config files, resulting in restore failures,
-      # see https://github.com/actions/virtual-environments/issues/5768
-      # Add the global nuget package source manually for now.
-      - name: Setup NuGet.Config
-        run: echo '<configuration><packageSources><add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /></packageSources></configuration>' > ~/.config/NuGet/NuGet.Config
-
       # Contrary to seemingly any other msbuild, msbuild running on macOS/Mono
       # cannot accept .sln(f) files as arguments.
       # Build just the iOS framework project for now.

osu.Framework.Benchmarks/BenchmarkTransformUpdate.cs

@@ -14,6 +14,7 @@ namespace osu.Framework.Benchmarks
     public class BenchmarkTransformUpdate : BenchmarkTest
     {
         private TestBox target;
+        private TestBox targetNoTransforms;
 
         public override void SetUp()
         {
@@ -23,7 +24,8 @@ public override void SetUp()
 
             ManualClock clock;
 
-            target = new TestBox { Clock = new FramedClock(clock = new ManualClock()) };
+            targetNoTransforms = new TestBox { Clock = new FramedClock(clock = new ManualClock()) };
+            target = new TestBox { Clock = new FramedClock(clock) };
 
             // transform one target member over a long period
             target.RotateTo(360, transforms_count * 2);
@@ -36,6 +38,13 @@ public override void SetUp()
             target.Clock.ProcessFrame();
         }
 
+        [Benchmark]
+        public void UpdateTransformsWithNonePresent()
+        {
+            for (int i = 0; i < 10000; i++)
+                targetNoTransforms.UpdateTransforms();
+        }
+
         [Benchmark]
         public void UpdateTransformsWithManyPresent()
         {

osu.Framework/Graphics/Transforms/Transformable.cs

@@ -42,7 +42,7 @@ public abstract class Transformable : ITransformable
         /// <summary>
         /// A lazily-initialized list of <see cref="Transform"/>s applied to this object.
         /// </summary>
-        public IEnumerable<Transform> Transforms => targetGroupingTrackers.SelectMany(t => t.Transforms);
+        public IEnumerable<Transform> Transforms => targetGroupingTrackers?.SelectMany(t => t.Transforms) ?? Array.Empty<Transform>();
 
         /// <summary>
         /// Retrieves the <see cref="Transform"/>s for a given target member.
@@ -63,13 +63,16 @@ public double LatestTransformEndTime
                 //expiry should happen either at the end of the last transform or using the current sequence delay (whichever is highest).
                 double max = TransformStartTime;
 
-                foreach (var tracker in targetGroupingTrackers)
+                if (targetGroupingTrackers != null)
                 {
-                    for (int i = 0; i < tracker.Transforms.Count; i++)
+                    foreach (var tracker in targetGroupingTrackers)
                     {
-                        var t = tracker.Transforms[i];
-                        if (t.EndTime > max)
-                            max = t.EndTime + 1; //adding 1ms here ensures we can expire on the current frame without issue.
+                        for (int i = 0; i < tracker.Transforms.Count; i++)
+                        {
+                            var t = tracker.Transforms[i];
+                            if (t.EndTime > max)
+                                max = t.EndTime + 1; //adding 1ms here ensures we can expire on the current frame without issue.
+                        }
                     }
                 }
 
@@ -88,37 +91,50 @@ public double LatestTransformEndTime
         protected void UpdateTransforms()
         {
             TransformDelay = 0;
+
+            if (targetGroupingTrackers == null)
+                return;
+
             updateTransforms(Time.Current);
         }
 
         private double lastUpdateTransformsTime;
 
-        private readonly List<TargetGroupingTransformTracker> targetGroupingTrackers = new List<TargetGroupingTransformTracker>();
+        private List<TargetGroupingTransformTracker> targetGroupingTrackers;
 
         private TargetGroupingTransformTracker getTrackerFor(string targetMember)
         {
-            foreach (var t in targetGroupingTrackers)
+            if (targetGroupingTrackers != null)
             {
-                if (t.TargetMembers.Contains(targetMember))
-                    return t;
+                foreach (var t in targetGroupingTrackers)
+                {
+                    if (t.TargetMembers.Contains(targetMember))
+                        return t;
+                }
             }
 
             return null;
         }
 
         private TargetGroupingTransformTracker getTrackerForGrouping(string targetGrouping, bool createIfNotExisting)
         {
-            foreach (var t in targetGroupingTrackers)
+            if (targetGroupingTrackers != null)
             {
-                if (t.TargetGrouping == targetGrouping)
-                    return t;
+                foreach (var t in targetGroupingTrackers)
+                {
+                    if (t.TargetGrouping == targetGrouping)
+                        return t;
+                }
             }
 
             if (!createIfNotExisting)
                 return null;
 
             var tracker = new TargetGroupingTransformTracker(this, targetGrouping);
+
+            targetGroupingTrackers ??= new List<TargetGroupingTransformTracker>();
             targetGroupingTrackers.Add(tracker);
+
             return tracker;
         }
 
@@ -130,6 +146,9 @@ private TargetGroupingTransformTracker getTrackerForGrouping(string targetGroupi
         /// <param name="forceRewindReprocess">Whether prior transforms should be reprocessed even if a rewind was not detected.</param>
         private void updateTransforms(double time, bool forceRewindReprocess = false)
         {
+            if (targetGroupingTrackers == null)
+                return;
+
             bool rewinding = lastUpdateTransformsTime > time || forceRewindReprocess;
             lastUpdateTransformsTime = time;
 
@@ -177,6 +196,9 @@ public virtual void ClearTransforms(bool propagateChildren = false, string targe
         /// </param>
         public virtual void ClearTransformsAfter(double time, bool propagateChildren = false, string targetMember = null)
         {
+            if (targetGroupingTrackers == null)
+                return;
+
             EnsureTransformMutationAllowed();
 
             if (targetMember != null)
@@ -218,6 +240,9 @@ public virtual void ApplyTransformsAt(double time, bool propagateChildren = fals
         /// </param>
         public virtual void FinishTransforms(bool propagateChildren = false, string targetMember = null)
         {
+            if (targetGroupingTrackers == null)
+                return;
+
             EnsureTransformMutationAllowed();
 
             if (targetMember != null)