Fix streetscape events are not updated after cached

asus4 · May 20, 2024 · 12c37d5 · 12c37d5
1 parent d31b98c
commit 12c37d5
Showing 1 changed file with 11 additions and 15 deletions.
diff --git a/...hub.asus4.arfoundationreplay/Runtime/Components/ARStreetscapeGeometryManagerWithReplay.cs b/...hub.asus4.arfoundationreplay/Runtime/Components/ARStreetscapeGeometryManagerWithReplay.cs
@@ -16,8 +16,7 @@ public sealed class ARStreetscapeGeometryManagerWithReplay : ARStreetscapeGeomet
     {
         private bool _useReplay = false;
         private XRStreetscapeGeometrySubsystem _subsystem;
-
-        private Action<ARStreetscapeGeometriesChangedEventArgs>[] _updateHandlers;
+        private MulticastDelegate _updateDelegates;
 
         private readonly Dictionary<TrackableId, ARStreetscapeGeometryWithReplay> _geometries = new();
 
@@ -102,23 +101,20 @@ private ARStreetscapeGeometry Convert(StreetscapeGeometry geometry)
 
         private void InvokeChangedEvent(ARStreetscapeGeometriesChangedEventArgs args)
         {
-            // Using cache to speed up invoke time
-            if (_updateHandlers != null)
+            if (_updateDelegates == null)
             {
-                foreach (var handler in _updateHandlers)
-                {
-                    handler?.Invoke(args);
-                }
+                const BindingFlags bindingFlags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;
+                var field = typeof(ARStreetscapeGeometryManager).GetField("StreetscapeGeometriesChanged", bindingFlags)
+                    ?? throw new InvalidOperationException("Not found ARStreetscapeGeometryManager.StreetscapeGeometriesChanged");
+                _updateDelegates = (MulticastDelegate)field.GetValue(this);
             }
 
-            var field = typeof(ARStreetscapeGeometryManager)
-                .GetField("StreetscapeGeometriesChanged", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
-            var eventDelegate = (MulticastDelegate)field.GetValue(this);
-            if (eventDelegate != null)
+            // Using cache to speed up invoke time
+            var handlers = _updateDelegates.GetInvocationList()
+                .Cast<Action<ARStreetscapeGeometriesChangedEventArgs>>();
+            foreach (var handler in handlers)
             {
-                _updateHandlers = eventDelegate.GetInvocationList()
-                    .Select(x => x as Action<ARStreetscapeGeometriesChangedEventArgs>)
-                    .ToArray();
+                handler?.Invoke(args);
             }
         }
     }