From 9fddcab6fafcc8b4795b42777c27bbe7df08fe81 Mon Sep 17 00:00:00 2001 From: yasirkula Date: Sun, 4 Aug 2024 13:24:44 +0300 Subject: [PATCH] Added 'Hide unused sub-assets in "Unused Objects" list if their parent assets are used' option to Settings (closed #39) --- .../Editor/AssetUsageDetector.cs | 21 +++++++++------ .../Editor/AssetUsageDetectorSettings.cs | 27 ++++++++++++------- .../Editor/AssetUsageDetectorWindow.cs | 4 +-- .../AssetUsageDetector/Editor/SearchResult.cs | 3 +++ Plugins/AssetUsageDetector/README.txt | 2 +- package.json | 2 +- 6 files changed, 38 insertions(+), 21 deletions(-) diff --git a/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs b/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs index 2a78a3d..b1a0a22 100644 --- a/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs +++ b/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs @@ -711,6 +711,19 @@ namespace AssetUsageDetectorNamespace continue; string assetPath = AssetDatabase.GetAssetPath( obj ); + + // Omit unused sub-assets whose parent assets are used (configurable via Settings) + if( AssetUsageDetectorSettings.MarkUsedAssetsSubAssetsAsUsed && AssetDatabase.IsSubAsset( obj ) && usedObjectsSet.Contains( AssetDatabase.LoadMainAssetAtPath( assetPath ) ) ) + continue; + + // Omit meshes of an imported model asset + if( obj is Mesh && !string.IsNullOrEmpty( assetPath ) && AssetDatabase.GetMainAssetTypeAtPath( assetPath ) == typeof( GameObject ) && objectsToSearchSet.Contains( AssetDatabase.LoadMainAssetAtPath( assetPath ) ) ) + continue; + + // Omit MonoScripts whose types can't be determined + if( obj is MonoScript && ( (MonoScript) obj ).GetClass() == null ) + continue; + GameObject searchedTopmostGameObject = null; if( obj is GameObject ) { @@ -738,14 +751,6 @@ namespace AssetUsageDetectorNamespace continue; } - // Omit meshes of an imported model asset - if( obj is Mesh && !string.IsNullOrEmpty( assetPath ) && AssetDatabase.GetMainAssetTypeAtPath( assetPath ) == typeof( GameObject ) && objectsToSearchSet.Contains( AssetDatabase.LoadMainAssetAtPath( assetPath ) ) ) - continue; - - // Omit MonoScripts whose types can't be determined - if( obj is MonoScript && ( (MonoScript) obj ).GetClass() == null ) - continue; - // Use new ReferenceNodes in UnusedObjects search result group because we don't want these nodes to be linked to the actual ReferenceNodes in any way // (i.e. we don't use actual ReferenceNodes of these objects (GetReferenceNode) because these may have links to other nodes in unknown circumstances) ReferenceNode node = PopReferenceNode( obj ); diff --git a/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSettings.cs b/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSettings.cs index db87413..6dc943a 100644 --- a/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSettings.cs +++ b/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSettings.cs @@ -124,6 +124,13 @@ namespace AssetUsageDetectorNamespace set { if( m_selectDoubleClickedObjects == value ) return; m_selectDoubleClickedObjects = value; EditorPrefs.SetBool( "AUD_SelectDoubleClickedObj", value ); } } + private static bool? m_markUsedAssetsSubAssetsAsUsed = null; + public static bool MarkUsedAssetsSubAssetsAsUsed + { + get { if( m_markUsedAssetsSubAssetsAsUsed == null ) m_markUsedAssetsSubAssetsAsUsed = EditorPrefs.GetBool( "AUD_MarkUsedAssetsSubAssetsAsUsed", true ); return m_markUsedAssetsSubAssetsAsUsed.Value; } + set { if( m_markUsedAssetsSubAssetsAsUsed == value ) return; m_markUsedAssetsSubAssetsAsUsed = value; EditorPrefs.SetBool( "AUD_MarkUsedAssetsSubAssetsAsUsed", value ); } + } + private static bool? m_showUnityTooltip = null; public static bool ShowUnityTooltip { @@ -186,20 +193,22 @@ namespace AssetUsageDetectorNamespace EditorGUI.BeginChangeCheck(); - EditorGUIUtility.labelWidth += 140f; - ShowRootAssetName = EditorGUILayout.Toggle( "Show Root Asset's Name For Sub-Assets (Requires Refresh)", ShowRootAssetName ); - EditorGUIUtility.labelWidth -= 140f; + ShowRootAssetName = AssetUsageDetectorWindow.WordWrappingToggleLeft( "Show Root Asset's Name For Sub-Assets (Requires Refresh)", ShowRootAssetName ); EditorGUILayout.Space(); - PingClickedObjects = EditorGUILayout.Toggle( "Ping Clicked Objects", PingClickedObjects ); - SelectClickedObjects = EditorGUILayout.Toggle( "Select Clicked Objects", SelectClickedObjects ); - SelectDoubleClickedObjects = EditorGUILayout.Toggle( "Select Double Clicked Objects", SelectDoubleClickedObjects ); + PingClickedObjects = AssetUsageDetectorWindow.WordWrappingToggleLeft( "Ping Clicked Objects", PingClickedObjects ); + SelectClickedObjects = AssetUsageDetectorWindow.WordWrappingToggleLeft( "Select Clicked Objects", SelectClickedObjects ); + SelectDoubleClickedObjects = AssetUsageDetectorWindow.WordWrappingToggleLeft( "Select Double Clicked Objects", SelectDoubleClickedObjects ); EditorGUILayout.Space(); - ShowUnityTooltip = EditorGUILayout.Toggle( "Show Unity Tooltip", ShowUnityTooltip ); - ShowCustomTooltip = EditorGUILayout.Toggle( "Show Custom Tooltip", ShowCustomTooltip ); + MarkUsedAssetsSubAssetsAsUsed = AssetUsageDetectorWindow.WordWrappingToggleLeft( "Hide unused sub-assets in \"Unused Objects\" list if their parent assets are used (Requires Refresh)", MarkUsedAssetsSubAssetsAsUsed ); + + EditorGUILayout.Space(); + + ShowUnityTooltip = AssetUsageDetectorWindow.WordWrappingToggleLeft( "Show Unity Tooltip", ShowUnityTooltip ); + ShowCustomTooltip = AssetUsageDetectorWindow.WordWrappingToggleLeft( "Show Custom Tooltip", ShowCustomTooltip ); EditorGUI.indentLevel++; CustomTooltipDelay = FloatField( "Delay", CustomTooltipDelay, 0.7f ); EditorGUI.indentLevel--; @@ -223,7 +232,7 @@ namespace AssetUsageDetectorNamespace SelectedRowOccurrencesColor = ColorField( "Selected Row All Occurrences Tint", SelectedRowOccurrencesColor, EditorGUIUtility.isProSkin ? new Color( 0f, 0.3f, 0.75f, 1f ) : new Color( 0.25f, 0.75f, 1f, 1f ) ); SearchMatchingTextColor = ColorField( "Matching Search Text Color", SearchMatchingTextColor, Color.red ); - ShowTreeLines = EditorGUILayout.Toggle( "Show Tree Lines", ShowTreeLines ); + ShowTreeLines = AssetUsageDetectorWindow.WordWrappingToggleLeft( "Show Tree Lines", ShowTreeLines ); EditorGUI.indentLevel++; TreeLinesColor = ColorField( "Normal Color", TreeLinesColor, EditorGUIUtility.isProSkin ? new Color( 0.65f, 0.65f, 0.65f, 1f ) : new Color( 0.375f, 0.375f, 0.375f, 1f ) ); HighlightedTreeLinesColor = ColorField( "Highlighted Color", HighlightedTreeLinesColor, Color.cyan ); diff --git a/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs b/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs index 95180ec..eaf276c 100644 --- a/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs +++ b/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs @@ -41,7 +41,7 @@ namespace AssetUsageDetectorNamespace private static readonly GUIContent windowTitle = new GUIContent( "Asset Usage Detector" ); private static readonly Vector2 windowMinSize = new Vector2( 325f, 220f ); - private readonly GUILayoutOption GL_WIDTH_12 = GUILayout.Width( 12f ); + private static readonly GUILayoutOption GL_WIDTH_12 = GUILayout.Width( 12f ); private GUIStyle lockButtonStyle; @@ -674,7 +674,7 @@ namespace AssetUsageDetectorNamespace objectsToSearchDrawer.Draw( objectsToSearch ); } - private bool WordWrappingToggleLeft( string label, bool value ) + public static bool WordWrappingToggleLeft( string label, bool value ) { GUILayout.BeginHorizontal(); bool result = EditorGUILayout.ToggleLeft( GUIContent.none, value, GL_WIDTH_12 ); diff --git a/Plugins/AssetUsageDetector/Editor/SearchResult.cs b/Plugins/AssetUsageDetector/Editor/SearchResult.cs index 5263228..e9b6641 100644 --- a/Plugins/AssetUsageDetector/Editor/SearchResult.cs +++ b/Plugins/AssetUsageDetector/Editor/SearchResult.cs @@ -863,6 +863,9 @@ namespace AssetUsageDetectorNamespace if( searchResult != null && searchResult.SearchParameters.dontSearchInSourceAssets && searchResult.SearchParameters.objectsToSearch.Length > 1 ) EditorGUILayout.HelpBox( "'Don't search \"SEARCHED OBJECTS\" themselves for references' is enabled, some of these objects might be used by \"SEARCHED OBJECTS\".", MessageType.Warning ); + if( !AssetUsageDetectorSettings.MarkUsedAssetsSubAssetsAsUsed ) + EditorGUILayout.HelpBox( "'Hide unused sub-assets in \"Unused Objects\" list if their parent assets are used' is disabled, unused sub-assets' parent assets might be used.", MessageType.Warning ); + EditorGUILayout.HelpBox( "Although no references to these objects are found, they might still be used somewhere (e.g. via Resources.Load). If you intend to delete these objects, consider creating a backup of your project first.", MessageType.Info ); } diff --git a/Plugins/AssetUsageDetector/README.txt b/Plugins/AssetUsageDetector/README.txt index 2b13b8b..f962275 100644 --- a/Plugins/AssetUsageDetector/README.txt +++ b/Plugins/AssetUsageDetector/README.txt @@ -1,4 +1,4 @@ -= Asset Usage Detector (v2.5.2) = += Asset Usage Detector (v2.5.3) = Documentation: https://github.com/yasirkula/UnityAssetUsageDetector E-mail: yasirkula@gmail.com \ No newline at end of file diff --git a/package.json b/package.json index b58aff5..f703d99 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "com.yasirkula.assetusagedetector", "displayName": "Asset Usage Detector", - "version": "2.5.2", + "version": "2.5.3", "documentationUrl": "https://github.com/yasirkula/UnityAssetUsageDetector", "changelogUrl": "https://github.com/yasirkula/UnityAssetUsageDetector/releases", "licensesUrl": "https://github.com/yasirkula/UnityAssetUsageDetector/blob/master/LICENSE.txt",