From 4415d4b6f4e41511751a9e51d9c799775390e5a1 Mon Sep 17 00:00:00 2001 From: yasirkula Date: Mon, 19 May 2025 21:14:29 +0300 Subject: [PATCH] Updated Unity version to 2021.3.41f1 (simplified codebase accordingly) --- .../Editor/AssetUsageDetector.cs | 27 ------ .../AssetUsageDetectorSearchFunctions.cs | 83 ------------------- .../Editor/AssetUsageDetectorSettings.cs | 9 -- .../Editor/AssetUsageDetectorWindow.cs | 48 ----------- .../Editor/ObjectToSearch.cs | 4 +- .../Editor/SearchRefactoring.cs | 8 -- .../AssetUsageDetector/Editor/SearchResult.cs | 11 --- .../Editor/SearchResultTreeView.cs | 39 +-------- .../AssetUsageDetector/Editor/Utilities.cs | 64 -------------- Plugins/AssetUsageDetector/README.txt | 2 +- package.json | 2 +- 11 files changed, 5 insertions(+), 292 deletions(-) diff --git a/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs b/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs index f788b13..0366c0d 100644 --- a/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs +++ b/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs @@ -1,5 +1,3 @@ -// Asset Usage Detector - by Suleyman Yasir KULA (yasirkula@gmail.com) - using UnityEngine; using UnityEditor; using UnityEngine.SceneManagement; @@ -93,13 +91,9 @@ namespace AssetUsageDetectorNamespace private bool searchingSourceAssets; private bool isInPlayMode; -#if UNITY_2018_3_OR_NEWER private PrefabStage openPrefabStage; private GameObject openPrefabStagePrefabAsset; -#if UNITY_2020_1_OR_NEWER private GameObject openPrefabStageContextObject; -#endif -#endif private int searchedObjectsCount; // Number of searched objects private double searchStartTime; @@ -121,7 +115,6 @@ namespace AssetUsageDetectorNamespace return new SearchResult( false, null, null, null, this, searchParameters ); } -#if UNITY_2018_3_OR_NEWER openPrefabStagePrefabAsset = null; string openPrefabStageAssetPath = null; openPrefabStage = PrefabStageUtility.GetCurrentPrefabStage(); @@ -138,20 +131,12 @@ namespace AssetUsageDetectorNamespace return new SearchResult( false, null, null, null, this, searchParameters ); } -#if UNITY_2020_1_OR_NEWER string prefabAssetPath = openPrefabStage.assetPath; -#else - string prefabAssetPath = openPrefabStage.prefabAssetPath; -#endif openPrefabStagePrefabAsset = AssetDatabase.LoadAssetAtPath( prefabAssetPath ); openPrefabStageAssetPath = prefabAssetPath; - -#if UNITY_2020_1_OR_NEWER openPrefabStageContextObject = openPrefabStage.openedFromInstanceRoot; -#endif } } -#endif List searchResult = null; isInPlayMode = EditorApplication.isPlaying; @@ -193,9 +178,7 @@ namespace AssetUsageDetectorNamespace excludedAssetsPathsSet.Clear(); alwaysSearchedExtensionsSet.Clear(); shaderIncludesToSearchSet.Clear(); -#if UNITY_2017_3_OR_NEWER assemblyDefinitionFilesToSearch.Clear(); -#endif if( assetDependencyCache == null ) { @@ -527,7 +510,6 @@ namespace AssetUsageDetectorNamespace if( excludedScenesPathsSet.Contains( scenePath ) ) continue; -#if UNITY_2019_2_OR_NEWER // Skip scenes in read-only packages (Issue #36) // Credit: https://forum.unity.com/threads/check-if-asset-inside-package-is-readonly.900902/#post-5990822 if( !scenePath.StartsWithFast( "Assets/" ) ) @@ -536,7 +518,6 @@ namespace AssetUsageDetectorNamespace if( packageInfo != null && packageInfo.source != UnityEditor.PackageManager.PackageSource.Embedded && packageInfo.source != UnityEditor.PackageManager.PackageSource.Local ) continue; } -#endif SearchScene( scenePath, searchResult, searchParameters, initialSceneSetup ); } @@ -625,11 +606,9 @@ namespace AssetUsageDetectorNamespace 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 ) ) { -#if UNITY_2020_1_OR_NEWER bool shouldOpenPrefabStageWithoutContext = true; if( openPrefabStageContextObject != null && !openPrefabStageContextObject.Equals( null ) ) { @@ -647,12 +626,8 @@ namespace AssetUsageDetectorNamespace } if( shouldOpenPrefabStageWithoutContext ) -#endif - { AssetDatabase.OpenAsset( AssetDatabase.LoadAssetAtPath( openPrefabStageAssetPath ) ); - } } -#endif } } @@ -837,7 +812,6 @@ namespace AssetUsageDetectorNamespace objectsToSearchSet.Add( obj ); -#if UNITY_2018_3_OR_NEWER // When searching for references of a prefab stage object, try adding its corresponding prefab asset to the searched assets, as well if( openPrefabStage != null && openPrefabStagePrefabAsset != null && obj is GameObject && openPrefabStage.IsPartOfPrefabContents( (GameObject) obj ) ) { @@ -845,7 +819,6 @@ namespace AssetUsageDetectorNamespace if( prefabStageObjectSource != null ) AddSearchedObjectToFilteredSets( prefabStageObjectSource, expandGameObjects ); } -#endif bool isAsset = obj.IsAsset(); if( isAsset ) diff --git a/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSearchFunctions.cs b/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSearchFunctions.cs index 5c97055..c5fe94a 100644 --- a/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSearchFunctions.cs +++ b/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSearchFunctions.cs @@ -8,19 +8,11 @@ using UnityEditor; using UnityEditor.Animations; using UnityEngine; using UnityEngine.UI; -#if UNITY_2017_1_OR_NEWER using UnityEngine.U2D; using UnityEngine.Playables; -#endif -#if UNITY_2018_2_OR_NEWER using UnityEditor.U2D; -#endif -#if UNITY_2017_3_OR_NEWER using UnityEditor.Compilation; -#endif -#if UNITY_2017_2_OR_NEWER using UnityEngine.Tilemaps; -#endif #if ASSET_USAGE_ADDRESSABLES using UnityEngine.AddressableAssets; #endif @@ -31,19 +23,13 @@ namespace AssetUsageDetectorNamespace public partial class AssetUsageDetector { #region Helper Classes -#if UNITY_2017_3_OR_NEWER -#pragma warning disable 0649 // The fields' values are assigned via JsonUtility [Serializable] private struct AssemblyDefinitionReferences { public string reference; // Used by AssemblyDefinitionReferenceAssets public List references; // Used by AssemblyDefinitionAssets } -#pragma warning restore 0649 -#endif -#if UNITY_2018_1_OR_NEWER -#pragma warning disable 0649 // The fields' values are assigned via JsonUtility [Serializable] private struct ShaderGraphReferences // Used by old Shader Graph serialization format { @@ -156,8 +142,6 @@ namespace AssetUsageDetectorNamespace return null; } } -#pragma warning restore 0649 -#endif #endregion // Dictionary to quickly find the function to search a specific type with @@ -176,10 +160,8 @@ namespace AssetUsageDetectorNamespace // Path(s) of .cginc, .cg, .hlsl and .glslinc assets in assetsToSearchSet private readonly HashSet shaderIncludesToSearchSet = new HashSet(); -#if UNITY_2017_3_OR_NEWER // Path(s) of the Assembly Definition Files in objectsToSearchSet (Value: files themselves) private readonly Dictionary assemblyDefinitionFilesToSearch = new Dictionary( 8 ); -#endif // An optimization to fetch an animation clip's curve bindings only once private readonly Dictionary animationClipUniqueBindings = new Dictionary( 256 ); @@ -187,10 +169,7 @@ namespace AssetUsageDetectorNamespace private bool searchPrefabConnections; private bool searchMonoBehavioursForScript; private bool searchTextureReferences; -#if UNITY_2018_1_OR_NEWER private bool searchShaderGraphsForSubGraphs; -#endif - private bool searchSerializableVariablesOnly; private bool prevSearchSerializableVariablesOnly; @@ -199,12 +178,7 @@ namespace AssetUsageDetectorNamespace // Unity's internal function that returns a SerializedProperty's corresponding FieldInfo private delegate FieldInfo FieldInfoGetter( SerializedProperty p, out Type t ); -#if UNITY_2019_3_OR_NEWER private readonly FieldInfoGetter fieldInfoGetter = (FieldInfoGetter) Delegate.CreateDelegate( typeof( FieldInfoGetter ), typeof( Editor ).Assembly.GetType( "UnityEditor.ScriptAttributeUtility" ).GetMethod( "GetFieldInfoAndStaticTypeFromProperty", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static ) ); -#else - 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 @@ -244,9 +218,7 @@ namespace AssetUsageDetectorNamespace { typeof( TerrainData ), SearchTerrainData }, { typeof( LightmapSettings ), SearchLightmapSettings }, { typeof( RenderSettings ), SearchRenderSettings }, -#if UNITY_2017_1_OR_NEWER { typeof( SpriteAtlas ), SearchSpriteAtlas }, -#endif }; } @@ -259,16 +231,10 @@ namespace AssetUsageDetectorNamespace { "cg", SearchShaderSecondaryAsset }, { "glslinc", SearchShaderSecondaryAsset }, { "hlsl", SearchShaderSecondaryAsset }, -#if UNITY_2017_3_OR_NEWER { "asmdef", SearchAssemblyDefinitionFile }, -#endif -#if UNITY_2019_2_OR_NEWER { "asmref", SearchAssemblyDefinitionFile }, -#endif -#if UNITY_2018_1_OR_NEWER { "shadergraph", SearchShaderGraph }, { "shadersubgraph", SearchShaderGraph }, -#endif #if ASSET_USAGE_VFX_GRAPH { "vfx", SearchVFXGraphAsset }, { "vfxoperator", SearchVFXGraphAsset }, @@ -291,9 +257,7 @@ namespace AssetUsageDetectorNamespace searchPrefabConnections = false; searchMonoBehavioursForScript = false; searchTextureReferences = false; -#if UNITY_2018_1_OR_NEWER searchShaderGraphsForSubGraphs = false; -#endif #if ASSET_USAGE_VFX_GRAPH bool searchVFXGraphs = false; #endif @@ -315,10 +279,8 @@ namespace AssetUsageDetectorNamespace } else if( obj is GameObject ) searchPrefabConnections = true; -#if UNITY_2017_3_OR_NEWER else if( obj is UnityEditorInternal.AssemblyDefinitionAsset ) assemblyDefinitionFilesToSearch[AssetDatabase.GetAssetPath( obj )] = obj; -#endif #if ASSET_USAGE_VFX_GRAPH else if( !searchVFXGraphs && ( obj is Shader || obj is Mesh || obj.GetType().Name.StartsWithFast( "PointCache" ) || obj.GetType().Name == "ShaderGraphVfxAsset" ) ) searchVFXGraphs = true; @@ -337,10 +299,8 @@ namespace AssetUsageDetectorNamespace string extension = Utilities.GetFileExtension( path ); if( extension == "hlsl" || extension == "cginc" || extension == "cg" || extension == "glslinc" ) shaderIncludesToSearchSet.Add( path ); -#if UNITY_2018_1_OR_NEWER else if( extension == "shadersubgraph" ) searchShaderGraphsForSubGraphs = true; -#endif } // AssetDatabase.GetDependencies doesn't take #include lines in shader source codes into consideration. If we are searching for references @@ -355,19 +315,14 @@ namespace AssetUsageDetectorNamespace alwaysSearchedExtensionsSet.Add( "hlsl" ); } -#if UNITY_2017_3_OR_NEWER // AssetDatabase.GetDependencies doesn't return references from Assembly Definition Files to their Assembly Definition References, // so if we are searching for an Assembly Definition File's usages, we must search all Assembly Definition Files' references manually. if( assemblyDefinitionFilesToSearch.Count > 0 ) { alwaysSearchedExtensionsSet.Add( "asmdef" ); -#if UNITY_2019_2_OR_NEWER alwaysSearchedExtensionsSet.Add( "asmref" ); -#endif } -#endif -#if UNITY_2018_1_OR_NEWER // AssetDatabase.GetDependencies doesn't work with Shader Graph assets. We must search all Shader Graph assets in the following cases: // searchTextureReferences: to find Texture references used in various nodes and properties // searchShaderGraphsForSubGraphs: to find Shader Sub-graph references in other Shader Graph assets @@ -377,7 +332,6 @@ namespace AssetUsageDetectorNamespace alwaysSearchedExtensionsSet.Add( "shadergraph" ); alwaysSearchedExtensionsSet.Add( "shadersubgraph" ); } -#endif #if ASSET_USAGE_VFX_GRAPH if( searchTextureReferences || searchVFXGraphs ) @@ -502,7 +456,6 @@ namespace AssetUsageDetectorNamespace // Search the objects that are animated by this Animator component for references SearchAnimatedObjects( referenceNode ); } -#if UNITY_2017_2_OR_NEWER else if( component is Tilemap ) { // Search the tiles for references @@ -520,8 +473,6 @@ namespace AssetUsageDetectorNamespace } } } -#endif -#if UNITY_2017_1_OR_NEWER else if( component is PlayableDirector ) { // Search the PlayableAsset's scene bindings for references @@ -538,7 +489,6 @@ namespace AssetUsageDetectorNamespace } } } -#endif else if( component is ParticleSystemRenderer ) { // Search ParticleSystemRenderer's custom meshes for references (at runtime, they can't be searched with reflection, unfortunately) @@ -575,11 +525,7 @@ namespace AssetUsageDetectorNamespace try { ParticleSystem.CollisionModule collisionModule = particleSystem.collision; -#if UNITY_2020_2_OR_NEWER for( int i = 0, j = collisionModule.planeCount; i < j; i++ ) -#else - for( int i = 0, j = collisionModule.maxPlaneCount; i < j; i++ ) -#endif { Transform plane = collisionModule.GetPlane( i ); referenceNode.AddLinkTo( SearchObject( plane ), "Collision Module: Plane" ); @@ -593,11 +539,7 @@ namespace AssetUsageDetectorNamespace try { ParticleSystem.TriggerModule triggerModule = particleSystem.trigger; -#if UNITY_2020_2_OR_NEWER for( int i = 0, j = triggerModule.colliderCount; i < j; i++ ) -#else - for( int i = 0, j = triggerModule.maxColliderCount; i < j; i++ ) -#endif { Component collider = triggerModule.GetCollider( i ); referenceNode.AddLinkTo( SearchObject( collider ), "Trigger Module: Collider" ); @@ -608,7 +550,6 @@ namespace AssetUsageDetectorNamespace } catch { } -#if UNITY_2017_1_OR_NEWER try { ParticleSystem.TextureSheetAnimationModule textureSheetAnimationModule = particleSystem.textureSheetAnimation; @@ -622,9 +563,7 @@ namespace AssetUsageDetectorNamespace } } catch { } -#endif -#if UNITY_5_5_OR_NEWER try { ParticleSystem.SubEmittersModule subEmittersModule = particleSystem.subEmitters; @@ -638,7 +577,6 @@ namespace AssetUsageDetectorNamespace } } catch { } -#endif } } @@ -742,10 +680,8 @@ namespace AssetUsageDetectorNamespace { string propertyName = ShaderUtil.GetPropertyName( shader, i ); Texture defaultTexture = shaderImporter.GetDefaultTexture( propertyName ); -#if UNITY_2018_1_OR_NEWER if( !defaultTexture ) defaultTexture = shaderImporter.GetNonModifiableTexture( propertyName ); -#endif if( objectsToSearchSet.Contains( defaultTexture ) ) { @@ -1056,7 +992,6 @@ namespace AssetUsageDetectorNamespace return referenceNode; } -#if UNITY_2017_1_OR_NEWER private ReferenceNode SearchSpriteAtlas( object obj ) { SpriteAtlas spriteAtlas = (SpriteAtlas) obj; @@ -1089,7 +1024,6 @@ namespace AssetUsageDetectorNamespace searchParameters.searchRefactoring( new SerializedPropertyMatch( spriteAtlas, packedSprite, packedSpriteProperty ) ); } } -#if UNITY_2018_2_OR_NEWER else { Object[] _packables = spriteAtlas.GetPackables(); @@ -1099,7 +1033,6 @@ namespace AssetUsageDetectorNamespace SearchSpriteAtlas( referenceNode, _packables[i] ); } } -#endif return referenceNode; } @@ -1145,9 +1078,7 @@ namespace AssetUsageDetectorNamespace } } } -#endif -#if UNITY_2017_3_OR_NEWER // Find references from an Assembly Definition File to its Assembly Definition References private ReferenceNode SearchAssemblyDefinitionFile( object obj ) { @@ -1169,11 +1100,7 @@ namespace AssetUsageDetectorNamespace { for( int i = 0; i < assemblyDefinitionFile.references.Count; i++ ) { -#if UNITY_2019_1_OR_NEWER string assemblyPath = CompilationPipeline.GetAssemblyDefinitionFilePathFromAssemblyReference( assemblyDefinitionFile.references[i] ); -#else - string assemblyPath = CompilationPipeline.GetAssemblyDefinitionFilePathFromAssemblyName( assemblyDefinitionFile.references[i] ); -#endif if( !string.IsNullOrEmpty( assemblyPath ) ) { Object searchedAssemblyDefinitionFile; @@ -1185,9 +1112,7 @@ namespace AssetUsageDetectorNamespace return referenceNode; } -#endif -#if UNITY_2018_1_OR_NEWER // Searches Shader Graph assets for references private ReferenceNode SearchShaderGraph( object obj ) { @@ -1316,7 +1241,6 @@ namespace AssetUsageDetectorNamespace return referenceNode; } -#endif #if ASSET_USAGE_VFX_GRAPH private ReferenceNode SearchVFXGraphAsset( object obj ) @@ -1495,14 +1419,12 @@ namespace AssetUsageDetectorNamespace searchResult = SearchObject( PreferablyGameObject( propertyValue ) ); enterChildren = false; break; -#if UNITY_2019_3_OR_NEWER case SerializedPropertyType.ManagedReference: object managedReferenceValue = GetRawSerializedPropertyValue( iterator ); propertyValue = managedReferenceValue as Object; searchResult = SearchObject( PreferablyGameObject( managedReferenceValue ) ); enterChildren = false; break; -#endif case SerializedPropertyType.Generic: { #if ASSET_USAGE_ADDRESSABLES @@ -1776,11 +1698,6 @@ namespace AssetUsageDetectorNamespace // Same as above else if( ( propertyName == "material" || propertyName == "materials" ) && ( typeof( Renderer ).IsAssignableFrom( currType ) || typeof( Collider ).IsAssignableFrom( currType ) || -#if !UNITY_2019_3_OR_NEWER -#pragma warning disable 0618 - typeof( GUIText ).IsAssignableFrom( currType ) || -#pragma warning restore 0618 -#endif typeof( Collider2D ).IsAssignableFrom( currType ) ) ) continue; // Ignore certain Material properties that are already searched via SearchMaterial function (also, if a material doesn't have a _Color or _BaseColor diff --git a/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSettings.cs b/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSettings.cs index 6dc943a..a42bf68 100644 --- a/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSettings.cs +++ b/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSettings.cs @@ -167,7 +167,6 @@ namespace AssetUsageDetectorNamespace } #endregion -#if UNITY_2018_3_OR_NEWER [SettingsProvider] public static SettingsProvider CreatePreferencesGUI() { @@ -177,19 +176,11 @@ namespace AssetUsageDetectorNamespace keywords = new System.Collections.Generic.HashSet() { "Asset", "Usage", "Detector" } }; } -#endif -#if !UNITY_2018_3_OR_NEWER - [PreferenceItem( "Asset Usage Detector" )] -#endif public static void PreferencesGUI() { float labelWidth = EditorGUIUtility.labelWidth; -#if UNITY_2018_3_OR_NEWER EditorGUIUtility.labelWidth += 60f; -#else - EditorGUIUtility.labelWidth += 20f; -#endif EditorGUI.BeginChangeCheck(); diff --git a/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs b/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs index 802347b..28d30b7 100644 --- a/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs +++ b/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs @@ -1,5 +1,3 @@ -// Asset Usage Detector - by Suleyman Yasir KULA (yasirkula@gmail.com) - using UnityEngine; using UnityEditor; using System.Collections.Generic; @@ -64,7 +62,6 @@ namespace AssetUsageDetectorNamespace // This isn't readonly so that it can be serialized private List objectsToSearch = new List() { new ObjectToSearch( null ) }; -#pragma warning disable 0649 [SerializeField] // Since titleContent persists between Editor sessions, so should the IsLocked property because otherwise, "[L]" in title becomes confusing when the EditorWindow isn't actually locked private bool m_isLocked; private bool IsLocked @@ -79,7 +76,6 @@ namespace AssetUsageDetectorNamespace } } } -#pragma warning restore 0649 private Phase currentPhase = Phase.Setup; @@ -131,37 +127,7 @@ namespace AssetUsageDetectorNamespace { contextMenu.AddItem( new GUIContent( "Lock" ), IsLocked, () => IsLocked = !IsLocked ); contextMenu.AddSeparator( "" ); - -#if UNITY_2018_3_OR_NEWER contextMenu.AddItem( new GUIContent( "Settings" ), false, () => SettingsService.OpenProjectSettings( "Project/yasirkula/Asset Usage Detector" ) ); -#else - contextMenu.AddItem( new GUIContent( "Settings" ), false, () => - { - System.Type preferencesWindowType = typeof( EditorWindow ).Assembly.GetType( "UnityEditor.PreferencesWindow" ); - preferencesWindowType.GetMethod( "ShowPreferencesWindow", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static ).Invoke( null, null ); - - EditorWindow preferencesWindow = GetWindow( preferencesWindowType ); - if( (bool) preferencesWindowType.GetField( "m_RefreshCustomPreferences", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance ).GetValue( preferencesWindow ) ) - { - preferencesWindowType.GetMethod( "AddCustomSections", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance ).Invoke( preferencesWindow, null ); - preferencesWindowType.GetField( "m_RefreshCustomPreferences", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance ).SetValue( preferencesWindow, false ); - } - - int targetSectionIndex = -1; - System.Collections.IList sections = (System.Collections.IList) preferencesWindowType.GetField( "m_Sections", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance ).GetValue( preferencesWindow ); - for( int i = 0; i < sections.Count; i++ ) - { - if( ( (GUIContent) sections[i].GetType().GetField( "content", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance ).GetValue( sections[i] ) ).text == "Asset Usage Detector" ) - { - targetSectionIndex = i; - break; - } - } - - if( targetSectionIndex >= 0 ) - preferencesWindowType.GetProperty( "selectedSectionIndex", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance ).SetValue( preferencesWindow, targetSectionIndex, null ); - } ); -#endif if( currentPhase == Phase.Setup ) { @@ -386,17 +352,12 @@ namespace AssetUsageDetectorNamespace if( currentPhase == Phase.Complete && AssetUsageDetectorSettings.ShowCustomTooltip ) wantsMouseMove = wantsMouseEnterLeaveWindow = true; // These values aren't preserved during domain reload on Unity 2020.3.0f1 -#if UNITY_2018_3_OR_NEWER - PrefabStage.prefabStageClosing -= ReplacePrefabStageObjectsWithAssets; PrefabStage.prefabStageClosing += ReplacePrefabStageObjectsWithAssets; -#endif } private void OnDisable() { -#if UNITY_2018_3_OR_NEWER PrefabStage.prefabStageClosing -= ReplacePrefabStageObjectsWithAssets; -#endif SearchResultTooltip.Hide(); } @@ -712,10 +673,7 @@ namespace AssetUsageDetectorNamespace currentPhase = Phase.Processing; SavePrefs(); - -#if UNITY_2018_3_OR_NEWER ReplacePrefabStageObjectsWithAssets( PrefabStageUtility.GetCurrentPrefabStage() ); -#endif // Start searching searchResult = core.Run( new AssetUsageDetector.Parameters() @@ -758,18 +716,13 @@ namespace AssetUsageDetectorNamespace wantsMouseMove = wantsMouseEnterLeaveWindow = true; } -#if UNITY_2018_3_OR_NEWER // Try replacing searched objects who are part of currently open prefab stage with their corresponding prefab assets public void ReplacePrefabStageObjectsWithAssets( PrefabStage prefabStage ) { if( prefabStage == null || !prefabStage.stageHandle.IsValid() ) return; -#if UNITY_2020_1_OR_NEWER GameObject prefabAsset = AssetDatabase.LoadAssetAtPath( prefabStage.assetPath ); -#else - GameObject prefabAsset = AssetDatabase.LoadAssetAtPath( prefabStage.prefabAssetPath ); -#endif if( prefabAsset == null || prefabAsset.Equals( null ) ) return; @@ -796,7 +749,6 @@ namespace AssetUsageDetectorNamespace } } } -#endif private bool ReturnToSetupPhase() { diff --git a/Plugins/AssetUsageDetector/Editor/ObjectToSearch.cs b/Plugins/AssetUsageDetector/Editor/ObjectToSearch.cs index 855c984..0d57a1b 100644 --- a/Plugins/AssetUsageDetector/Editor/ObjectToSearch.cs +++ b/Plugins/AssetUsageDetector/Editor/ObjectToSearch.cs @@ -96,7 +96,7 @@ namespace AssetUsageDetectorNamespace } } - // If is an Atlas we get sprites directly as GetSubAssets return the final texture + // Add Sprites of SpriteAtlases to the sub-assets list if( target is SpriteAtlas spriteAtlas ) { Sprite[] packedSprites = AssetUsageDetector.spriteAtlasPackedSpritesGetter( spriteAtlas ); @@ -118,13 +118,11 @@ namespace AssetUsageDetectorNamespace if( asset == null || asset.Equals( null ) || asset is Component || asset == target ) continue; -#if UNITY_2018_3_OR_NEWER // Nested prefabs in prefab assets add an additional native object of type 'UnityEngine.PrefabInstance' to the prefab. Managed type of that native type // is UnityEngine.Object (i.e. GetType() returns UnityEngine.Object, not UnityEngine.PrefabInstance). There are no possible references to these native // objects so skip them (we're checking for UnityEngine.Prefab because it includes other native types like UnityEngine.PrefabCreation, as well) if( target is GameObject && asset.GetType() == typeof( Object ) && asset.ToString().Contains( "(UnityEngine.Prefab" ) ) continue; -#endif if( currentSubAssets.Add( asset ) ) subAssets.Add( new SubAsset( asset, shouldSearchChildren ?? true ) ); diff --git a/Plugins/AssetUsageDetector/Editor/SearchRefactoring.cs b/Plugins/AssetUsageDetector/Editor/SearchRefactoring.cs index ea2bf99..18f5a0f 100644 --- a/Plugins/AssetUsageDetector/Editor/SearchRefactoring.cs +++ b/Plugins/AssetUsageDetector/Editor/SearchRefactoring.cs @@ -152,9 +152,7 @@ namespace AssetUsageDetectorNamespace } break; -#if UNITY_2019_3_OR_NEWER case SerializedPropertyType.ManagedReference: SerializedProperty.managedReferenceValue = newValue; break; -#endif } SerializedProperty.serializedObject.ApplyModifiedPropertiesWithoutUndo(); @@ -288,10 +286,8 @@ namespace AssetUsageDetectorNamespace List textureNames = new List( 16 ); List textureValues = new List( 16 ); -#if UNITY_2018_1_OR_NEWER List nonModifiableTextureNames = new List( 16 ); List nonModifiableTextureValues = new List( 16 ); -#endif int shaderPropertyCount = ShaderUtil.GetPropertyCount( shader ); for( int i = 0; i < shaderPropertyCount; i++ ) @@ -300,7 +296,6 @@ namespace AssetUsageDetectorNamespace continue; string propertyName = ShaderUtil.GetPropertyName( shader, i ); -#if UNITY_2018_1_OR_NEWER if( ShaderUtil.IsShaderPropertyNonModifiableTexureProperty( shader, i ) ) { Texture propertyDefaultValue = shaderImporter.GetNonModifiableTexture( propertyName ); @@ -311,7 +306,6 @@ namespace AssetUsageDetectorNamespace nonModifiableTextureValues.Add( propertyDefaultValue ); } else -#endif { Texture propertyDefaultValue = shaderImporter.GetDefaultTexture( propertyName ); if( propertyDefaultValue == Value && propertyName == Variable ) @@ -323,9 +317,7 @@ namespace AssetUsageDetectorNamespace } shaderImporter.SetDefaultTextures( textureNames.ToArray(), textureValues.ToArray() ); -#if UNITY_2018_1_OR_NEWER shaderImporter.SetNonModifiableTextures( nonModifiableTextureNames.ToArray(), nonModifiableTextureValues.ToArray() ); -#endif AssetDatabase.ImportAsset( shaderImporter.assetPath ); } else diff --git a/Plugins/AssetUsageDetector/Editor/SearchResult.cs b/Plugins/AssetUsageDetector/Editor/SearchResult.cs index 67d00c9..fc20b23 100644 --- a/Plugins/AssetUsageDetector/Editor/SearchResult.cs +++ b/Plugins/AssetUsageDetector/Editor/SearchResult.cs @@ -980,19 +980,8 @@ namespace AssetUsageDetectorNamespace Rect treeViewRect = EditorGUILayout.GetControlRect( false, treeView.totalHeight ); if( ev.type == EventType.Repaint ) - { lastTreeViewRect = treeViewRect; -#if !UNITY_2018_2_OR_NEWER - // TreeView calls RowGUI for all rows instead of only the visible rows on early Unity versions which leads to performance issues. Do manual row culling on those versions - // Credit: https://github.com/Unity-Technologies/UnityCsReference/blob/a048de916b23331bf6dfe92c4a6c205989b83b4f/Editor/Mono/GUI/TreeView/TreeViewGUI.cs#L273-L276 - float topPixel = scrollPosition - treeViewRect.y; - float heightInPixels = window.position.height; - treeView.visibleRowTop = (int) Mathf.Floor( topPixel / treeView.rowHeight ); - treeView.visibleRowBottom = treeView.visibleRowTop + (int) Mathf.Ceil( heightInPixels / treeView.rowHeight ); -#endif - } - treeView.OnGUI( treeViewRect ); if( treeViewKeyboardNavigation && treeView.HasFocus() && treeView.HasSelection() ) diff --git a/Plugins/AssetUsageDetector/Editor/SearchResultTreeView.cs b/Plugins/AssetUsageDetector/Editor/SearchResultTreeView.cs index 177becf..21fe8fa 100644 --- a/Plugins/AssetUsageDetector/Editor/SearchResultTreeView.cs +++ b/Plugins/AssetUsageDetector/Editor/SearchResultTreeView.cs @@ -104,11 +104,7 @@ namespace AssetUsageDetectorNamespace } private const float SEARCHED_OBJECTS_BORDER_THICKNESS = 1f; -#if UNITY_2019_3_OR_NEWER - private const float TREE_VIEW_LINES_THICKNESS = 1.5f; // There are inexplicable spaces between the vertical and horizontal lines if we don't change thickness by 0.5f on 2019.3+ -#else - private const float TREE_VIEW_LINES_THICKNESS = 2f; -#endif + private const float TREE_VIEW_LINES_THICKNESS = 1.5f; // There are inexplicable spaces between the vertical and horizontal lines if we set this to 2.0f on 2019.3+ private const float HIGHLIGHTED_TREE_VIEW_LINES_THICKNESS = TREE_VIEW_LINES_THICKNESS * 2f; private readonly new SearchResultTreeViewState state; @@ -127,10 +123,6 @@ namespace AssetUsageDetectorNamespace private bool isSearching; -#if !UNITY_2018_2_OR_NEWER - public int visibleRowTop = 0, visibleRowBottom = int.MaxValue; -#endif - private readonly CompareInfo textComparer = new CultureInfo( "en-US" ).CompareInfo; private readonly CompareOptions textCompareOptions = CompareOptions.IgnoreCase | CompareOptions.IgnoreNonSpace; @@ -150,13 +142,7 @@ namespace AssetUsageDetectorNamespace public new float rowHeight { get { return base.rowHeight; } - set - { - base.rowHeight = value; -#if !UNITY_2019_3_OR_NEWER - customFoldoutYOffset = ( value - EditorGUIUtility.singleLineHeight ) * 0.5f; -#endif - } + set { base.rowHeight = value; } } // Avoid using these properties of TreeView by mistake @@ -183,13 +169,7 @@ namespace AssetUsageDetectorNamespace if( treeType != TreeType.IsolatedView ) { // Draw only the visible rows. This requires setting useScrollView to false because we are using an external scroll view: https://docs.unity3d.com/ScriptReference/IMGUI.Controls.TreeView-useScrollView.html -#if UNITY_2018_2_OR_NEWER useScrollView = false; -#else - // In my tests, SetUseScrollView seems to have no effect unfortunately but let's keep this line in case it fixes some other issues with the external scroll view - object treeViewController = typeof( TreeView ).GetField( "m_TreeView", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance ).GetValue( this ); - treeViewController.GetType().GetMethod( "SetUseScrollView", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance ).Invoke( treeViewController, new object[1] { false } ); -#endif } isSearching = !string.IsNullOrEmpty( state.searchTerm ); @@ -423,12 +403,6 @@ namespace AssetUsageDetectorNamespace protected override void RowGUI( RowGUIArgs args ) { -#if !UNITY_2018_2_OR_NEWER - // Do manual row culling on early Unity versions - if( args.row < visibleRowTop || args.row > visibleRowBottom ) - return; -#endif - if( isTreeViewEmpty ) { EditorGUI.LabelField( args.rowRect, "No matching results..." ); @@ -666,9 +640,6 @@ namespace AssetUsageDetectorNamespace rect.xMin += GetContentIndent( args.item ); rect.y += AssetUsageDetectorSettings.ExtraRowHeight * 0.5f; -#if !UNITY_2019_3_OR_NEWER - rect.y -= 2f; -#endif rect.height += 4f; // Incrementing height fixes cropped icon issue on Unity 2019.2 or earlier if( foldoutLabelStyle == null ) @@ -745,7 +716,6 @@ namespace AssetUsageDetectorNamespace isLMBDown = false; Object clickedObject = GetDataFromId( id ).node.UnityObject; -#if UNITY_2018_3_OR_NEWER if( clickedObject && clickedObject.IsAsset() ) { GameObject clickedPrefabRoot = null; @@ -762,16 +732,11 @@ namespace AssetUsageDetectorNamespace // Try to open the prefab stage of this prefab string assetPath = AssetDatabase.GetAssetPath( clickedPrefabRoot ); PrefabStage openPrefabStage = PrefabStageUtility.GetCurrentPrefabStage(); -#if UNITY_2020_1_OR_NEWER if( openPrefabStage == null || !openPrefabStage.stageHandle.IsValid() || assetPath != openPrefabStage.assetPath ) -#else - if( openPrefabStage == null || !openPrefabStage.stageHandle.IsValid() || assetPath != openPrefabStage.prefabAssetPath ) -#endif AssetDatabase.OpenAsset( clickedPrefabRoot ); } } } -#endif // Ping the clicked GameObject in the open prefab stage Object selection, pingTarget; diff --git a/Plugins/AssetUsageDetector/Editor/Utilities.cs b/Plugins/AssetUsageDetector/Editor/Utilities.cs index 8640fa0..388f088 100644 --- a/Plugins/AssetUsageDetector/Editor/Utilities.cs +++ b/Plugins/AssetUsageDetector/Editor/Utilities.cs @@ -2,9 +2,7 @@ using System.Collections.Generic; using System.Reflection; using System.Text; -#if UNITY_2018_1_OR_NEWER using Unity.Collections; -#endif using UnityEditor; using UnityEditor.SceneManagement; using UnityEngine; @@ -37,23 +35,17 @@ namespace AssetUsageDetectorNamespace typeof( List ), typeof( List ), typeof( List ), typeof( List ), typeof( List ), typeof( List ), typeof( List ), typeof( List ), typeof( List ), typeof( List ), typeof( List ), typeof( List ), typeof( List ), -#if UNITY_2017_2_OR_NEWER typeof( Vector3Int ), typeof( Vector2Int ), typeof( RectInt ), typeof( BoundsInt ), typeof( Vector3Int[] ), typeof( Vector2Int[] ), typeof( RectInt[] ), typeof( BoundsInt[] ), typeof( List ), typeof( List ), typeof( List ), typeof( List ) -#endif }; private static readonly string reflectionNamespace = typeof( Assembly ).Namespace; -#if UNITY_2018_1_OR_NEWER private static readonly string nativeCollectionsNamespace = typeof( NativeArray ).Namespace; -#endif private static MethodInfo screenFittedRectGetter; -#if UNITY_2018_3_OR_NEWER private static readonly Func prefabHasAnyOverridesGetter = (Func) Delegate.CreateDelegate( typeof( Func ), typeof( PrefabUtility ).GetMethod( "HasObjectOverride", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static ) ); -#endif private static readonly HashSet folderContentsSet = new HashSet(); @@ -89,12 +81,7 @@ namespace AssetUsageDetectorNamespace m_boxGUIStyle.hover.textColor = textColor; m_boxGUIStyle.focused.textColor = textColor; m_boxGUIStyle.active.textColor = textColor; - -#if !UNITY_2019_1_OR_NEWER || UNITY_2019_3_OR_NEWER - // On 2019.1 and 2019.2 versions, GUI.skin.button.fontSize returns 0 on some devices - // https://forum.unity.com/threads/asset-usage-detector-find-references-to-an-asset-object-open-source.408134/page-3#post-7285954 m_boxGUIStyle.fontSize = ( m_boxGUIStyle.fontSize + GUI.skin.button.fontSize ) / 2; -#endif } return m_boxGUIStyle; @@ -120,11 +107,7 @@ namespace AssetUsageDetectorNamespace public static T GetPrefabParent( this T obj ) where T : Object { -#if UNITY_2018_3_OR_NEWER return PrefabUtility.GetCorrespondingObjectFromSource( obj ); -#else - return PrefabUtility.GetPrefabParent( obj ) as T; -#endif } public static bool HasAnyPrefabOverrides( this Object obj ) @@ -132,21 +115,7 @@ namespace AssetUsageDetectorNamespace if( obj.GetPrefabParent() == null ) return false; -#if UNITY_2018_3_OR_NEWER return prefabHasAnyOverridesGetter( obj, false ); -#else - SerializedProperty iterator = new SerializedObject( obj ).GetIterator(); - if( iterator.Next( true ) ) - { - do - { - if( iterator.prefabOverride ) - return true; - } while( iterator.NextVisible( false ) ); - } - - return false; -#endif } public static bool HasAnyPrefabOverrides( this GameObject gameObject ) @@ -154,10 +123,8 @@ namespace AssetUsageDetectorNamespace if( gameObject.GetPrefabParent() == null ) return false; -#if UNITY_2018_3_OR_NEWER if( !PrefabUtility.HasPrefabInstanceAnyOverrides( gameObject, false ) ) return false; -#endif Transform rootTransform = gameObject.transform; List components = new List( 8 ); @@ -246,7 +213,6 @@ namespace AssetUsageDetectorNamespace { // Pinging a prefab only works if the pinged object is the root of the prefab or a direct child of it. Pinging any grandchildren // of the prefab doesn't work; in which case, traverse the parent hierarchy until a pingable parent is reached -#if UNITY_2018_3_OR_NEWER Transform objTR = ( (GameObject) obj ).transform.root; PrefabAssetType prefabAssetType = PrefabUtility.GetPrefabAssetType( objTR.gameObject ); @@ -254,11 +220,7 @@ namespace AssetUsageDetectorNamespace { string assetPath = AssetDatabase.GetAssetPath( objTR.gameObject ); PrefabStage openPrefabStage = PrefabStageUtility.GetCurrentPrefabStage(); -#if UNITY_2020_1_OR_NEWER if( openPrefabStage != null && openPrefabStage.stageHandle.IsValid() && assetPath == openPrefabStage.assetPath ) -#else - if( openPrefabStage != null && openPrefabStage.stageHandle.IsValid() && assetPath == openPrefabStage.prefabAssetPath ) -#endif { GameObject prefabStageGO = FollowSymmetricHierarchy( (GameObject) obj, ( (GameObject) obj ).transform.root.gameObject, openPrefabStage.prefabContentsRoot ); if( prefabStageGO != null ) @@ -267,10 +229,8 @@ namespace AssetUsageDetectorNamespace selection = objTR.gameObject; } } -#if UNITY_2019_1_OR_NEWER else if( obj != objTR.gameObject ) selection = objTR.gameObject; -#endif } else if( prefabAssetType == PrefabAssetType.Model ) { @@ -278,11 +238,6 @@ namespace AssetUsageDetectorNamespace while( objTR.parent != null && objTR.parent.parent != null ) objTR = objTR.parent; } -#else - Transform objTR = ( (GameObject) obj ).transform; - while( objTR.parent != null && objTR.parent.parent != null ) - objTR = objTR.parent; -#endif pingTarget = objTR.gameObject; } @@ -377,11 +332,9 @@ namespace AssetUsageDetectorNamespace if( fieldInfo.IsInitOnly ) return false; -#if UNITY_2019_3_OR_NEWER // SerializeReference makes even System.Object fields serializable if( Attribute.IsDefined( fieldInfo, typeof( SerializeReference ) ) ) return true; -#endif if( ( !fieldInfo.IsPublic || fieldInfo.IsNotSerialized ) && !Attribute.IsDefined( fieldInfo, typeof( SerializeField ) ) ) return false; @@ -415,7 +368,6 @@ namespace AssetUsageDetectorNamespace else if( type.IsGenericType ) { // Generic types are allowed on 2020.1 and later -#if UNITY_2020_1_OR_NEWER if( type.GetGenericTypeDefinition() == typeof( List<> ) ) { type = type.GetGenericArguments()[0]; @@ -423,22 +375,8 @@ namespace AssetUsageDetectorNamespace if( typeof( Object ).IsAssignableFrom( type ) ) return true; } -#else - if( type.GetGenericTypeDefinition() != typeof( List<> ) ) - return false; - - type = type.GetGenericArguments()[0]; - - if( typeof( Object ).IsAssignableFrom( type ) ) - return true; -#endif } -#if !UNITY_2020_1_OR_NEWER - if( type.IsGenericType ) - return false; -#endif - return Attribute.IsDefined( type, typeof( SerializableAttribute ), false ); } @@ -448,11 +386,9 @@ namespace AssetUsageDetectorNamespace if( type.IsPrimitive || primitiveUnityTypes.Contains( type ) || type.IsEnum ) return true; -#if UNITY_2018_1_OR_NEWER // Searching NativeArrays for reference can throw InvalidOperationException if the collection is disposed if( type.Namespace == nativeCollectionsNamespace ) return true; -#endif // Searching assembly variables for reference throws InvalidCastException on .NET 4.0 runtime if( typeof( Type ).IsAssignableFrom( type ) || type.Namespace == reflectionNamespace ) diff --git a/Plugins/AssetUsageDetector/README.txt b/Plugins/AssetUsageDetector/README.txt index bffc329..ef2380d 100644 --- a/Plugins/AssetUsageDetector/README.txt +++ b/Plugins/AssetUsageDetector/README.txt @@ -1,4 +1,4 @@ -= Asset Usage Detector (v2.5.5) = += Asset Usage Detector (v2.5.6) = 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 0a52167..dd355e7 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "com.yasirkula.assetusagedetector", "displayName": "Asset Usage Detector", - "version": "2.5.5", + "version": "2.5.6", "documentationUrl": "https://github.com/yasirkula/UnityAssetUsageDetector", "changelogUrl": "https://github.com/yasirkula/UnityAssetUsageDetector/releases", "licensesUrl": "https://github.com/yasirkula/UnityAssetUsageDetector/blob/master/LICENSE.txt",