From 0cd657456dc410f14c0e0ba2e752345c9f5d30fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=BCleyman=20Yasir=20KULA?= Date: Fri, 20 Sep 2019 01:28:15 +0300 Subject: [PATCH] - Fixed cache issue that occurred after an asset was renamed - Added an option to include non-serializable objects in search since some seemingly non-serializable Unity types are actually serialized with Unity magic (e.g. AnimatorControllerLayer) - It is now possible to exclude some asset(s) and/or scene(s) from the search - Added optional progressbar --- AssetUsageDetector.unitypackage | Bin 26165 -> 0 bytes .../Editor/AssetUsageDetector.cs | 272 ++++++++--- .../Editor/AssetUsageDetectorWindow.cs | 454 ++++++------------ .../AssetUsageDetector/Editor/ListDrawer.cs | 216 +++++++++ .../Editor/ListDrawer.cs.meta | 12 + .../AssetUsageDetector/Editor/SearchResult.cs | 89 +++- .../AssetUsageDetector/Editor/Utilities.cs | 30 ++ README.md | 2 +- 8 files changed, 691 insertions(+), 384 deletions(-) delete mode 100644 AssetUsageDetector.unitypackage create mode 100644 Plugins/AssetUsageDetector/Editor/ListDrawer.cs create mode 100644 Plugins/AssetUsageDetector/Editor/ListDrawer.cs.meta diff --git a/AssetUsageDetector.unitypackage b/AssetUsageDetector.unitypackage deleted file mode 100644 index 5e3930a265bc28c2d884f8807f61d1a0c1eeab51..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26165 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 searchInAssetsSubset; + public IEnumerable excludedAssetsFromSearch; + public bool dontSearchInSourceAssets; + public IEnumerable excludedScenesFromSearch; public int searchDepthLimit; public BindingFlags fieldModifiers, propertyModifiers; + public bool searchNonSerializableVariables; public bool noAssetDatabaseChanges; + public bool showProgressBar; public Parameters() { @@ -51,10 +57,15 @@ namespace AssetUsageDetectorNamespace searchInScenes = SceneSearchMode.AllScenes; searchInAssetsFolder = true; searchInAssetsSubset = null; + excludedAssetsFromSearch = null; + dontSearchInSourceAssets = false; + excludedScenesFromSearch = null; searchDepthLimit = 4; fieldModifiers = BindingFlags.Public | BindingFlags.NonPublic; propertyModifiers = BindingFlags.Public | BindingFlags.NonPublic; + searchNonSerializableVariables = true; noAssetDatabaseChanges = false; + showProgressBar = false; } } @@ -64,6 +75,7 @@ namespace AssetUsageDetectorNamespace public string hash; public string[] dependencies; + public long[] fileSizes; public bool verified; public Result searchResult; @@ -73,10 +85,11 @@ namespace AssetUsageDetectorNamespace Verify( path ); } - public CacheEntry( string hash, string[] dependencies ) + public CacheEntry( string hash, string[] dependencies, long[] fileSizes ) { this.hash = hash; this.dependencies = dependencies; + this.fileSizes = fileSizes; } public void Verify( string path ) @@ -85,11 +98,21 @@ namespace AssetUsageDetectorNamespace if( this.hash != hash ) { this.hash = hash; - dependencies = AssetDatabase.GetDependencies( path, false ); + Refresh( path ); } verified = true; } + + public void Refresh( string path ) + { + dependencies = AssetDatabase.GetDependencies( path, false ); + if( fileSizes == null || fileSizes.Length != dependencies.Length ) + fileSizes = new long[dependencies.Length]; + + for( int i = 0; i < dependencies.Length; i++ ) + fileSizes[i] = new FileInfo( dependencies[i] ).Length; + } } #endregion @@ -99,7 +122,7 @@ namespace AssetUsageDetectorNamespace private HashSet sceneObjectsToSearchScenesSet; // sceneObjectsToSearchSet's scene(s) private HashSet assetsToSearchSet; // Project asset(s) in objectsToSearchSet - private HashSet assetsToSearchPathsSet; // objectsToSearchSet's path(s) + private HashSet assetsToSearchPathsSet; // assetsToSearchSet's path(s) private SearchResultGroup currentSearchResultGroup; // Results for the currently searched scene @@ -109,7 +132,7 @@ namespace AssetUsageDetectorNamespace private Dictionary> typeToSearchFunction; // Dictionary to quickly find the function to search a specific type with - private Stack callStack; // Stack of SearchObject function parameters to avoid infinite loops (which happens when same object is passed as parameter to function) + private List callStack; // Stack of SearchObject function parameters to avoid infinite loops (which happens when same object is passed as parameter to function) private bool searchPrefabConnections; private bool searchMonoBehavioursForScript; @@ -176,7 +199,7 @@ namespace AssetUsageDetectorNamespace searchedObjects.Clear(); if( callStack == null ) - callStack = new Stack( 64 ); + callStack = new List( 64 ); else callStack.Clear(); @@ -354,7 +377,7 @@ namespace AssetUsageDetectorNamespace } // By default, search only serializable variables for references - searchSerializableVariablesOnly = true; + searchSerializableVariablesOnly = !searchParameters.searchNonSerializableVariables; // Initialize the nodes of searched asset(s) foreach( Object obj in objectsToSearchSet ) @@ -367,6 +390,12 @@ namespace AssetUsageDetectorNamespace searchedObjects[objHash] = PopReferenceNode( obj ); } + // Progressbar values + int searchProgress = 0; + int searchTotalProgress = scenesToSearch.Count; + if( EditorApplication.isPlaying ) + searchTotalProgress++; // DontDestroyOnLoad scene + // Don't search assets if searched object(s) are all scene objects as assets can't hold references to scene objects if( searchParameters.searchInAssetsFolder && assetsToSearchSet.Count > 0 ) { @@ -375,27 +404,63 @@ namespace AssetUsageDetectorNamespace // Get the paths of all assets that are to be searched IEnumerable assetPaths; if( searchParameters.searchInAssetsSubset == null ) - assetPaths = AssetDatabase.GetAllAssetPaths(); + { + string[] allAssetPaths = AssetDatabase.GetAllAssetPaths(); + searchTotalProgress += allAssetPaths.Length; + assetPaths = allAssetPaths; + } else { folderContentsSet.Clear(); - foreach( Object target in searchParameters.searchInAssetsSubset ) + foreach( Object obj in searchParameters.searchInAssetsSubset ) { - if( target == null || target.Equals( null ) ) + if( obj == null || obj.Equals( null ) ) continue; - if( target.IsFolder() ) - folderContentsSet.UnionWith( Utilities.EnumerateFolderContents( target ) ); + if( !obj.IsAsset() ) + continue; + + if( obj.IsFolder() ) + folderContentsSet.UnionWith( Utilities.EnumerateFolderContents( obj ) ); else - folderContentsSet.Add( AssetDatabase.GetAssetPath( target ) ); + folderContentsSet.Add( AssetDatabase.GetAssetPath( obj ) ); } + searchTotalProgress += folderContentsSet.Count; assetPaths = folderContentsSet; } + // Calculate the path(s) of the assets that won't be searched for references + HashSet excludedAssetsPathsSet = new HashSet(); + if( searchParameters.excludedAssetsFromSearch != null ) + { + foreach( Object obj in searchParameters.excludedAssetsFromSearch ) + { + if( obj == null || obj.Equals( null ) ) + continue; + + if( !obj.IsAsset() ) + continue; + + if( obj.IsFolder() ) + excludedAssetsPathsSet.UnionWith( Utilities.EnumerateFolderContents( obj ) ); + else + excludedAssetsPathsSet.Add( AssetDatabase.GetAssetPath( obj ) ); + } + } + + if( searchParameters.dontSearchInSourceAssets ) + excludedAssetsPathsSet.UnionWith( assetsToSearchPathsSet ); + foreach( string path in assetPaths ) { + if( searchParameters.showProgressBar && ++searchProgress % 30 == 1 && EditorUtility.DisplayCancelableProgressBar( "Please wait...", "Searching assets", (float) searchProgress / searchTotalProgress ) ) + throw new Exception( "Search aborted" ); + + if( excludedAssetsPathsSet.Contains( path ) ) + continue; + // If asset resides inside the Assets directory and is not a scene asset if( path.StartsWith( "Assets/" ) && !path.EndsWith( ".unity" ) ) { @@ -426,16 +491,56 @@ namespace AssetUsageDetectorNamespace if( EditorApplication.isPlaying ) searchSerializableVariablesOnly = false; - foreach( string scenePath in scenesToSearch ) + if( scenesToSearch.Count > 0 ) { - // Search scene for references - if( !string.IsNullOrEmpty( scenePath ) ) + // Calculate the path(s) of the scenes that won't be searched for references + HashSet excludedScenesPathsSet = new HashSet(); + if( searchParameters.excludedScenesFromSearch != null ) + { + foreach( Object obj in searchParameters.excludedScenesFromSearch ) + { + if( obj == null || obj.Equals( null ) ) + continue; + + if( !obj.IsAsset() ) + continue; + + if( obj.IsFolder() ) + { + string[] folderContents = AssetDatabase.FindAssets( "t:SceneAsset", new string[] { AssetDatabase.GetAssetPath( obj ) } ); + if( folderContents == null ) + continue; + + for( int i = 0; i < folderContents.Length; i++ ) + excludedScenesPathsSet.Add( AssetDatabase.GUIDToAssetPath( folderContents[i] ) ); + } + else if( obj is SceneAsset ) + excludedScenesPathsSet.Add( AssetDatabase.GetAssetPath( obj ) ); + } + } + + foreach( string scenePath in scenesToSearch ) + { + if( searchParameters.showProgressBar && EditorUtility.DisplayCancelableProgressBar( "Please wait...", "Searching scene: " + scenePath, (float) ++searchProgress / searchTotalProgress ) ) + throw new Exception( "Search aborted" ); + + // Search scene for references + if( string.IsNullOrEmpty( scenePath ) ) + continue; + + if( excludedScenesPathsSet.Contains( scenePath ) ) + continue; + SearchScene( scenePath, searchResult, initialSceneSetup ); + } } // Search through all the GameObjects under the DontDestroyOnLoad scene (if exists) if( EditorApplication.isPlaying ) { + if( searchParameters.showProgressBar && EditorUtility.DisplayCancelableProgressBar( "Please wait...", "Searching scene: DontDestroyOnLoad", 1f ) ) + throw new Exception( "Search aborted" ); + currentSearchResultGroup = new SearchResultGroup( "DontDestroyOnLoad", false ); GameObject[] rootGameObjects = GetDontDestroyOnLoadObjects(); @@ -470,19 +575,21 @@ namespace AssetUsageDetectorNamespace { currentSearchResultGroup = null; currentObject = null; + + EditorUtility.ClearProgressBar(); } } private void InitializeSearchResultNodes( List searchResult ) { for( int i = 0; i < searchResult.Count; i++ ) - searchResult[i].InitializeNodes(); + searchResult[i].InitializeNodes( GetReferenceNode ); // If there are any empty groups after node initialization, remove those groups for( int i = searchResult.Count - 1; i >= 0; i-- ) { if( searchResult[i].NumberOfReferences == 0 ) - searchResult.RemoveAt( i ); + searchResult.RemoveAtFast( i ); } } @@ -520,17 +627,17 @@ namespace AssetUsageDetectorNamespace { // If searched asset is a GameObject, include its components in the search Component[] components = ( (GameObject) obj ).GetComponents(); - for( int j = 0; j < components.Length; j++ ) + for( int i = 0; i < components.Length; i++ ) { - if( components[j] == null || components[j].Equals( null ) ) + if( components[i] == null || components[i].Equals( null ) ) continue; - objectsToSearchSet.Add( components[j] ); + objectsToSearchSet.Add( components[i] ); if( isAsset ) - assetsToSearchSet.Add( components[j] ); + assetsToSearchSet.Add( components[i] ); else - sceneObjectsToSearchSet.Add( components[j] ); + sceneObjectsToSearchSet.Add( components[i] ); } } } @@ -539,6 +646,8 @@ namespace AssetUsageDetectorNamespace private void SearchScene( string scenePath, List searchResult, SceneSetup[] initialSceneSetup ) { Scene scene = EditorSceneManager.GetSceneByPath( scenePath ); + if( EditorApplication.isPlaying && !scene.isLoaded ) + return; bool canContainSceneObjectReference = scene.isLoaded && ( !EditorSceneManager.preventCrossSceneReferences || sceneObjectsToSearchScenesSet.Contains( scenePath ) ); if( !canContainSceneObjectReference ) @@ -617,7 +726,7 @@ namespace AssetUsageDetectorNamespace return null; // Avoid recursion (which leads to stackoverflow exception) using a stack - if( callStack.Contains( obj ) ) + if( callStack.ContainsFast( obj ) ) return null; // Hashing does not work well with structs all the time, don't cache search results for structs @@ -660,7 +769,7 @@ namespace AssetUsageDetectorNamespace return null; } - callStack.Push( unityObject ); + callStack.Add( unityObject ); // Search the Object in detail Func func; @@ -674,7 +783,7 @@ namespace AssetUsageDetectorNamespace SearchFieldsAndPropertiesOf( result ); } - callStack.Pop(); + callStack.RemoveAt( callStack.Count - 1 ); } else { @@ -682,14 +791,14 @@ namespace AssetUsageDetectorNamespace if( currentDepth >= searchDepthLimit ) return null; - callStack.Push( obj ); + callStack.Add( obj ); currentDepth++; result = PopReferenceNode( obj ); SearchFieldsAndPropertiesOf( result ); currentDepth--; - callStack.Pop(); + callStack.RemoveAt( callStack.Count - 1 ); } if( result != null && result.NumberOfOutgoingLinks == 0 ) @@ -755,8 +864,8 @@ namespace AssetUsageDetectorNamespace // If an asset is a shader, texture or material, and this component is a Renderer, // search it for references Material[] materials = ( (Renderer) component ).sharedMaterials; - for( int j = 0; j < materials.Length; j++ ) - referenceNode.AddLinkTo( SearchObject( materials[j] ) ); + for( int i = 0; i < materials.Length; i++ ) + referenceNode.AddLinkTo( SearchObject( materials[i] ) ); } else if( component is Animation ) { @@ -797,7 +906,6 @@ namespace AssetUsageDetectorNamespace #endif SearchFieldsAndPropertiesOf( referenceNode ); - return referenceNode; } @@ -815,11 +923,11 @@ namespace AssetUsageDetectorNamespace // Credit: http://answers.unity3d.com/answers/1116025/view.html Shader shader = material.shader; int shaderPropertyCount = ShaderUtil.GetPropertyCount( shader ); - for( int k = 0; k < shaderPropertyCount; k++ ) + for( int i = 0; i < shaderPropertyCount; i++ ) { - if( ShaderUtil.GetPropertyType( shader, k ) == ShaderUtil.ShaderPropertyType.TexEnv ) + if( ShaderUtil.GetPropertyType( shader, i ) == ShaderUtil.ShaderPropertyType.TexEnv ) { - string propertyName = ShaderUtil.GetPropertyName( shader, k ); + string propertyName = ShaderUtil.GetPropertyName( shader, i ); Texture assignedTexture = material.GetTexture( propertyName ); if( objectsToSearchSet.Contains( assignedTexture ) ) referenceNode.AddLinkTo( GetReferenceNode( assignedTexture ), "Shader property: " + propertyName ); @@ -1025,6 +1133,8 @@ namespace AssetUsageDetectorNamespace // 1- skip Obsolete variables // 2- skip primitive types, enums and strings // 3- skip common Unity types that can't hold any references (e.g. Vector3, Rect, Color, Quaternion) + // + // P.S. IsPrimitiveUnityType() extension function handles steps 2) and 3) validVariables.Clear(); @@ -1045,6 +1155,13 @@ namespace AssetUsageDetectorNamespace if( fields[i].FieldType.IsPrimitiveUnityType() ) continue; + // Additional filtering for fields: + // 1- Ignore "m_RectTransform", "m_CanvasRenderer" and "m_Canvas" fields of Graphic components + string fieldName = fields[i].Name; + if( typeof( Graphic ).IsAssignableFrom( currType ) && + ( fieldName == "m_RectTransform" || fieldName == "m_CanvasRenderer" || fieldName == "m_Canvas" ) ) + continue; + VariableGetVal getter = fields[i].CreateGetter( type ); if( getter != null ) validVariables.Add( new VariableGetterHolder( fields[i], getter, fields[i].IsSerializable() ) ); @@ -1070,33 +1187,39 @@ namespace AssetUsageDetectorNamespace if( properties[i].PropertyType.IsPrimitiveUnityType() ) continue; + // No need to check properties with 'override' keyword + if( properties[i].IsOverridden() ) + continue; + // Additional filtering for properties: // 1- Ignore "gameObject", "transform", "rectTransform" and "attachedRigidbody" properties of Component's to get more useful results // 2- Ignore "canvasRenderer" and "canvas" properties of Graphic components - // 3 & 4- Prevent accessing properties of Unity that instantiate an existing resource (causing leak) + // 3 & 4- Prevent accessing properties of Unity that instantiate an existing resource (causing memory leak) string propertyName = properties[i].Name; - if( typeof( Component ).IsAssignableFrom( currType ) && ( propertyName.Equals( "gameObject" ) || - propertyName.Equals( "transform" ) || propertyName.Equals( "attachedRigidbody" ) || propertyName.Equals( "rectTransform" ) ) ) + if( typeof( Component ).IsAssignableFrom( currType ) && ( propertyName == "gameObject" || + propertyName == "transform" || propertyName == "attachedRigidbody" || propertyName == "rectTransform" ) ) continue; - else if( typeof( UnityEngine.UI.Graphic ).IsAssignableFrom( currType ) && - ( propertyName.Equals( "canvasRenderer" ) || propertyName.Equals( "canvas" ) ) ) + else if( typeof( Graphic ).IsAssignableFrom( currType ) && + ( propertyName == "canvasRenderer" || propertyName == "canvas" ) ) continue; - else if( typeof( MeshFilter ).IsAssignableFrom( currType ) && propertyName.Equals( "mesh" ) ) + else if( typeof( MeshFilter ).IsAssignableFrom( currType ) && propertyName == "mesh" ) continue; else if( typeof( Renderer ).IsAssignableFrom( currType ) && - ( propertyName.Equals( "sharedMaterial" ) || propertyName.Equals( "sharedMaterials" ) ) ) + ( propertyName == "sharedMaterial" || propertyName == "sharedMaterials" ) ) continue; - else if( ( propertyName.Equals( "material" ) || propertyName.Equals( "materials" ) ) && + else if( ( propertyName == "material" || propertyName == "materials" ) && ( typeof( Renderer ).IsAssignableFrom( currType ) || typeof( Collider ).IsAssignableFrom( currType ) || typeof( Collider2D ).IsAssignableFrom( currType ) +#if !UNITY_2019_3_OR_NEWER #pragma warning disable 0618 || typeof( GUIText ).IsAssignableFrom( currType ) ) ) #pragma warning restore 0618 +#endif continue; else { VariableGetVal getter = properties[i].CreateGetter(); - if( getter != null && !properties[i].IsOverridden() ) // No need to check properties with 'override' keyword + if( getter != null ) validVariables.Add( new VariableGetterHolder( properties[i], getter, properties[i].IsSerializable() ) ); } } @@ -1131,8 +1254,20 @@ namespace AssetUsageDetectorNamespace cacheEntry.searchResult = CacheEntry.Result.No; string[] dependencies = cacheEntry.dependencies; + long[] fileSizes = cacheEntry.fileSizes; for( int i = 0; i < dependencies.Length; i++ ) { + // If a dependency was renamed (which doesn't affect the verified hash, unfortunately), + // force refresh the asset's dependencies and search it again + FileInfo assetFile = new FileInfo( dependencies[i] ); + if( !assetFile.Exists || assetFile.Length != fileSizes[i] ) + { + cacheEntry.Refresh( assetPath ); + cacheEntry.searchResult = CacheEntry.Result.Unknown; + + return AssetHasAnyReference( assetPath ); + } + if( assetsToSearchPathsSet.Contains( dependencies[i] ) ) { cacheEntry.searchResult = CacheEntry.Result.Yes; @@ -1153,12 +1288,10 @@ namespace AssetUsageDetectorNamespace } // Get reference node for object - private ReferenceNode GetReferenceNode( object nodeObject, string hash = null ) + private ReferenceNode GetReferenceNode( object nodeObject ) { - if( hash == null ) - hash = nodeObject.Hash(); - ReferenceNode result; + string hash = nodeObject.Hash(); if( !searchedObjects.TryGetValue( hash, out result ) || result == null ) { result = PopReferenceNode( nodeObject ); @@ -1229,13 +1362,17 @@ namespace AssetUsageDetectorNamespace { CacheEntry cacheEntry = keyValuePair.Value; string[] dependencies = cacheEntry.dependencies; + long[] fileSizes = cacheEntry.fileSizes; writer.Write( keyValuePair.Key ); writer.Write( cacheEntry.hash ); writer.Write( dependencies.Length ); for( int i = 0; i < dependencies.Length; i++ ) + { writer.Write( dependencies[i] ); + writer.Write( fileSizes[i] ); + } } } } @@ -1264,10 +1401,14 @@ namespace AssetUsageDetectorNamespace int dependenciesLength = reader.ReadInt32(); string[] dependencies = new string[dependenciesLength]; + long[] fileSizes = new long[dependenciesLength]; for( int j = 0; j < dependenciesLength; j++ ) + { dependencies[j] = reader.ReadString(); + fileSizes[j] = reader.ReadInt64(); + } - assetDependencyCache[assetPath] = new CacheEntry( hash, dependencies ); + assetDependencyCache[assetPath] = new CacheEntry( hash, dependencies, fileSizes ); } } catch( Exception e ) @@ -1286,23 +1427,34 @@ namespace AssetUsageDetectorNamespace string[] allAssets = AssetDatabase.GetAllAssetPaths(); if( allAssets.Length > 0 ) { - string title = "Please wait..."; - string message = "Generating cache for the first time"; - double startTime = EditorApplication.timeSinceStartup; - EditorUtility.DisplayProgressBar( title, message, 0f ); - - for( int i = 0; i < allAssets.Length; i++ ) + try { - AssetHasAnyReference( allAssets[i] ); - EditorUtility.DisplayProgressBar( title, message, (float) i / allAssets.Length ); + for( int i = 0; i < allAssets.Length; i++ ) + { + if( i % 30 == 0 && EditorUtility.DisplayCancelableProgressBar( "Please wait...", "Generating cache for the first time", (float) i / allAssets.Length ) ) + { + EditorUtility.ClearProgressBar(); + Debug.LogWarning( "Initial cache generation cancelled, cache will be generated on the fly as more and more assets are searched." ); + break; + } + + AssetHasAnyReference( allAssets[i] ); + } + + EditorUtility.ClearProgressBar(); + + Debug.Log( "Cache generated in " + ( EditorApplication.timeSinceStartup - startTime ).ToString( "F2" ) + " seconds" ); + Debug.Log( "You can always reset the cache by deleting " + Path.GetFullPath( CachePath ) ); + + SaveCache(); + } + catch( Exception e ) + { + EditorUtility.ClearProgressBar(); + Debug.LogException( e ); } - - EditorUtility.ClearProgressBar(); - - Debug.Log( "Cache generated in " + ( EditorApplication.timeSinceStartup - startTime ).ToString( "F2" ) + " seconds" ); - SaveCache(); } } } diff --git a/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs b/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs index 3818463..e4aadb6 100644 --- a/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs +++ b/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs @@ -16,10 +16,13 @@ namespace AssetUsageDetectorNamespace.Extras private const string PREFS_SEARCH_SCENES = "AUD_SceneSearch"; private const string PREFS_SEARCH_ASSETS = "AUD_AssetsSearch"; + private const string PREFS_DONT_SEARCH_SOURCE_ASSETS = "AUD_AssetsExcludeSrc"; private const string PREFS_SEARCH_DEPTH_LIMIT = "AUD_Depth"; private const string PREFS_SEARCH_FIELDS = "AUD_Fields"; private const string PREFS_SEARCH_PROPERTIES = "AUD_Properties"; + private const string PREFS_SEARCH_NON_SERIALIZABLES = "AUD_NonSerializables"; private const string PREFS_PATH_DRAWING_MODE = "AUD_PathDrawing"; + private const string PREFS_SHOW_PROGRESS = "AUD_Progress"; private const string PREFS_SHOW_TOOLTIPS = "AUD_Tooltips"; private AssetUsageDetector core = new AssetUsageDetector(); @@ -34,15 +37,21 @@ namespace AssetUsageDetectorNamespace.Extras private bool searchInScenesInBuildTickedOnly = true; // Scenes in build (ticked only or not) private bool searchInAllScenes = true; // All scenes (including scenes that are not in build) private bool searchInAssetsFolder = true; // Assets in Project view + private bool dontSearchInSourceAssets = false; // objectsToSearch won't be searched for internal references private List searchInAssetsSubset = new List() { null }; // If not empty, only these assets are searched for references + private List excludedAssets = new List() { null }; // These assets won't be searched for references + private List excludedScenes = new List() { null }; // These scenes won't be searched for references private int searchDepthLimit = 4; // Depth limit for recursively searching variables of objects private bool restoreInitialSceneSetup = true; // Close the additively loaded scenes that were not part of the initial scene setup private string errorMessage = string.Empty; + + private bool searchNonSerializableVariables = true; private bool noAssetDatabaseChanges = false; + private bool showProgressBar = false; private BindingFlags fieldModifiers, propertyModifiers; @@ -50,6 +59,11 @@ namespace AssetUsageDetectorNamespace.Extras private double nextPlayModeRefreshTime = 0f; + private readonly ObjectToSearchListDrawer objectsToSearchDrawer = new ObjectToSearchListDrawer(); + private readonly ObjectListDrawer searchInAssetsSubsetDrawer = new ObjectListDrawer( "Search following asset(s) only:", false ); + private readonly ObjectListDrawer excludedAssetsDrawer = new ObjectListDrawer( "Don't search following asset(s):", false ); + private readonly ObjectListDrawer excludedScenesDrawer = new ObjectListDrawer( "Don't search in following scene(s):", false ); + private Vector2 scrollPosition = Vector2.zero; private static AssetUsageDetectorWindow visibleWindow = null; @@ -83,7 +97,7 @@ namespace AssetUsageDetectorNamespace.Extras // Quickly show the AssetUsageDetector window and initiate a search public static void ShowAndSearch( IEnumerable searchObjects ) { - ShowAndSearch( new AssetUsageDetector.Parameters() { objectsToSearch = searchObjects } ); + ShowAndSearchInternal( searchObjects, null ); } // Quickly show the AssetUsageDetector window and initiate a search @@ -95,44 +109,61 @@ namespace AssetUsageDetectorNamespace.Extras return; } - if( searchParameters.objectsToSearch.IsEmpty() ) + ShowAndSearchInternal( searchParameters.objectsToSearch, searchParameters ); + } + + private static void ShowAndSearchInternal( IEnumerable searchObjects, AssetUsageDetector.Parameters searchParameters ) + { + if( visibleWindow != null && !visibleWindow.ReturnToSetupPhase( true ) ) { - Debug.LogError( "searchParameters.objectsToSearch can't be empty!" ); + Debug.LogError( "Need to reset the previous search first!" ); return; } - if( !EditorApplication.isPlaying && !Utilities.AreScenesSaved() ) - { - if( visibleWindow == null || visibleWindow.currentPhase != Phase.Complete ) - { - Debug.LogError( "Save open scenes first!" ); - return; - } - - if( !visibleWindow.ReturnToSetupPhase( true ) ) - { - Debug.LogError( "Need to reset the previous search first!" ); - return; - } - } - Init(); - if( visibleWindow.objectsToSearch == null ) - visibleWindow.objectsToSearch = new List(); - else - visibleWindow.objectsToSearch.Clear(); + visibleWindow.objectsToSearch.Clear(); + if( searchObjects != null ) + { + foreach( Object obj in searchObjects ) + visibleWindow.objectsToSearch.Add( new ObjectToSearch( obj ) ); + } - foreach( Object obj in searchParameters.objectsToSearch ) - visibleWindow.objectsToSearch.Add( new ObjectToSearch( obj ) ); + if( searchParameters != null ) + { + visibleWindow.ParseSceneSearchMode( searchParameters.searchInScenes ); + visibleWindow.searchInAssetsFolder = searchParameters.searchInAssetsFolder; + visibleWindow.dontSearchInSourceAssets = searchParameters.dontSearchInSourceAssets; + visibleWindow.searchDepthLimit = searchParameters.searchDepthLimit; + visibleWindow.fieldModifiers = searchParameters.fieldModifiers; + visibleWindow.propertyModifiers = searchParameters.propertyModifiers; + visibleWindow.searchNonSerializableVariables = searchParameters.searchNonSerializableVariables; + visibleWindow.noAssetDatabaseChanges = searchParameters.noAssetDatabaseChanges; + visibleWindow.showProgressBar = searchParameters.showProgressBar; - // This enumerator includes sub-assets in the search - searchParameters.objectsToSearch = new ObjectToSearchEnumerator( visibleWindow.objectsToSearch ); + visibleWindow.searchInAssetsSubset.Clear(); + if( searchParameters.searchInAssetsSubset != null ) + { + foreach( Object obj in searchParameters.searchInAssetsSubset ) + visibleWindow.searchInAssetsSubset.Add( obj ); + } - visibleWindow.errorMessage = string.Empty; - visibleWindow.currentPhase = Phase.Processing; - visibleWindow.searchResult = visibleWindow.core.Run( searchParameters ); - visibleWindow.currentPhase = Phase.Complete; + visibleWindow.excludedAssets.Clear(); + if( searchParameters.excludedAssetsFromSearch != null ) + { + foreach( Object obj in searchParameters.excludedAssetsFromSearch ) + visibleWindow.excludedAssets.Add( obj ); + } + + visibleWindow.excludedScenes.Clear(); + if( searchParameters.excludedScenesFromSearch != null ) + { + foreach( Object obj in searchParameters.excludedScenesFromSearch ) + visibleWindow.excludedScenes.Add( obj ); + } + } + + visibleWindow.InitiateSearch(); } private void OnEnable() @@ -158,32 +189,24 @@ namespace AssetUsageDetectorNamespace.Extras private void SavePrefs() { - SceneSearchMode sceneSearchMode = SceneSearchMode.None; - if( searchInOpenScenes ) - sceneSearchMode |= SceneSearchMode.OpenScenes; - if( searchInScenesInBuild ) - sceneSearchMode |= searchInScenesInBuildTickedOnly ? SceneSearchMode.ScenesInBuildSettingsTickedOnly : SceneSearchMode.ScenesInBuildSettingsAll; - if( searchInAllScenes ) - sceneSearchMode |= SceneSearchMode.AllScenes; - - EditorPrefs.SetInt( PREFS_SEARCH_SCENES, (int) sceneSearchMode ); + EditorPrefs.SetInt( PREFS_SEARCH_SCENES, (int) GetSceneSearchMode( false ) ); EditorPrefs.SetBool( PREFS_SEARCH_ASSETS, searchInAssetsFolder ); + EditorPrefs.SetBool( PREFS_DONT_SEARCH_SOURCE_ASSETS, dontSearchInSourceAssets ); EditorPrefs.SetInt( PREFS_SEARCH_DEPTH_LIMIT, searchDepthLimit ); EditorPrefs.SetInt( PREFS_SEARCH_FIELDS, (int) fieldModifiers ); EditorPrefs.SetInt( PREFS_SEARCH_PROPERTIES, (int) propertyModifiers ); EditorPrefs.SetInt( PREFS_PATH_DRAWING_MODE, (int) searchResultDrawParameters.pathDrawingMode ); + EditorPrefs.SetBool( PREFS_SEARCH_NON_SERIALIZABLES, searchNonSerializableVariables ); EditorPrefs.SetBool( PREFS_SHOW_TOOLTIPS, searchResultDrawParameters.showTooltips ); + EditorPrefs.SetBool( PREFS_SHOW_PROGRESS, showProgressBar ); } private void LoadPrefs() { - SceneSearchMode sceneSearchMode = (SceneSearchMode) EditorPrefs.GetInt( PREFS_SEARCH_SCENES, (int) ( SceneSearchMode.OpenScenes | SceneSearchMode.ScenesInBuildSettingsTickedOnly | SceneSearchMode.AllScenes ) ); - searchInOpenScenes = ( sceneSearchMode & SceneSearchMode.OpenScenes ) == SceneSearchMode.OpenScenes; - searchInScenesInBuild = ( sceneSearchMode & SceneSearchMode.ScenesInBuildSettingsAll ) == SceneSearchMode.ScenesInBuildSettingsAll || ( sceneSearchMode & SceneSearchMode.ScenesInBuildSettingsTickedOnly ) == SceneSearchMode.ScenesInBuildSettingsTickedOnly; - searchInScenesInBuildTickedOnly = ( sceneSearchMode & SceneSearchMode.ScenesInBuildSettingsAll ) != SceneSearchMode.ScenesInBuildSettingsAll; - searchInAllScenes = ( sceneSearchMode & SceneSearchMode.AllScenes ) == SceneSearchMode.AllScenes; + ParseSceneSearchMode( (SceneSearchMode) EditorPrefs.GetInt( PREFS_SEARCH_SCENES, (int) ( SceneSearchMode.OpenScenes | SceneSearchMode.ScenesInBuildSettingsTickedOnly | SceneSearchMode.AllScenes ) ) ); searchInAssetsFolder = EditorPrefs.GetBool( PREFS_SEARCH_ASSETS, true ); + dontSearchInSourceAssets = EditorPrefs.GetBool( PREFS_DONT_SEARCH_SOURCE_ASSETS, false ); searchDepthLimit = EditorPrefs.GetInt( PREFS_SEARCH_DEPTH_LIMIT, 4 ); // Fetch public, protected and private non-static fields and properties from objects by default @@ -199,7 +222,33 @@ namespace AssetUsageDetectorNamespace.Extras searchResultDrawParameters.pathDrawingMode = PathDrawingMode.ShortRelevantParts; } + searchNonSerializableVariables = EditorPrefs.GetBool( PREFS_SEARCH_NON_SERIALIZABLES, true ); searchResultDrawParameters.showTooltips = EditorPrefs.GetBool( PREFS_SHOW_TOOLTIPS, false ); + showProgressBar = EditorPrefs.GetBool( PREFS_SHOW_PROGRESS, false ); + } + + private SceneSearchMode GetSceneSearchMode( bool hideOptionsInPlayMode ) + { + SceneSearchMode sceneSearchMode = SceneSearchMode.None; + if( searchInOpenScenes ) + sceneSearchMode |= SceneSearchMode.OpenScenes; + if( !hideOptionsInPlayMode || !EditorApplication.isPlaying ) + { + if( searchInScenesInBuild ) + sceneSearchMode |= searchInScenesInBuildTickedOnly ? SceneSearchMode.ScenesInBuildSettingsTickedOnly : SceneSearchMode.ScenesInBuildSettingsAll; + if( searchInAllScenes ) + sceneSearchMode |= SceneSearchMode.AllScenes; + } + + return sceneSearchMode; + } + + private void ParseSceneSearchMode( SceneSearchMode sceneSearchMode ) + { + searchInOpenScenes = ( sceneSearchMode & SceneSearchMode.OpenScenes ) == SceneSearchMode.OpenScenes; + searchInScenesInBuild = ( sceneSearchMode & SceneSearchMode.ScenesInBuildSettingsAll ) == SceneSearchMode.ScenesInBuildSettingsAll || ( sceneSearchMode & SceneSearchMode.ScenesInBuildSettingsTickedOnly ) == SceneSearchMode.ScenesInBuildSettingsTickedOnly; + searchInScenesInBuildTickedOnly = ( sceneSearchMode & SceneSearchMode.ScenesInBuildSettingsAll ) != SceneSearchMode.ScenesInBuildSettingsAll; + searchInAllScenes = ( sceneSearchMode & SceneSearchMode.AllScenes ) == SceneSearchMode.AllScenes; } private void Update() @@ -239,7 +288,7 @@ namespace AssetUsageDetectorNamespace.Extras } else if( currentPhase == Phase.Setup ) { - if( ExposeSearchedObjects() ) + if( objectsToSearchDrawer.Draw( objectsToSearch ) ) errorMessage = string.Empty; GUILayout.Space( 10 ); @@ -254,7 +303,10 @@ namespace AssetUsageDetectorNamespace.Extras GUILayout.Space( 35 ); GUILayout.BeginVertical(); - ExposeAssetsToSearch(); + searchInAssetsSubsetDrawer.Draw( searchInAssetsSubset ); + excludedAssetsDrawer.Draw( excludedAssets ); + + dontSearchInSourceAssets = EditorGUILayout.ToggleLeft( "Don't search 'Asset(s)' themselves for references", dontSearchInSourceAssets ); GUILayout.EndVertical(); GUILayout.EndHorizontal(); @@ -262,38 +314,39 @@ namespace AssetUsageDetectorNamespace.Extras GUILayout.Space( 10 ); - if( EditorApplication.isPlaying ) - { - searchInAllScenes = false; - searchInScenesInBuild = false; - } - else if( searchInAllScenes ) + if( searchInAllScenes && !EditorApplication.isPlaying ) GUI.enabled = false; searchInOpenScenes = EditorGUILayout.ToggleLeft( "Currently open (loaded) scene(s)", searchInOpenScenes ); - if( EditorApplication.isPlaying ) - GUI.enabled = false; - - searchInScenesInBuild = EditorGUILayout.ToggleLeft( "Scenes in Build Settings", searchInScenesInBuild ); - - if( searchInScenesInBuild ) - { - GUILayout.BeginHorizontal(); - GUILayout.Space( 35 ); - - searchInScenesInBuildTickedOnly = EditorGUILayout.ToggleLeft( "Ticked only", searchInScenesInBuildTickedOnly, Utilities.GL_WIDTH_100 ); - searchInScenesInBuildTickedOnly = !EditorGUILayout.ToggleLeft( "All", !searchInScenesInBuildTickedOnly, Utilities.GL_WIDTH_100 ); - - GUILayout.EndHorizontal(); - } - if( !EditorApplication.isPlaying ) + { + searchInScenesInBuild = EditorGUILayout.ToggleLeft( "Scenes in Build Settings", true ); + + if( searchInScenesInBuild ) + { + GUILayout.BeginHorizontal(); + GUILayout.Space( 35 ); + + searchInScenesInBuildTickedOnly = EditorGUILayout.ToggleLeft( "Ticked only", searchInScenesInBuildTickedOnly, Utilities.GL_WIDTH_100 ); + searchInScenesInBuildTickedOnly = !EditorGUILayout.ToggleLeft( "All", !searchInScenesInBuildTickedOnly, Utilities.GL_WIDTH_100 ); + + GUILayout.EndHorizontal(); + } + GUI.enabled = true; - searchInAllScenes = EditorGUILayout.ToggleLeft( "All scenes in the project", searchInAllScenes ); + searchInAllScenes = EditorGUILayout.ToggleLeft( "All scenes in the project", searchInAllScenes ); + } - GUI.enabled = true; + GUILayout.BeginHorizontal(); + GUILayout.Space( 35 ); + GUILayout.BeginVertical(); + + excludedScenesDrawer.Draw( excludedScenes ); + + GUILayout.EndVertical(); + GUILayout.EndHorizontal(); GUILayout.Space( 10 ); @@ -325,7 +378,7 @@ namespace AssetUsageDetectorNamespace.Extras GUILayout.EndHorizontal(); - GUILayout.Label( "> Search properties (can be slow):" ); + GUILayout.Label( "> Search properties:" ); GUILayout.BeginHorizontal(); @@ -345,66 +398,23 @@ namespace AssetUsageDetectorNamespace.Extras GUILayout.Space( 10 ); + searchNonSerializableVariables = EditorGUILayout.ToggleLeft( "Include non-serializable fields and properties in search (slower search)", searchNonSerializableVariables ); + noAssetDatabaseChanges = EditorGUILayout.ToggleLeft( "I haven't modified any assets/scenes since the last search (faster search)", noAssetDatabaseChanges ); + showProgressBar = EditorGUILayout.ToggleLeft( "Show progress bar (slower search)", showProgressBar ); + // Don't let the user press the GO button without any valid search location if( !searchInAllScenes && !searchInOpenScenes && !searchInScenesInBuild && !searchInAssetsFolder ) GUI.enabled = false; - noAssetDatabaseChanges = EditorGUILayout.ToggleLeft( "I haven't modified any assets/scenes since the last search (faster search)", noAssetDatabaseChanges ); - if( GUILayout.Button( "GO!", Utilities.GL_HEIGHT_30 ) ) - { - if( objectsToSearch.IsEmpty() ) - errorMessage = "ADD AN ASSET TO THE LIST FIRST!"; - else if( !EditorApplication.isPlaying && !Utilities.AreScenesSaved() ) - { - // Don't start the search if at least one scene is currently dirty (not saved) - errorMessage = "SAVE OPEN SCENES FIRST!"; - } - else - { - errorMessage = string.Empty; - currentPhase = Phase.Processing; - - SceneSearchMode sceneSearchMode = SceneSearchMode.None; - if( searchInAllScenes ) - sceneSearchMode = SceneSearchMode.AllScenes; - else - { - if( searchInOpenScenes ) - sceneSearchMode = SceneSearchMode.OpenScenes; - - if( searchInScenesInBuild ) - { - if( searchInScenesInBuildTickedOnly ) - sceneSearchMode |= SceneSearchMode.ScenesInBuildSettingsTickedOnly; - else - sceneSearchMode |= SceneSearchMode.ScenesInBuildSettingsAll; - } - } - - // Start searching - searchResult = core.Run( new AssetUsageDetector.Parameters() - { - objectsToSearch = !objectsToSearch.IsEmpty() ? new ObjectToSearchEnumerator( objectsToSearch ) : null, - searchInScenes = sceneSearchMode, - searchInAssetsFolder = searchInAssetsFolder, - searchInAssetsSubset = !searchInAssetsSubset.IsEmpty() ? searchInAssetsSubset : null, - fieldModifiers = fieldModifiers, - propertyModifiers = propertyModifiers, - searchDepthLimit = searchDepthLimit, - noAssetDatabaseChanges = noAssetDatabaseChanges - } ); - - currentPhase = Phase.Complete; - } - } + InitiateSearch(); } else if( currentPhase == Phase.Complete ) { // Draw the results of the search GUI.enabled = false; - ExposeSearchedObjects(); + objectsToSearchDrawer.Draw( objectsToSearch ); GUILayout.Space( 10 ); GUI.enabled = true; @@ -499,191 +509,41 @@ namespace AssetUsageDetectorNamespace.Extras EditorGUILayout.EndScrollView(); } - // Exposes objectsToSearch as an array field on GUI - private bool ExposeSearchedObjects() + private void InitiateSearch() { - bool hasChanged = false; - bool guiEnabled = GUI.enabled; - - Event ev = Event.current; - - GUILayout.BeginHorizontal(); - - GUILayout.Label( "Asset(s):" ); - - if( guiEnabled ) + if( objectsToSearch.IsEmpty() ) + errorMessage = "ADD AN ASSET TO THE LIST FIRST!"; + else if( !EditorApplication.isPlaying && !Utilities.AreScenesSaved() ) { - // Handle drag & drop references to array - // Credit: https://answers.unity.com/answers/657877/view.html - if( ( ev.type == EventType.DragPerform || ev.type == EventType.DragUpdated ) && - GUILayoutUtility.GetLastRect().Contains( ev.mousePosition ) ) - { - DragAndDrop.visualMode = DragAndDropVisualMode.Copy; - if( ev.type == EventType.DragPerform ) - { - DragAndDrop.AcceptDrag(); - - Object[] draggedObjects = DragAndDrop.objectReferences; - if( draggedObjects.Length > 0 ) - { - for( int i = 0; i < draggedObjects.Length; i++ ) - { - if( draggedObjects[i] != null && !draggedObjects[i].Equals( null ) ) - { - hasChanged = true; - objectsToSearch.Add( new ObjectToSearch( draggedObjects[i] ) ); - } - } - } - } - - ev.Use(); - } - - if( GUILayout.Button( "+", Utilities.GL_WIDTH_25 ) ) - objectsToSearch.Insert( 0, new ObjectToSearch( null ) ); + // Don't start the search if at least one scene is currently dirty (not saved) + errorMessage = "SAVE OPEN SCENES FIRST!"; } - - GUILayout.EndHorizontal(); - - for( int i = 0; i < objectsToSearch.Count; i++ ) + else { - ObjectToSearch objToSearch = objectsToSearch[i]; + errorMessage = string.Empty; + currentPhase = Phase.Processing; - GUI.changed = false; - GUILayout.BeginHorizontal(); + SavePrefs(); - Object prevAssetToSearch = objToSearch.obj; - objToSearch.obj = EditorGUILayout.ObjectField( "", objToSearch.obj, typeof( Object ), true ); - - if( GUI.changed && prevAssetToSearch != objToSearch.obj ) + // Start searching + searchResult = core.Run( new AssetUsageDetector.Parameters() { - hasChanged = true; - objToSearch.RefreshSubAssets(); - } + objectsToSearch = !objectsToSearch.IsEmpty() ? new ObjectToSearchEnumerator( objectsToSearch ) : null, + searchInScenes = GetSceneSearchMode( true ), + searchInAssetsFolder = searchInAssetsFolder, + searchInAssetsSubset = !searchInAssetsSubset.IsEmpty() ? searchInAssetsSubset : null, + excludedAssetsFromSearch = !excludedAssets.IsEmpty() ? excludedAssets : null, + dontSearchInSourceAssets = dontSearchInSourceAssets, + excludedScenesFromSearch = !excludedScenes.IsEmpty() ? excludedScenes : null, + fieldModifiers = fieldModifiers, + propertyModifiers = propertyModifiers, + searchDepthLimit = searchDepthLimit, + searchNonSerializableVariables = searchNonSerializableVariables, + noAssetDatabaseChanges = noAssetDatabaseChanges, + showProgressBar = showProgressBar + } ); - if( guiEnabled ) - { - if( GUILayout.Button( "+", Utilities.GL_WIDTH_25 ) ) - objectsToSearch.Insert( i + 1, new ObjectToSearch( null ) ); - - if( GUILayout.Button( "-", Utilities.GL_WIDTH_25 ) ) - { - if( objToSearch != null && !objToSearch.Equals( null ) ) - hasChanged = true; - - objectsToSearch.RemoveAt( i-- ); - } - } - - GUILayout.EndHorizontal(); - - List subAssetsToSearch = objToSearch.subAssets; - if( subAssetsToSearch.Count > 0 ) - { - GUILayout.BeginHorizontal(); - - // 0-> all toggles off, 1-> mixed, 2-> all toggles on - bool toggleAllSubAssets = subAssetsToSearch[0].shouldSearch; - bool mixedToggle = false; - for( int j = 1; j < subAssetsToSearch.Count; j++ ) - { - if( subAssetsToSearch[j].shouldSearch != toggleAllSubAssets ) - { - mixedToggle = true; - break; - } - } - - if( mixedToggle ) - EditorGUI.showMixedValue = true; - - GUI.changed = false; - toggleAllSubAssets = EditorGUILayout.Toggle( toggleAllSubAssets, Utilities.GL_WIDTH_25 ); - if( GUI.changed ) - { - for( int j = 0; j < subAssetsToSearch.Count; j++ ) - subAssetsToSearch[j].shouldSearch = toggleAllSubAssets; - } - - EditorGUI.showMixedValue = false; - - objToSearch.showSubAssetsFoldout = EditorGUILayout.Foldout( objToSearch.showSubAssetsFoldout, "Include sub-assets in search:", true ); - - GUILayout.EndHorizontal(); - - if( objToSearch.showSubAssetsFoldout ) - { - for( int j = 0; j < subAssetsToSearch.Count; j++ ) - { - GUILayout.BeginHorizontal(); - - subAssetsToSearch[j].shouldSearch = EditorGUILayout.Toggle( subAssetsToSearch[j].shouldSearch, Utilities.GL_WIDTH_25 ); - - GUI.enabled = false; - EditorGUILayout.ObjectField( string.Empty, subAssetsToSearch[j].subAsset, typeof( Object ), true ); - GUI.enabled = guiEnabled; - - GUILayout.EndHorizontal(); - } - } - } - } - - return hasChanged; - } - - // Exposes searchInAssetsSubset as an array field on GUI - private void ExposeAssetsToSearch() - { - Event ev = Event.current; - - GUILayout.BeginHorizontal(); - - GUILayout.Label( "Search in following asset(s) only:" ); - - // Handle drag & drop references to array - // Credit: https://answers.unity.com/answers/657877/view.html - if( ( ev.type == EventType.DragPerform || ev.type == EventType.DragUpdated ) && - GUILayoutUtility.GetLastRect().Contains( ev.mousePosition ) ) - { - DragAndDrop.visualMode = DragAndDropVisualMode.Copy; - if( ev.type == EventType.DragPerform ) - { - DragAndDrop.AcceptDrag(); - - Object[] draggedObjects = DragAndDrop.objectReferences; - if( draggedObjects.Length > 0 ) - { - for( int i = 0; i < draggedObjects.Length; i++ ) - { - if( draggedObjects[i] != null && !draggedObjects[i].Equals( null ) ) - searchInAssetsSubset.Add( draggedObjects[i] ); - } - } - } - - ev.Use(); - } - - if( GUILayout.Button( "+", Utilities.GL_WIDTH_25 ) ) - searchInAssetsSubset.Insert( 0, null ); - - GUILayout.EndHorizontal(); - - for( int i = 0; i < searchInAssetsSubset.Count; i++ ) - { - GUILayout.BeginHorizontal(); - - searchInAssetsSubset[i] = EditorGUILayout.ObjectField( "", searchInAssetsSubset[i], typeof( Object ), false ); - - if( GUILayout.Button( "+", Utilities.GL_WIDTH_25 ) ) - searchInAssetsSubset.Insert( i + 1, null ); - - if( GUILayout.Button( "-", Utilities.GL_WIDTH_25 ) ) - searchInAssetsSubset.RemoveAt( i-- ); - - GUILayout.EndHorizontal(); + currentPhase = Phase.Complete; } } diff --git a/Plugins/AssetUsageDetector/Editor/ListDrawer.cs b/Plugins/AssetUsageDetector/Editor/ListDrawer.cs new file mode 100644 index 0000000..bef55df --- /dev/null +++ b/Plugins/AssetUsageDetector/Editor/ListDrawer.cs @@ -0,0 +1,216 @@ +using System.Collections.Generic; +using UnityEditor; +using UnityEngine; + +namespace AssetUsageDetectorNamespace.Extras +{ + public abstract class ListDrawer + { + private readonly string label; + private readonly bool acceptSceneObjects; + + protected ListDrawer( string label, bool acceptSceneObjects ) + { + this.label = label; + this.acceptSceneObjects = acceptSceneObjects; + } + + // Exposes a list on GUI + public bool Draw( List list ) + { + bool hasChanged = false; + bool guiEnabled = GUI.enabled; + + Event ev = Event.current; + + GUILayout.BeginHorizontal(); + + GUILayout.Label( label ); + + if( guiEnabled ) + { + // Handle drag & drop references to array + // Credit: https://answers.unity.com/answers/657877/view.html + if( ( ev.type == EventType.DragPerform || ev.type == EventType.DragUpdated ) && + GUILayoutUtility.GetLastRect().Contains( ev.mousePosition ) ) + { + DragAndDrop.visualMode = DragAndDropVisualMode.Copy; + if( ev.type == EventType.DragPerform ) + { + DragAndDrop.AcceptDrag(); + + Object[] draggedObjects = DragAndDrop.objectReferences; + if( draggedObjects.Length > 0 ) + { + for( int i = 0; i < draggedObjects.Length; i++ ) + { + if( draggedObjects[i] != null && !draggedObjects[i].Equals( null ) ) + { + hasChanged = true; + list.Add( CreateElement( draggedObjects[i] ) ); + } + } + } + } + + ev.Use(); + } + + if( GUILayout.Button( "+", Utilities.GL_WIDTH_25 ) ) + list.Insert( 0, CreateElement( null ) ); + } + + GUILayout.EndHorizontal(); + + for( int i = 0; i < list.Count; i++ ) + { + T element = list[i]; + + GUI.changed = false; + GUILayout.BeginHorizontal(); + + Object prevObject = GetObjectFromElement( element ); + Object newObject = EditorGUILayout.ObjectField( "", prevObject, typeof( Object ), acceptSceneObjects ); + + if( GUI.changed && prevObject != newObject ) + { + hasChanged = true; + SetObjectOfElement( list, i, newObject ); + } + + if( guiEnabled ) + { + if( GUILayout.Button( "+", Utilities.GL_WIDTH_25 ) ) + list.Insert( i + 1, CreateElement( null ) ); + + if( GUILayout.Button( "-", Utilities.GL_WIDTH_25 ) ) + { + if( element != null && !element.Equals( null ) ) + hasChanged = true; + + // Lists with no elements look ugly, always keep a dummy null variable + if( list.Count > 1 ) + list.RemoveAt( i-- ); + else + list[0] = CreateElement( null ); + } + } + + GUILayout.EndHorizontal(); + + PostElementDrawer( element ); + } + + return hasChanged; + } + + protected abstract T CreateElement( Object source ); + protected abstract Object GetObjectFromElement( T element ); + protected abstract void SetObjectOfElement( List list, int index, Object value ); + protected abstract void PostElementDrawer( T element ); + } + + public class ObjectListDrawer : ListDrawer + { + public ObjectListDrawer( string label, bool acceptSceneObjects ) : base( label, acceptSceneObjects ) + { + } + + protected override Object CreateElement( Object source ) + { + return source; + } + + protected override Object GetObjectFromElement( Object element ) + { + return element; + } + + protected override void SetObjectOfElement( List list, int index, Object value ) + { + list[index] = value; + } + + protected override void PostElementDrawer( Object element ) + { + } + } + + public class ObjectToSearchListDrawer : ListDrawer + { + public ObjectToSearchListDrawer() : base( "Asset(s):", true ) + { + } + + protected override ObjectToSearch CreateElement( Object source ) + { + return new ObjectToSearch( source ); + } + + protected override Object GetObjectFromElement( ObjectToSearch element ) + { + return element.obj; + } + + protected override void SetObjectOfElement( List list, int index, Object value ) + { + list[index].obj = value; + list[index].RefreshSubAssets(); + } + + protected override void PostElementDrawer( ObjectToSearch element ) + { + List subAssetsToSearch = element.subAssets; + if( subAssetsToSearch.Count > 0 ) + { + GUILayout.BeginHorizontal(); + + // 0-> all toggles off, 1-> mixed, 2-> all toggles on + bool toggleAllSubAssets = subAssetsToSearch[0].shouldSearch; + bool mixedToggle = false; + for( int j = 1; j < subAssetsToSearch.Count; j++ ) + { + if( subAssetsToSearch[j].shouldSearch != toggleAllSubAssets ) + { + mixedToggle = true; + break; + } + } + + if( mixedToggle ) + EditorGUI.showMixedValue = true; + + GUI.changed = false; + toggleAllSubAssets = EditorGUILayout.Toggle( toggleAllSubAssets, Utilities.GL_WIDTH_25 ); + if( GUI.changed ) + { + for( int j = 0; j < subAssetsToSearch.Count; j++ ) + subAssetsToSearch[j].shouldSearch = toggleAllSubAssets; + } + + EditorGUI.showMixedValue = false; + + element.showSubAssetsFoldout = EditorGUILayout.Foldout( element.showSubAssetsFoldout, "Include sub-assets in search:", true ); + + GUILayout.EndHorizontal(); + + if( element.showSubAssetsFoldout ) + { + for( int j = 0; j < subAssetsToSearch.Count; j++ ) + { + GUILayout.BeginHorizontal(); + + subAssetsToSearch[j].shouldSearch = EditorGUILayout.Toggle( subAssetsToSearch[j].shouldSearch, Utilities.GL_WIDTH_25 ); + + bool guiEnabled = GUI.enabled; + GUI.enabled = false; + EditorGUILayout.ObjectField( string.Empty, subAssetsToSearch[j].subAsset, typeof( Object ), true ); + GUI.enabled = guiEnabled; + + GUILayout.EndHorizontal(); + } + } + } + } + } +} \ No newline at end of file diff --git a/Plugins/AssetUsageDetector/Editor/ListDrawer.cs.meta b/Plugins/AssetUsageDetector/Editor/ListDrawer.cs.meta new file mode 100644 index 0000000..323b217 --- /dev/null +++ b/Plugins/AssetUsageDetector/Editor/ListDrawer.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 88a4a4e861026b2498a437ce1e12b054 +timeCreated: 1568758673 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Plugins/AssetUsageDetector/Editor/SearchResult.cs b/Plugins/AssetUsageDetector/Editor/SearchResult.cs index 65d96c4..d181544 100644 --- a/Plugins/AssetUsageDetector/Editor/SearchResult.cs +++ b/Plugins/AssetUsageDetector/Editor/SearchResult.cs @@ -58,7 +58,7 @@ namespace AssetUsageDetectorNamespace public SearchResultGroup this[int index] { get { return result[index]; } } public bool SearchCompletedSuccessfully { get { return success; } } - public bool InitialSceneSetupConfigured { get { return initialSceneSetup != null; } } + public bool InitialSceneSetupConfigured { get { return initialSceneSetup != null && initialSceneSetup.Length > 0; } } public SearchResult( bool success, List result, SceneSetup[] initialSceneSetup ) { @@ -158,7 +158,7 @@ namespace AssetUsageDetectorNamespace // Returns true if initial scene setup is restored successfully public bool RestoreInitialSceneSetup() { - if( initialSceneSetup == null ) + if( initialSceneSetup == null || initialSceneSetup.Length == 0 ) return true; if( EditorApplication.isPlaying || !EditorSceneManager.SaveCurrentModifiedScenesIfUserWantsTo() ) @@ -284,36 +284,58 @@ namespace AssetUsageDetectorNamespace } // Initializes commonly used variables of the nodes - public void InitializeNodes() + public void InitializeNodes( Func nodeGetter ) { + // Remove root nodes that don't have any outgoing links or have null node objects (somehow) for( int i = references.Count - 1; i >= 0; i-- ) { - ReferenceNode node = references[i]; - if( node.NumberOfOutgoingLinks == 0 ) - references.RemoveAt( i ); + if( references[i].NumberOfOutgoingLinks == 0 ) + references.RemoveAtFast( i ); else { - // For simplicity's sake, get rid of root nodes that are - // already part of another node's hierarchy - bool isRootNodeChildOfOtherNode = false; - for( int j = references.Count - 1; j >= 0; j-- ) - { - if( i == j ) - continue; - - if( references[j].NodeExistsInChildrenRecursive( node ) ) - { - isRootNodeChildOfOtherNode = true; - break; - } - } - - if( isRootNodeChildOfOtherNode ) - references.RemoveAt( i ); - else - node.InitializeRecursively(); + object nodeObject = references[i].nodeObject; + if( nodeObject == null || nodeObject.Equals( null ) ) + references.RemoveAtFast( i ); } } + + // For simplicity's sake, get rid of root nodes that are already part of another node's hierarchy + for( int i = references.Count - 1; i >= 0; i-- ) + { + if( IsRootNodePartOfAnotherRootNode( i ) ) + references.RemoveAtFast( i ); + } + + // For clarity, a reference path shouldn't start with a sub-asset but instead with its corresponding main asset + for( int i = references.Count - 1; i >= 0; i-- ) + { + object nodeObject = references[i].nodeObject; + if( nodeObject.IsAsset() && !AssetDatabase.IsMainAsset( (Object) nodeObject ) ) + { + string assetPath = AssetDatabase.GetAssetPath( (Object) nodeObject ); + if( string.IsNullOrEmpty( assetPath ) ) + continue; + + Object mainAsset = AssetDatabase.LoadMainAssetAtPath( assetPath ); + if( mainAsset == null || mainAsset.Equals( null ) ) + continue; + + if( nodeObject is Component && ( (Component) nodeObject ).gameObject == mainAsset ) + continue; + + // Get a ReferenceNode for the main asset, add a link to the sub-asset's node and change the root node + ReferenceNode newRootNode = nodeGetter( mainAsset ); + newRootNode.AddLinkTo( references[i], ( nodeObject is Component || nodeObject is GameObject ) ? "Child object" : "Sub-asset" ); + references[i] = newRootNode; + + // Make sure that the new root node isn't already a part of another node's hierarchy + if( IsRootNodePartOfAnotherRootNode( i ) ) + references.RemoveAtFast( i ); + } + } + + for( int i = references.Count - 1; i >= 0; i-- ) + references[i].InitializeRecursively(); } // Check if node exists in this results set @@ -328,6 +350,21 @@ namespace AssetUsageDetectorNamespace return false; } + private bool IsRootNodePartOfAnotherRootNode( int index ) + { + ReferenceNode node = references[index]; + for( int i = references.Count - 1; i >= 0; i-- ) + { + if( index == i ) + continue; + + if( references[i].nodeObject == node.nodeObject || references[i].NodeExistsInChildrenRecursive( node ) ) + return true; + } + + return false; + } + // Add all the Object's in this container to the set public void AddObjectsTo( HashSet objectsSet ) { @@ -533,7 +570,7 @@ namespace AssetUsageDetectorNamespace // Add a one-way connection to another node public void AddLinkTo( ReferenceNode nextNode, string description = null ) { - if( nextNode != null ) + if( nextNode != null && nextNode != this ) { if( !string.IsNullOrEmpty( description ) ) description = "[" + description + "]"; diff --git a/Plugins/AssetUsageDetector/Editor/Utilities.cs b/Plugins/AssetUsageDetector/Editor/Utilities.cs index 8c13dd3..8e9d79b 100644 --- a/Plugins/AssetUsageDetector/Editor/Utilities.cs +++ b/Plugins/AssetUsageDetector/Editor/Utilities.cs @@ -418,5 +418,35 @@ namespace AssetUsageDetectorNamespace.Extras return true; } + + public static bool ContainsFast( this List list, T element ) + { + if( !( element is ValueType ) ) + { + for( int i = list.Count - 1; i >= 0; i-- ) + { + if( ReferenceEquals( list[i], element ) ) + return true; + } + } + else + { + for( int i = list.Count - 1; i >= 0; i-- ) + { + if( element.Equals( list[i] ) ) + return true; + } + } + + return false; + } + + public static void RemoveAtFast( this List list, int index ) + { + int lastElementIndex = list.Count - 1; + + list[index] = list[lastElementIndex]; + list.RemoveAt( lastElementIndex ); + } } } \ No newline at end of file diff --git a/README.md b/README.md index 8c843de..36189c9 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ This editor extension helps you figure out at which places an asset or GameObjec ### B. HOW TO USE -- Import **AssetUsageDetector.unitypackage** to your project +- Import [AssetUsageDetector.unitypackage](https://github.com/yasirkula/UnityAssetUsageDetector/releases) to your project - Open **Window - Asset Usage Detector** window, configure the settings and hit **GO!** - or, use the **Assets - Search For References** shortcut to find the selected object(s)' references