perf(UIComponent): determine stylesheets asset paths in the same thre…

…ad as the load operation UIComponent no longer waits for each StylesheetAttribute's path to be resolved before starting asset loading; both are now done simultaneously for each attribute.
jonisavo · Sep 18, 2022 · 33dcef6 · 33dcef6
1 parent a0dc173
commit 33dcef6
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 11 deletions.
diff --git a/Assets/UIComponents/Addressables/AddressableAssetResolver.cs b/Assets/UIComponents/Addressables/AddressableAssetResolver.cs
@@ -55,7 +55,8 @@ public async Task<bool> AssetExists(string assetPath)
 
             var exists = locations.Count > 0;
 
-            AssetPathExistsCache.Add(assetPath, exists);
+            if (!AssetPathExistsCache.ContainsKey(assetPath))
+                AssetPathExistsCache.Add(assetPath, exists);
 
             return exists;
         }

diff --git a/Assets/UIComponents/Core/UIComponent.cs b/Assets/UIComponents/Core/UIComponent.cs
@@ -250,34 +250,49 @@ private async Task<VisualTreeAsset> GetLayout()
 
             return await AssetResolver.LoadAsset<VisualTreeAsset>(assetPath);
         }
+
+        private readonly struct StyleSheetLoadTuple
+        {
+            public readonly string Path;
+            public readonly StyleSheet StyleSheet;
+
+            public StyleSheetLoadTuple(string path, StyleSheet styleSheet)
+            {
+                Path = path;
+                StyleSheet = styleSheet;
+            }
+        }
+
+        private async Task<StyleSheetLoadTuple> GetSingleStyleSheet(StylesheetAttribute stylesheetAttribute)
+        {
+            var assetPath = await stylesheetAttribute.GetAssetPathForComponent(this);
+            var styleSheet = await AssetResolver.LoadAsset<StyleSheet>(assetPath);
+
+            return new StyleSheetLoadTuple(assetPath, styleSheet);
+        }
 
         private async Task<List<StyleSheet>> GetStyleSheets()
         {
             var stylesheetAttributes =
                 CacheDictionary[_componentType].StylesheetAttributes;
             var stylesheetAttributeCount = stylesheetAttributes.Count;
             var styleSheetLoadTasks =
-                new Task<StyleSheet>[stylesheetAttributeCount];
-            var styleSheetAssetPaths = new string[stylesheetAttributeCount];
+                new Task<StyleSheetLoadTuple>[stylesheetAttributeCount];
 
             for (var i = 0; i < stylesheetAttributeCount; i++)
-            {
-                styleSheetAssetPaths[i] = await stylesheetAttributes[i].GetAssetPathForComponent(this);
-                var loadOperation = AssetResolver.LoadAsset<StyleSheet>(styleSheetAssetPaths[i]);
-                styleSheetLoadTasks[i] = loadOperation;
-            }
+                styleSheetLoadTasks[i] = GetSingleStyleSheet(stylesheetAttributes[i]);
 
             await Task.WhenAll(styleSheetLoadTasks);
 
             var loadedStyleSheets = new List<StyleSheet>(stylesheetAttributeCount);
 
-            for (var i = 0; i < stylesheetAttributeCount; i++)
+            foreach (var loadTask in styleSheetLoadTasks)
             {
-                var styleSheet = styleSheetLoadTasks[i].Result;
+                var styleSheet = loadTask.Result.StyleSheet;
 
                 if (styleSheet == null)
                 {
-                    Logger.LogError($"Could not find stylesheet {styleSheetAssetPaths[i]}", this);
+                    Logger.LogError($"Could not find stylesheet {loadTask.Result.Path}", this);
                     continue;
                 }