diff --git a/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs b/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs index 6a98605..1f3c6ed 100644 --- a/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs +++ b/Plugins/AssetUsageDetector/Editor/AssetUsageDetector.cs @@ -10,6 +10,10 @@ using System; using System.IO; using System.Text; using Object = UnityEngine.Object; +#if UNITY_2018_3_OR_NEWER +using PrefabStage = UnityEditor.Experimental.SceneManagement.PrefabStage; +using PrefabStageUtility = UnityEditor.Experimental.SceneManagement.PrefabStageUtility; +#endif namespace AssetUsageDetectorNamespace { @@ -79,8 +83,11 @@ namespace AssetUsageDetectorNamespace private bool isInPlayMode; #if UNITY_2018_3_OR_NEWER - private UnityEditor.Experimental.SceneManagement.PrefabStage openPrefabStage; + private PrefabStage openPrefabStage; private GameObject openPrefabStagePrefabAsset; +#if UNITY_2020_1_OR_NEWER + private GameObject openPrefabStageContextObject; +#endif #endif private int searchedObjectsCount; // Number of searched objects @@ -116,7 +123,7 @@ namespace AssetUsageDetectorNamespace #if UNITY_2018_3_OR_NEWER openPrefabStagePrefabAsset = null; string openPrefabStageAssetPath = null; - openPrefabStage = UnityEditor.Experimental.SceneManagement.PrefabStageUtility.GetCurrentPrefabStage(); + openPrefabStage = PrefabStageUtility.GetCurrentPrefabStage(); if( openPrefabStage != null ) { if( !openPrefabStage.stageHandle.IsValid() ) @@ -130,8 +137,17 @@ namespace AssetUsageDetectorNamespace return new SearchResult( false, null, null, this, searchParameters ); } - openPrefabStagePrefabAsset = AssetDatabase.LoadAssetAtPath( openPrefabStage.prefabAssetPath ); - openPrefabStageAssetPath = openPrefabStage.prefabAssetPath; +#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 @@ -583,7 +599,28 @@ namespace AssetUsageDetectorNamespace #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 ) ) - AssetDatabase.OpenAsset( AssetDatabase.LoadAssetAtPath( openPrefabStageAssetPath ) ); + { +#if UNITY_2020_1_OR_NEWER + bool shouldOpenPrefabStageWithoutContext = true; + if( openPrefabStageContextObject != null && !openPrefabStageContextObject.Equals( null ) ) + { + try + { + // Try to access this method: https://github.com/Unity-Technologies/UnityCsReference/blob/73925b1711847c067e607ec8371f8e9ffe7ab65d/Editor/Mono/SceneManagement/StageManager/PrefabStage/PrefabStageUtility.cs#L61-L65 + MethodInfo prefabStageOpenerWithContext = typeof( PrefabStageUtility ).GetMethod( "OpenPrefab", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static, null, new Type[2] { typeof( string ), typeof( GameObject ) }, null ); + if( prefabStageOpenerWithContext != null ) + { + prefabStageOpenerWithContext.Invoke( null, new object[2] { openPrefabStageAssetPath, openPrefabStageContextObject } ); + shouldOpenPrefabStageWithoutContext = false; + } + } + catch { } + } + + if( shouldOpenPrefabStageWithoutContext ) +#endif + AssetDatabase.OpenAsset( AssetDatabase.LoadAssetAtPath( openPrefabStageAssetPath ) ); + } #endif } } diff --git a/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSearchFunctions.cs b/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSearchFunctions.cs index 77d0852..09c4e8b 100644 --- a/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSearchFunctions.cs +++ b/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorSearchFunctions.cs @@ -165,9 +165,6 @@ namespace AssetUsageDetectorNamespace private readonly Dictionary typeToVariables = new Dictionary( 4096 ); private readonly List validVariables = new List( 32 ); - // Dictionary to store whether or not instances of a Type can be searched with SearchVariablesWithSerializedObject - private readonly Dictionary typesSearchabilityWithSerializedObject = new Dictionary( 4096 ); - // Path(s) of .cginc, .cg, .hlsl and .glslinc assets in assetsToSearchSet private readonly HashSet shaderIncludesToSearchSet = new HashSet(); @@ -194,6 +191,10 @@ namespace AssetUsageDetectorNamespace private BindingFlags fieldModifiers, propertyModifiers; private BindingFlags prevFieldModifiers, prevPropertyModifiers; + // Unity's internal function that returns a SerializedProperty's corresponding FieldInfo + private delegate FieldInfo FieldInfoGetter( SerializedProperty p, out Type t ); + private FieldInfoGetter fieldInfoGetter; + private void InitializeSearchFunctionsData( Parameters searchParameters ) { if( typeToSearchFunction == null ) @@ -330,6 +331,13 @@ namespace AssetUsageDetectorNamespace alwaysSearchedExtensionsSet.Add( "shadersubgraph" ); } #endif + +#if UNITY_2019_3_OR_NEWER + MethodInfo fieldInfoGetterMethod = typeof( Editor ).Assembly.GetType( "UnityEditor.ScriptAttributeUtility" ).GetMethod( "GetFieldInfoAndStaticTypeFromProperty", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static ); +#else + MethodInfo fieldInfoGetterMethod = typeof( Editor ).Assembly.GetType( "UnityEditor.ScriptAttributeUtility" ).GetMethod( "GetFieldInfoFromProperty", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static ); +#endif + fieldInfoGetter = (FieldInfoGetter) Delegate.CreateDelegate( typeof( FieldInfoGetter ), fieldInfoGetterMethod ); } private ReferenceNode SearchGameObject( Object unityObject ) @@ -967,29 +975,33 @@ namespace AssetUsageDetectorNamespace { if( !isInPlayMode || referenceNode.nodeObject.IsAsset() ) { - // Some Types can be searched with SearchVariablesWithReflection only - Type nodeObjectType = referenceNode.nodeObject.GetType(); - bool typeSearchability; - if( !typesSearchabilityWithSerializedObject.TryGetValue( nodeObjectType, out typeSearchability ) ) - { - // typesSearchabilityWithSerializedObject is updated when GetFilteredVariablesForType is called - GetFilteredVariablesForType( nodeObjectType ); - typeSearchability = typesSearchabilityWithSerializedObject[nodeObjectType]; - } - - if( !typeSearchability ) - { - SearchVariablesWithReflection( referenceNode ); - return; - } - SerializedObject so = new SerializedObject( (Object) referenceNode.nodeObject ); SerializedProperty iterator = so.GetIterator(); - if( iterator.NextVisible( true ) ) + SerializedProperty iteratorVisible = so.GetIterator(); + if( iterator.Next( true ) ) { + bool iteratingVisible = iteratorVisible.NextVisible( true ); bool enterChildren; do { + // Iterate over NextVisible properties AND the properties that have corresponding FieldInfos (internal Unity + // properties don't have FieldInfos so we are skipping them, which is good because search results found in + // those properties aren't interesting and mostly confusing) + bool isVisible = iteratingVisible && SerializedProperty.EqualContents( iterator, iteratorVisible ); + if( isVisible ) + iteratingVisible = iteratorVisible.NextVisible( true ); + else + { + Type propFieldType; + isVisible = iterator.type == "Array" || fieldInfoGetter( iterator, out propFieldType ) != null; + } + + if( !isVisible ) + { + enterChildren = false; + continue; + } + ReferenceNode searchResult; switch( iterator.propertyType ) { @@ -1001,6 +1013,12 @@ namespace AssetUsageDetectorNamespace searchResult = SearchObject( iterator.exposedReferenceValue ); enterChildren = false; break; +#if UNITY_2019_3_OR_NEWER + case SerializedPropertyType.ManagedReference: + searchResult = SearchObject( GetRawSerializedPropertyValue( iterator ) ); + enterChildren = false; + break; +#endif case SerializedPropertyType.Generic: searchResult = null; enterChildren = true; @@ -1019,7 +1037,7 @@ namespace AssetUsageDetectorNamespace if( !propertyPath.EndsWithFast( "m_RD.texture" ) ) referenceNode.AddLinkTo( searchResult, "Variable: " + propertyPath ); } - } while( iterator.NextVisible( enterChildren ) ); + } while( iterator.Next( enterChildren ) ); return; } @@ -1084,10 +1102,6 @@ namespace AssetUsageDetectorNamespace if( typeToVariables.TryGetValue( type, out result ) ) return result; - // SearchVariablesWithSerializedObject function can't iterate over fields that have HideInInspector - // or SerializeReference attributes. Types that have such variables must be searched with reflection - bool searchabilityWithSerializedObject = true; - // This is the first time this type of object is seen, filter and cache its variables // Variable filtering process: // 1- skip Obsolete variables @@ -1126,17 +1140,7 @@ namespace AssetUsageDetectorNamespace VariableGetVal getter = field.CreateGetter( type ); if( getter != null ) - { validVariables.Add( new VariableGetterHolder( field, getter, searchSerializableVariablesOnly ? field.IsSerializable() : true ) ); - - if( searchabilityWithSerializedObject && Attribute.IsDefined( field, typeof( HideInInspector ) ) ) - searchabilityWithSerializedObject = false; - -#if UNITY_2019_3_OR_NEWER - if( searchabilityWithSerializedObject && Attribute.IsDefined( field, typeof( SerializeReference ) ) ) - searchabilityWithSerializedObject = false; -#endif - } } currType = currType.BaseType; @@ -1215,11 +1219,87 @@ namespace AssetUsageDetectorNamespace // Cache the filtered fields typeToVariables.Add( type, result ); - typesSearchabilityWithSerializedObject.Add( type, searchabilityWithSerializedObject ); return result; } + // Credit: http://answers.unity.com/answers/425602/view.html + // Returns the raw System.Object value of a SerializedProperty + public object GetRawSerializedPropertyValue( SerializedProperty property ) + { + object result = property.serializedObject.targetObject; + string[] path = property.propertyPath.Replace( ".Array.data[", "[" ).Split( '.' ); + for( int i = 0; i < path.Length; i++ ) + { + string pathElement = path[i]; + + int arrayStartIndex = pathElement.IndexOf( '[' ); + if( arrayStartIndex < 0 ) + result = GetFieldValue( result, pathElement ); + else + { + string variableName = pathElement.Substring( 0, arrayStartIndex ); + + int arrayEndIndex = pathElement.IndexOf( ']', arrayStartIndex + 1 ); + int arrayElementIndex = int.Parse( pathElement.Substring( arrayStartIndex + 1, arrayEndIndex - arrayStartIndex - 1 ) ); + result = GetFieldValue( result, variableName, arrayElementIndex ); + } + } + + return result; + } + + // Credit: http://answers.unity.com/answers/425602/view.html + private object GetFieldValue( object source, string fieldName ) + { + if( source == null ) + return null; + + FieldInfo fieldInfo = null; + Type type = source.GetType(); + while( fieldInfo == null && type != typeof( object ) ) + { + fieldInfo = type.GetField( fieldName, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly ); + type = type.BaseType; + } + + if( fieldInfo != null ) + return fieldInfo.GetValue( source ); + + PropertyInfo propertyInfo = null; + type = source.GetType(); + while( propertyInfo == null && type != typeof( object ) ) + { + propertyInfo = type.GetProperty( fieldName, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly | BindingFlags.IgnoreCase ); + type = type.BaseType; + } + + if( propertyInfo != null ) + return propertyInfo.GetValue( source, null ); + + if( fieldName.Length > 2 && fieldName.StartsWith( "m_", StringComparison.OrdinalIgnoreCase ) ) + return GetFieldValue( source, fieldName.Substring( 2 ) ); + + return null; + } + + // Credit: http://answers.unity.com/answers/425602/view.html + private object GetFieldValue( object source, string fieldName, int arrayIndex ) + { + IEnumerable enumerable = GetFieldValue( source, fieldName ) as IEnumerable; + if( enumerable == null ) + return null; + + if( enumerable is IList ) + return ( (IList) enumerable )[arrayIndex]; + + IEnumerator enumerator = enumerable.GetEnumerator(); + for( int i = 0; i <= arrayIndex; i++ ) + enumerator.MoveNext(); + + return enumerator.Current; + } + // Iterates over all occurrences of specific key-value pairs in string // Example1: #include "VALUE" valuePrefix=#include, valueWrapperChar=" // Example2: "guid": "VALUE" valuePrefix="guid", valueWrapperChar=" diff --git a/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs b/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs index 0c1a34a..903bfbc 100644 --- a/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs +++ b/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs @@ -5,6 +5,10 @@ using UnityEditor; using System.Collections.Generic; using System.Reflection; using Object = UnityEngine.Object; +#if UNITY_2018_3_OR_NEWER +using PrefabStage = UnityEditor.Experimental.SceneManagement.PrefabStage; +using PrefabStageUtility = UnityEditor.Experimental.SceneManagement.PrefabStageUtility; +#endif namespace AssetUsageDetectorNamespace { @@ -236,15 +240,15 @@ namespace AssetUsageDetectorNamespace mainWindow = this; #if UNITY_2018_3_OR_NEWER - UnityEditor.Experimental.SceneManagement.PrefabStage.prefabStageClosing -= ReplacePrefabStageObjectsWithAssets; - UnityEditor.Experimental.SceneManagement.PrefabStage.prefabStageClosing += ReplacePrefabStageObjectsWithAssets; + PrefabStage.prefabStageClosing -= ReplacePrefabStageObjectsWithAssets; + PrefabStage.prefabStageClosing += ReplacePrefabStageObjectsWithAssets; #endif } private void OnDisable() { #if UNITY_2018_3_OR_NEWER - UnityEditor.Experimental.SceneManagement.PrefabStage.prefabStageClosing -= ReplacePrefabStageObjectsWithAssets; + PrefabStage.prefabStageClosing -= ReplacePrefabStageObjectsWithAssets; #endif if( mainWindow == this ) @@ -647,7 +651,7 @@ namespace AssetUsageDetectorNamespace SavePrefs(); #if UNITY_2018_3_OR_NEWER - ReplacePrefabStageObjectsWithAssets( UnityEditor.Experimental.SceneManagement.PrefabStageUtility.GetCurrentPrefabStage() ); + ReplacePrefabStageObjectsWithAssets( PrefabStageUtility.GetCurrentPrefabStage() ); #endif // Start searching @@ -676,13 +680,17 @@ namespace AssetUsageDetectorNamespace #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( UnityEditor.Experimental.SceneManagement.PrefabStage prefabStage ) + 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 ); - if( prefabAsset == null ) +#endif + if( prefabAsset == null || prefabAsset.Equals( null ) ) return; for( int i = 0; i < objectsToSearch.Count; i++ ) diff --git a/Plugins/AssetUsageDetector/Editor/Utilities.cs b/Plugins/AssetUsageDetector/Editor/Utilities.cs index 7d164b0..50110c3 100644 --- a/Plugins/AssetUsageDetector/Editor/Utilities.cs +++ b/Plugins/AssetUsageDetector/Editor/Utilities.cs @@ -10,6 +10,10 @@ using UnityEditor.SceneManagement; using UnityEngine; using UnityEngine.SceneManagement; using Object = UnityEngine.Object; +#if UNITY_2018_3_OR_NEWER +using PrefabStage = UnityEditor.Experimental.SceneManagement.PrefabStage; +using PrefabStageUtility = UnityEditor.Experimental.SceneManagement.PrefabStageUtility; +#endif namespace AssetUsageDetectorNamespace { @@ -235,20 +239,28 @@ namespace AssetUsageDetectorNamespace if( prefabAssetType == PrefabAssetType.Regular || prefabAssetType == PrefabAssetType.Variant ) { string assetPath = AssetDatabase.GetAssetPath( objTR.gameObject ); - var openPrefabStage = UnityEditor.Experimental.SceneManagement.PrefabStageUtility.GetCurrentPrefabStage(); + PrefabStage openPrefabStage = PrefabStageUtility.GetCurrentPrefabStage(); // Try to open the prefab stage of pinged prefabs if they are double clicked if( previousPingedPrefabInstanceId == objTR.GetInstanceID() && EditorApplication.timeSinceStartup - previousPingedPrefabPingTime <= 0.3f && +#if UNITY_2020_1_OR_NEWER + ( openPrefabStage == null || !openPrefabStage.stageHandle.IsValid() || assetPath != openPrefabStage.assetPath ) ) +#else ( openPrefabStage == null || !openPrefabStage.stageHandle.IsValid() || assetPath != openPrefabStage.prefabAssetPath ) ) +#endif { AssetDatabase.OpenAsset( objTR.gameObject ); - openPrefabStage = UnityEditor.Experimental.SceneManagement.PrefabStageUtility.GetCurrentPrefabStage(); + openPrefabStage = PrefabStageUtility.GetCurrentPrefabStage(); } previousPingedPrefabInstanceId = objTR.GetInstanceID(); previousPingedPrefabPingTime = EditorApplication.timeSinceStartup; +#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 ) @@ -318,9 +330,17 @@ namespace AssetUsageDetectorNamespace // Check if the field is serializable public static bool IsSerializable( this FieldInfo fieldInfo ) { - // see Serialization Rules: https://docs.unity3d.com/Manual/script-Serialization.html - if( fieldInfo.IsInitOnly || ( ( !fieldInfo.IsPublic || fieldInfo.IsNotSerialized ) && - !Attribute.IsDefined( fieldInfo, typeof( SerializeField ) ) ) ) + // See Serialization Rules: https://docs.unity3d.com/Manual/script-Serialization.html + 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; return IsTypeSerializable( fieldInfo.FieldType ); @@ -351,6 +371,16 @@ 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]; + + if( typeof( Object ).IsAssignableFrom( type ) ) + return true; + } +#else if( type.GetGenericTypeDefinition() != typeof( List<> ) ) return false; @@ -358,10 +388,13 @@ namespace AssetUsageDetectorNamespace 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 ); } diff --git a/package.json b/package.json index 7805a01..2c75b9b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "com.yasirkula.assetusagedetector", "displayName": "Asset Usage Detector", - "version": "1.8.2", + "version": "1.8.4", "description": "This editor extension helps you figure out at which places an asset or GameObject is used, i.e. lists the objects that refer to the asset. It is possible to search for references in the Assets folder (Project view) and/or in the scene(s) of your project. You can also search for references while in Play mode!" }