Cache is now loadable without update and several code changes to impr…

…ove speed and reduce created garbage
innogames · Feb 16, 2023 · 6aca95a · 6aca95a
1 parent 2e2bd7f
commit 6aca95a
Show file tree

Hide file tree

Showing 42 changed files with 2,588 additions and 2,313 deletions.
diff --git a/AssetRelationsViewer/Editor/AssetRelationsViewerWindow.cs b/AssetRelationsViewer/Editor/AssetRelationsViewerWindow.cs
diff --git a/AssetRelationsViewer/Editor/AssetTypeHandler.cs b/AssetRelationsViewer/Editor/AssetTypeHandler.cs
@@ -24,9 +24,9 @@ public string GetSortingKey(string name)
             return $"Asset {name}";
         }
 
-        public VisualizationNodeData CreateNodeCachedData(string id)
+        public VisualizationNodeData CreateNodeCachedData(Node node)
         {
-            return new AssetVisualizationNodeData(id, GetHandledType());
+            return new AssetVisualizationNodeData(node);
         }
 
         public void SelectInEditor(string id)
@@ -72,7 +72,7 @@ public void OnSelectAsset(string id, string type)
         }
 
         public void InitContext(NodeDependencyLookupContext nodeDependencyLookupContext,
-            AssetRelationsViewerWindow window, INodeHandler nodeHandler)
+            AssetRelationsViewerWindow window)
         {
             _viewerWindow = window;
             Selection.selectionChanged += HandleSyncToExplorer;

diff --git a/AssetRelationsViewer/Editor/FileTypeHandler.cs b/AssetRelationsViewer/Editor/FileTypeHandler.cs
@@ -8,8 +8,6 @@ namespace Com.Innogames.Core.Frontend.AssetRelationsViewer
 	public class FileTypeHandler : ITypeHandler
 	{
 		private Object _selectedAsset;
-		private AssetRelationsViewerWindow _viewerWindow;
-		private FileNodeHandler _nodeHandler;
 
 		public string GetHandledType()
 		{
@@ -21,9 +19,9 @@ public string GetSortingKey(string name)
 			return $"File {name}";
 		}
 
-		public VisualizationNodeData CreateNodeCachedData(string id)
+		public VisualizationNodeData CreateNodeCachedData(Node node)
 		{
-			return new FileVisualizationNodeData(id, GetHandledType());
+			return new FileVisualizationNodeData(node);
 		}
 
 		public void SelectInEditor(string id)
@@ -55,10 +53,8 @@ public void OnSelectAsset(string id, string type)
 			}
 		}
 
-		public void InitContext(NodeDependencyLookupContext nodeDependencyLookupContext, AssetRelationsViewerWindow window, INodeHandler nodeHandler)
+		public void InitContext(NodeDependencyLookupContext nodeDependencyLookupContext, AssetRelationsViewerWindow window)
 		{
-			_viewerWindow = window;
-			_nodeHandler = nodeHandler as FileNodeHandler;
 		}
 
 		public bool HandlesCurrentNode()

diff --git a/AssetRelationsViewer/Editor/ITypeHandler.cs b/AssetRelationsViewer/Editor/ITypeHandler.cs
@@ -9,11 +9,11 @@ public interface ITypeHandler
 	{
 		string GetHandledType();
 		string GetSortingKey(string name);
-		VisualizationNodeData CreateNodeCachedData(string id);
+		VisualizationNodeData CreateNodeCachedData(Node node);
 		void SelectInEditor(string id);
 		void OnGui();
 		void OnSelectAsset(string id, string type);
-		void InitContext(NodeDependencyLookupContext nodeDependencyLookupContext, AssetRelationsViewerWindow viewerWindow, INodeHandler nodeHandler);
+		void InitContext(NodeDependencyLookupContext nodeDependencyLookupContext, AssetRelationsViewerWindow viewerWindow);
 		bool HandlesCurrentNode();
 	}
 }
diff --git a/AssetRelationsViewer/Editor/InSceneTypeHandler.cs b/AssetRelationsViewer/Editor/InSceneTypeHandler.cs
@@ -20,7 +20,7 @@ public class InSceneTypeHandler : ITypeHandler
         private PrefValueBool SyncPref = new PrefValueBool("InSceneTypeHandler_Sync", false);
         private PrefValueBool AutoRefreshPref = new PrefValueBool("InSceneTypeHandler_AutoRefresh", true);
         private AssetRelationsViewerWindow _viewerWindow;
-        private InSceneDependencyNodeHandler _nodeHandler;
+        private NodeDependencyLookupContext _context;
 
         private HashSet<string> _nodes = new HashSet<string>();
 
