Compare commits

...

3 Commits

Author SHA1 Message Date
Süleyman Yasir KULA 7738da9d19 "Search for References-Include Children" didn't include inactive child objects in search, fixed 2020-09-23 23:12:47 +03:00
Süleyman Yasir KULA 077505a217 Fixed a rare issue that occurs when searching properties with ref returns for references in Play mode 2020-08-20 12:24:37 +03:00
Süleyman Yasir KULA 003cedd363 - Added 2 options to the "Search for References" button in Hierarchy objects' context (right-click) menu: "This Object Only" and "Include Children"
- In search results, "arrayVariable.Array.data[0]" is now displayed as "arrayVariable[0]"
2020-08-08 19:52:59 +03:00
5 changed files with 43 additions and 25 deletions
@@ -1035,7 +1035,7 @@ namespace AssetUsageDetectorNamespace
// m_RD.texture is a redundant reference that shows up when searching sprites // m_RD.texture is a redundant reference that shows up when searching sprites
if( !propertyPath.EndsWithFast( "m_RD.texture" ) ) if( !propertyPath.EndsWithFast( "m_RD.texture" ) )
referenceNode.AddLinkTo( searchResult, "Variable: " + propertyPath ); referenceNode.AddLinkTo( searchResult, "Variable: " + propertyPath.Replace( ".Array.data[", "[" ) ); // "arrayVariable.Array.data[0]" becomes "arrayVariable[0]"
} }
} while( iterator.Next( enterChildren ) ); } while( iterator.Next( enterChildren ) );
@@ -124,14 +124,13 @@ namespace AssetUsageDetectorNamespace
} }
// Quickly initiate search for the selected assets // Quickly initiate search for the selected assets
[MenuItem( "GameObject/Search for References", priority = 49 )] [MenuItem( "GameObject/Search for References/This Object Only", priority = 49 )]
[MenuItem( "Assets/Search for References", priority = 1000 )] [MenuItem( "Assets/Search for References", priority = 1000 )]
private static void SearchSelectedAssetReferences( MenuCommand command ) private static void SearchSelectedAssetReferences( MenuCommand command )
{ {
// This happens when this button is clicked via hierarchy's right click context menu // This happens when this button is clicked via hierarchy's right click context menu
// and is called once for each object in the selection. We don't want that, we want // and is called once for each object in the selection. We don't want that, we want
// the function to be called only once so that there aren't multiple empty parents // the function to be called only once
// generated in one call
if( command.context ) if( command.context )
{ {
EditorApplication.update -= CallSearchSelectedAssetReferencesOnce; EditorApplication.update -= CallSearchSelectedAssetReferencesOnce;
@@ -141,8 +140,21 @@ namespace AssetUsageDetectorNamespace
ShowAndSearch( Selection.objects ); ShowAndSearch( Selection.objects );
} }
[MenuItem( "GameObject/Search for References/Include Children", priority = 49 )]
private static void SearchSelectedAssetReferencesWithChildren( MenuCommand command )
{
if( command.context )
{
EditorApplication.update -= CallSearchSelectedAssetReferencesWithChildrenOnce;
EditorApplication.update += CallSearchSelectedAssetReferencesWithChildrenOnce;
}
else
ShowAndSearch( Selection.objects, true );
}
// Show the menu item only if there is a selection in the Editor // Show the menu item only if there is a selection in the Editor
[MenuItem( "GameObject/Search for References", validate = true )] [MenuItem( "GameObject/Search for References/This Object Only", validate = true )]
[MenuItem( "GameObject/Search for References/Include Children", validate = true )]
[MenuItem( "Assets/Search for References", validate = true )] [MenuItem( "Assets/Search for References", validate = true )]
private static bool SearchSelectedAssetReferencesValidate( MenuCommand command ) private static bool SearchSelectedAssetReferencesValidate( MenuCommand command )
{ {
@@ -150,13 +162,13 @@ namespace AssetUsageDetectorNamespace
} }
// Quickly show the AssetUsageDetector window and initiate a search // Quickly show the AssetUsageDetector window and initiate a search
public static void ShowAndSearch( IEnumerable<Object> searchObjects ) public static void ShowAndSearch( IEnumerable<Object> searchObjects, bool? shouldSearchChildren = null )
{ {
ShowAndSearchInternal( searchObjects, null ); ShowAndSearchInternal( searchObjects, null, shouldSearchChildren );
} }
// Quickly show the AssetUsageDetector window and initiate a search // Quickly show the AssetUsageDetector window and initiate a search
public static void ShowAndSearch( AssetUsageDetector.Parameters searchParameters ) public static void ShowAndSearch( AssetUsageDetector.Parameters searchParameters, bool? shouldSearchChildren = null )
{ {
if( searchParameters == null ) if( searchParameters == null )
{ {
@@ -164,7 +176,7 @@ namespace AssetUsageDetectorNamespace
return; return;
} }
ShowAndSearchInternal( searchParameters.objectsToSearch, searchParameters ); ShowAndSearchInternal( searchParameters.objectsToSearch, searchParameters, shouldSearchChildren );
} }
private static void CallSearchSelectedAssetReferencesOnce() private static void CallSearchSelectedAssetReferencesOnce()
@@ -173,7 +185,13 @@ namespace AssetUsageDetectorNamespace
SearchSelectedAssetReferences( new MenuCommand( null ) ); SearchSelectedAssetReferences( new MenuCommand( null ) );
} }
private static void ShowAndSearchInternal( IEnumerable<Object> searchObjects, AssetUsageDetector.Parameters searchParameters ) private static void CallSearchSelectedAssetReferencesWithChildrenOnce()
{
EditorApplication.update -= CallSearchSelectedAssetReferencesWithChildrenOnce;
SearchSelectedAssetReferencesWithChildren( new MenuCommand( null ) );
}
private static void ShowAndSearchInternal( IEnumerable<Object> searchObjects, AssetUsageDetector.Parameters searchParameters, bool? shouldSearchChildren )
{ {
if( mainWindow != null && !mainWindow.ReturnToSetupPhase( true ) ) if( mainWindow != null && !mainWindow.ReturnToSetupPhase( true ) )
{ {
@@ -187,7 +205,7 @@ namespace AssetUsageDetectorNamespace
if( searchObjects != null ) if( searchObjects != null )
{ {
foreach( Object obj in searchObjects ) foreach( Object obj in searchObjects )
mainWindow.objectsToSearch.Add( new ObjectToSearch( obj ) ); mainWindow.objectsToSearch.Add( new ObjectToSearch( obj, shouldSearchChildren ) );
} }
if( searchParameters != null ) if( searchParameters != null )
@@ -29,13 +29,13 @@ namespace AssetUsageDetectorNamespace
private static MonoScript[] monoScriptsInProject; private static MonoScript[] monoScriptsInProject;
private static HashSet<Object> currentSubAssets; private static HashSet<Object> currentSubAssets;
public ObjectToSearch( Object obj ) public ObjectToSearch( Object obj, bool? shouldSearchChildren = null )
{ {
this.obj = obj; this.obj = obj;
RefreshSubAssets(); RefreshSubAssets( shouldSearchChildren );
} }
public void RefreshSubAssets() public void RefreshSubAssets( bool? shouldSearchChildren = null )
{ {
if( subAssets == null ) if( subAssets == null )
subAssets = new List<SubAsset>(); subAssets = new List<SubAsset>();
@@ -47,11 +47,11 @@ namespace AssetUsageDetectorNamespace
else else
currentSubAssets.Clear(); currentSubAssets.Clear();
AddSubAssets( obj, false ); AddSubAssets( obj, false, shouldSearchChildren );
currentSubAssets.Clear(); currentSubAssets.Clear();
} }
private void AddSubAssets( Object target, bool includeTarget ) private void AddSubAssets( Object target, bool includeTarget, bool? shouldSearchChildren )
{ {
if( target == null || target.Equals( null ) ) if( target == null || target.Equals( null ) )
return; return;
@@ -65,13 +65,13 @@ namespace AssetUsageDetectorNamespace
// If this is a scene object, add its child objects to the sub-assets list // If this is a scene object, add its child objects to the sub-assets list
// but don't include them in the search by default // but don't include them in the search by default
Transform goTransform = go.transform; Transform goTransform = go.transform;
Transform[] children = go.GetComponentsInChildren<Transform>(); Transform[] children = go.GetComponentsInChildren<Transform>( true );
for( int i = 0; i < children.Length; i++ ) for( int i = 0; i < children.Length; i++ )
{ {
if( ReferenceEquals( children[i], goTransform ) ) if( ReferenceEquals( children[i], goTransform ) )
continue; continue;
subAssets.Add( new SubAsset( children[i].gameObject, false ) ); subAssets.Add( new SubAsset( children[i].gameObject, shouldSearchChildren ?? false ) );
} }
} }
else else
@@ -83,7 +83,7 @@ namespace AssetUsageDetectorNamespace
{ {
if( !currentSubAssets.Contains( target ) ) if( !currentSubAssets.Contains( target ) )
{ {
subAssets.Add( new SubAsset( target, true ) ); subAssets.Add( new SubAsset( target, shouldSearchChildren ?? true ) );
currentSubAssets.Add( target ); currentSubAssets.Add( target );
} }
} }
@@ -93,7 +93,7 @@ namespace AssetUsageDetectorNamespace
if( target.IsFolder() ) if( target.IsFolder() )
{ {
foreach( string filePath in Utilities.EnumerateFolderContents( target ) ) foreach( string filePath in Utilities.EnumerateFolderContents( target ) )
AddSubAssets( AssetDatabase.LoadAssetAtPath<Object>( filePath ), true ); AddSubAssets( AssetDatabase.LoadAssetAtPath<Object>( filePath ), true, shouldSearchChildren );
return; return;
} }
@@ -112,7 +112,7 @@ namespace AssetUsageDetectorNamespace
if( asset != target ) if( asset != target )
{ {
subAssets.Add( new SubAsset( asset, true ) ); subAssets.Add( new SubAsset( asset, shouldSearchChildren ?? true ) );
currentSubAssets.Add( asset ); currentSubAssets.Add( asset );
} }
@@ -142,7 +142,7 @@ namespace AssetUsageDetectorNamespace
if( !currentSubAssets.Contains( monoScriptsInProject[j] ) ) if( !currentSubAssets.Contains( monoScriptsInProject[j] ) )
{ {
subAssets.Add( new SubAsset( monoScriptsInProject[j], true ) ); subAssets.Add( new SubAsset( monoScriptsInProject[j], shouldSearchChildren ?? true ) );
currentSubAssets.Add( monoScriptsInProject[j] ); currentSubAssets.Add( monoScriptsInProject[j] );
} }
} }
@@ -415,8 +415,8 @@ namespace AssetUsageDetectorNamespace
if( typeof( Type ).IsAssignableFrom( type ) || type.Namespace == reflectionNamespace ) if( typeof( Type ).IsAssignableFrom( type ) || type.Namespace == reflectionNamespace )
return true; return true;
// Searching pointer variables for reference throws ArgumentException // Searching pointers or ref variables for reference throws ArgumentException
if( type.IsPointer ) if( type.IsPointer || type.IsByRef )
return true; return true;
return false; return false;
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "com.yasirkula.assetusagedetector", "name": "com.yasirkula.assetusagedetector",
"displayName": "Asset Usage Detector", "displayName": "Asset Usage Detector",
"version": "1.8.4", "version": "1.8.7",
"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!" "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!"
} }