diff --git a/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs b/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs index 8b5dd26..94cfc38 100644 --- a/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs +++ b/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs @@ -31,6 +31,7 @@ namespace AssetUsageDetectorNamespace public SceneSearchMode searchInScenes = SceneSearchMode.AllScenes; public Object[] searchInScenesSubset = null; public Object[] excludedScenesFromSearch = null; + public bool searchInSceneLightingSettings = true; public bool searchInAssetsFolder = true; public Object[] searchInAssetsSubset = null; public Object[] excludedAssetsFromSearch = null; @@ -162,6 +163,7 @@ namespace AssetUsageDetectorNamespace // Get the scenes that are open right now SceneSetup[] initialSceneSetup = !isInPlayMode ? EditorSceneManager.GetSceneManagerSetup() : null; + Scene activeScene = EditorSceneManager.GetActiveScene(); // Make sure that the AssetDatabase is up-to-date AssetDatabase.SaveAssets(); @@ -524,7 +526,7 @@ namespace AssetUsageDetectorNamespace if( excludedScenesPathsSet.Contains( scenePath ) ) continue; - SearchScene( scenePath, searchResult, searchParameters.lazySceneSearch, initialSceneSetup ); + SearchScene( scenePath, searchResult, searchParameters, initialSceneSetup ); } } @@ -607,6 +609,10 @@ namespace AssetUsageDetectorNamespace EditorUtility.ClearProgressBar(); + // If the active scene was changed during search, reset it + if( EditorSceneManager.GetActiveScene() != activeScene ) + EditorSceneManager.SetActiveScene( activeScene ); + #if UNITY_2018_3_OR_NEWER // If a prefab stage was open when the search was triggered, try reopening the prefab stage after the search is completed if( !string.IsNullOrEmpty( openPrefabStageAssetPath ) ) @@ -895,7 +901,7 @@ namespace AssetUsageDetectorNamespace } // Search a scene for references - private void SearchScene( string scenePath, List searchResult, bool lazySearch, SceneSetup[] initialSceneSetup ) + private void SearchScene( string scenePath, List searchResult, Parameters searchParameters, SceneSetup[] initialSceneSetup ) { Scene scene = EditorSceneManager.GetSceneByPath( scenePath ); if( isInPlayMode && !scene.isLoaded ) @@ -911,7 +917,7 @@ namespace AssetUsageDetectorNamespace if( !scene.isLoaded ) { - if( lazySearch ) + if( searchParameters.lazySceneSearch ) { searchResult.Add( new SearchResultGroup( scenePath, SearchResultGroup.GroupType.Scene, true, true ) ); return; @@ -927,6 +933,16 @@ namespace AssetUsageDetectorNamespace for( int i = 0; i < rootGameObjects.Length; i++ ) SearchGameObjectRecursively( rootGameObjects[i] ); + // Search through Lighting Settings (it requires changing the active scene but don't do that in play mode) + if( searchParameters.searchInSceneLightingSettings && ( !isInPlayMode || SceneManager.GetActiveScene() == scene ) ) + { + if( !isInPlayMode && EditorSceneManager.GetActiveScene() != scene ) + EditorSceneManager.SetActiveScene( scene ); + + BeginSearchObject( lightmapSettingsGetter() ); + BeginSearchObject( renderSettingsGetter() ); + } + // If no references are found in the scene and if the scene is not part of the initial scene setup, close it if( currentSearchResultGroup.NumberOfReferences == 0 ) { diff --git a/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSearchFunctions.cs b/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSearchFunctions.cs index 1446dc7..d62f0cc 100644 --- a/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSearchFunctions.cs +++ b/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSearchFunctions.cs @@ -205,6 +205,12 @@ namespace AssetUsageDetectorNamespace private readonly FieldInfoGetter fieldInfoGetter = (FieldInfoGetter) Delegate.CreateDelegate( typeof( FieldInfoGetter ), typeof( Editor ).Assembly.GetType( "UnityEditor.ScriptAttributeUtility" ).GetMethod( "GetFieldInfoFromProperty", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static ) ); #endif + private readonly Func lightmapSettingsGetter = (Func) Delegate.CreateDelegate( typeof( Func ), typeof( LightmapEditorSettings ).GetMethod( "GetLightmapSettings", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static ) ); + private readonly Func renderSettingsGetter = (Func) Delegate.CreateDelegate( typeof( Func ), typeof( RenderSettings ).GetMethod( "GetRenderSettings", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static ) ); +#if UNITY_2021_2_OR_NEWER + private readonly Func defaultReflectionProbeGetter = (Func) Delegate.CreateDelegate( typeof( Func ), typeof( RenderSettings ).GetProperty( "defaultReflection", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static ).GetGetMethod( true ) ); +#endif + #if ASSET_USAGE_ADDRESSABLES private readonly Func spriteAtlasPackedSpritesGetter = (Func) Delegate.CreateDelegate( typeof( Func ), typeof( SpriteAtlasExtensions ).GetMethod( "GetPackedSprites", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static ) ); private readonly PropertyInfo assetReferenceSubObjectTypeGetter = typeof( AssetReference ).GetProperty( "SubOjbectType", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance ); @@ -235,6 +241,8 @@ namespace AssetUsageDetectorNamespace { typeof( BlendTree ), SearchBlendTree }, { typeof( AnimationClip ), SearchAnimationClip }, { typeof( TerrainData ), SearchTerrainData }, + { typeof( LightmapSettings ), SearchLightmapSettings }, + { typeof( RenderSettings ), SearchRenderSettings }, #if UNITY_2017_1_OR_NEWER { typeof( SpriteAtlas ), SearchSpriteAtlas }, #endif @@ -1007,6 +1015,36 @@ namespace AssetUsageDetectorNamespace return referenceNode; } + private ReferenceNode SearchLightmapSettings( object obj ) + { + ReferenceNode referenceNode = PopReferenceNode( obj ); + + referenceNode.AddLinkTo( SearchObject( LightmapSettings.lightProbes ), "Light Probes" ); + + LightmapData[] lightmaps = LightmapSettings.lightmaps; + if( lightmaps != null ) + { + for( int i = 0; i < lightmaps.Length; i++ ) + referenceNode.AddLinkTo( SearchObject( lightmaps[i] ), "Lightmap" ); + } + + SearchVariablesWithSerializedObject( referenceNode, true ); + return referenceNode; + } + + private ReferenceNode SearchRenderSettings( object obj ) + { + ReferenceNode referenceNode = PopReferenceNode( obj ); + +#if UNITY_2021_2_OR_NEWER + referenceNode.AddLinkTo( SearchObject( defaultReflectionProbeGetter() ), "Default Reflection Probe" ); +#else + referenceNode.AddLinkTo( SearchObject( ReflectionProbe.defaultTexture ), "Default Reflection Probe" ); +#endif + SearchVariablesWithSerializedObject( referenceNode, true ); + return referenceNode; + } + #if UNITY_2017_1_OR_NEWER private ReferenceNode SearchSpriteAtlas( object obj ) { @@ -1396,9 +1434,9 @@ namespace AssetUsageDetectorNamespace } // Search through variables of an object with SerializedObject - private void SearchVariablesWithSerializedObject( ReferenceNode referenceNode ) + private void SearchVariablesWithSerializedObject( ReferenceNode referenceNode, bool forceUseSerializedObject = false ) { - if( !isInPlayMode || referenceNode.nodeObject.IsAsset() ) + if( !isInPlayMode || referenceNode.nodeObject.IsAsset() || forceUseSerializedObject ) { #if ASSET_USAGE_ADDRESSABLES // See: https://github.com/yasirkula/UnityAssetUsageDetector/issues/29 diff --git a/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs b/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs index 402f92f..95180ec 100644 --- a/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs +++ b/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs @@ -22,6 +22,7 @@ namespace AssetUsageDetectorNamespace private enum WindowFilter { AlwaysReturnActive, ReturnActiveIfNotLocked, AlwaysReturnNew }; private const string PREFS_SEARCH_SCENES = "AUD_SceneSearch"; + private const string PREFS_SEARCH_SCENE_LIGHTING_SETTINGS = "AUD_LightingSettingsSearch"; private const string PREFS_SEARCH_ASSETS = "AUD_AssetsSearch"; private const string PREFS_SEARCH_PROJECT_SETTINGS = "AUD_ProjectSettingsSearch"; private const string PREFS_DONT_SEARCH_SOURCE_ASSETS = "AUD_AssetsExcludeSrc"; @@ -73,6 +74,7 @@ namespace AssetUsageDetectorNamespace private bool searchInScenesInBuild = true; // Scenes in build 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 searchInSceneLightingSettings = true; // Window-Rendering-Lighting settings private bool searchInAssetsFolder = true; // Assets in Project window private bool dontSearchInSourceAssets = true; // objectsToSearch won't be searched for internal references private bool searchInProjectSettings = true; // Player Settings, Graphics Settings etc. @@ -313,6 +315,7 @@ namespace AssetUsageDetectorNamespace if( searchParameters != null ) { ParseSceneSearchMode( searchParameters.searchInScenes ); + searchInSceneLightingSettings = searchParameters.searchInSceneLightingSettings; searchInAssetsFolder = searchParameters.searchInAssetsFolder; dontSearchInSourceAssets = searchParameters.dontSearchInSourceAssets; searchInProjectSettings = searchParameters.searchInProjectSettings; @@ -396,6 +399,7 @@ namespace AssetUsageDetectorNamespace private void SavePrefs() { EditorPrefs.SetInt( PREFS_SEARCH_SCENES, (int) GetSceneSearchMode( false ) ); + EditorPrefs.SetBool( PREFS_SEARCH_SCENE_LIGHTING_SETTINGS, searchInSceneLightingSettings ); EditorPrefs.SetBool( PREFS_SEARCH_ASSETS, searchInAssetsFolder ); EditorPrefs.SetBool( PREFS_DONT_SEARCH_SOURCE_ASSETS, dontSearchInSourceAssets ); EditorPrefs.SetBool( PREFS_SEARCH_PROJECT_SETTINGS, searchInProjectSettings ); @@ -417,7 +421,7 @@ namespace AssetUsageDetectorNamespace private void LoadPrefs() { ParseSceneSearchMode( (SceneSearchMode) EditorPrefs.GetInt( PREFS_SEARCH_SCENES, (int) ( SceneSearchMode.OpenScenes | SceneSearchMode.ScenesInBuildSettingsTickedOnly | SceneSearchMode.AllScenes ) ) ); - + searchInSceneLightingSettings = EditorPrefs.GetBool( PREFS_SEARCH_SCENE_LIGHTING_SETTINGS, true ); searchInAssetsFolder = EditorPrefs.GetBool( PREFS_SEARCH_ASSETS, true ); dontSearchInSourceAssets = EditorPrefs.GetBool( PREFS_DONT_SEARCH_SOURCE_ASSETS, true ); searchInProjectSettings = EditorPrefs.GetBool( PREFS_SEARCH_PROJECT_SETTINGS, true ); @@ -554,6 +558,10 @@ namespace AssetUsageDetectorNamespace GUILayout.EndVertical(); GUILayout.EndHorizontal(); + EditorGUI.BeginDisabledGroup( !searchInOpenScenes && !searchInScenesInBuild && !searchInAllScenes ); + searchInSceneLightingSettings = WordWrappingToggleLeft( "Scene Lighting Settings (WARNING: This may change the active scene during search)", searchInSceneLightingSettings ); + EditorGUI.EndDisabledGroup(); + Utilities.DrawSeparatorLine(); searchInProjectSettings = WordWrappingToggleLeft( "Project Settings (Player Settings, Graphics Settings etc.)", searchInProjectSettings ); @@ -695,6 +703,7 @@ namespace AssetUsageDetectorNamespace { objectsToSearch = !objectsToSearch.IsEmpty() ? new ObjectToSearchEnumerator( objectsToSearch ).ToArray() : null, searchInScenes = GetSceneSearchMode( true ), + searchInSceneLightingSettings = searchInSceneLightingSettings, searchInAssetsFolder = searchInAssetsFolder, searchInAssetsSubset = !searchInAssetsSubset.IsEmpty() ? searchInAssetsSubset.ToArray() : null, excludedAssetsFromSearch = !excludedAssets.IsEmpty() ? excludedAssets.ToArray() : null,