@@ -37,10 +37,10 @@ public string GetHandledType()
 
         public string GetSortingKey(string name)
         {
-            return name;
+            return $"InScene {name}";
         }
 
-        public VisualizationNodeData CreateNodeCachedData(string id)
+        public VisualizationNodeData CreateNodeCachedData(Node node)
         {
             return new InSceneVisualizationNodeData();
         }
@@ -93,7 +93,8 @@ public void OnGui()
 
         public void OnSelectAsset(string id, string type)
         {
-            GameObject node = _nodeHandler.GetGameObjectById(id);
+            InSceneDependencyNodeHandler nodeHandler = _context.NodeHandlerLookup[GetHandledType()] as InSceneDependencyNodeHandler;
+            GameObject node = nodeHandler.GetGameObjectById(id);
 
             if (type == InSceneNodeType.Name && node != null)
             {
@@ -102,10 +103,10 @@ public void OnSelectAsset(string id, string type)
             }
         }
 
-        public void InitContext(NodeDependencyLookupContext context, AssetRelationsViewerWindow viewerWindow, INodeHandler nodeHandler)
+        public void InitContext(NodeDependencyLookupContext context, AssetRelationsViewerWindow viewerWindow)
         {
             _viewerWindow = viewerWindow;
-            _nodeHandler = nodeHandler as InSceneDependencyNodeHandler;
+            _context = context;
 
             HashSet<string> nodes = new HashSet<string>();
 
@@ -122,7 +123,9 @@ public void InitContext(NodeDependencyLookupContext context, AssetRelationsViewe
             }
 
             _nodes = new HashSet<string>(nodes);
-            _nodeHandler.BuildHashToGameObjectMapping();
+
+            InSceneDependencyNodeHandler nodeHandler = _context.NodeHandlerLookup[GetHandledType()] as InSceneDependencyNodeHandler;
+            nodeHandler.BuildHashToGameObjectMapping();
 
             Selection.selectionChanged += SelectionChanged;
         }
@@ -146,7 +149,8 @@ private void SelectionChanged()
 
             if (_nodes.Contains(hashCode))
             {
-                _currentNode = _nodeHandler.GetGameObjectById(hashCode);
+                InSceneDependencyNodeHandler nodeHandler = _context.NodeHandlerLookup[GetHandledType()] as InSceneDependencyNodeHandler;
+                _currentNode = nodeHandler.GetGameObjectById(hashCode);
 
                 if (SyncPref.GetValue())
                 {
@@ -179,7 +183,7 @@ private void AutoRefreshSceneAfterChange()
 
             if (_currentLoadedSceneKey != 0 && loadedScenesKey != _currentLoadedSceneKey)
             {
-                _viewerWindow.RefreshContext(cacheType, resolverType, null);
+                _viewerWindow.RefreshContext(cacheType, resolverType, null, true);
             }
 
             _currentLoadedSceneKey = loadedScenesKey;

diff --git a/AssetRelationsViewer/Editor/NodeDataCache.cs b/AssetRelationsViewer/Editor/NodeDataCache.cs
diff --git a/AssetRelationsViewer/Editor/NodeDataCache.cs.meta b/AssetRelationsViewer/Editor/NodeDataCache.cs.meta
diff --git a/AssetRelationsViewer/Editor/NodeSizeThread.cs b/AssetRelationsViewer/Editor/NodeSizeThread.cs
diff --git a/AssetRelationsViewer/Editor/NodeSizeThread.cs.meta b/AssetRelationsViewer/Editor/NodeSizeThread.cs.meta
diff --git a/AssetRelationsViewer/Editor/PrefValue.cs b/AssetRelationsViewer/Editor/PrefValue.cs
@@ -10,6 +10,7 @@ namespace Com.Innogames.Core.Frontend.AssetRelationsViewer
 	public abstract class PrefValue<T>
 	{
 		protected T DefaultValue;
+		protected T CachedValue;
 
 		protected string Key;
 		protected T Value;
@@ -32,11 +33,14 @@ public PrefValue(string key, T defaultValue, T minValue, T maxValue)
 
 			MinValue = minValue;
 			MaxValue = maxValue;
+
+			CachedValue = GetValue();
 		}
 
 		public void SetValue(T value)
 		{
 			Value = value;
+			CachedValue = value;
 			Save();
 		}
 
@@ -59,7 +63,7 @@ public void DirtyOnChange(T newValue, Action<T> onChange = null)
 
 		public static implicit operator T(PrefValue<T> pref)
 		{
-			return pref.GetValue();
+			return pref.CachedValue;
 		}
 	}