Compare commits

...

3 Commits

3 changed files with 93 additions and 53 deletions
@@ -547,45 +547,10 @@ namespace AssetUsageDetectorNamespace
} }
catch( Exception e ) catch( Exception e )
{ {
StringBuilder sb = new StringBuilder( objectsToSearchSet.Count * 50 + callStack.Count * 50 + 500 ); StringBuilder sb = new StringBuilder( objectsToSearchSet.Count * 50 + callStack.Count * 50 + 1000 );
sb.AppendLine( "<b>AssetUsageDetector Error:</b>" ).AppendLine().Append( e ).AppendLine(); sb.AppendLine( "<b>AssetUsageDetector Error:</b>" ).AppendLine().Append( e ).AppendLine();
Object latestUnityObjectInCallStack = null; Object latestUnityObjectInCallStack = AppendCallStackToStringBuilder( sb );
if( callStack.Count > 0 )
{
sb.AppendLine( "Stack contents: " );
for( int i = callStack.Count - 1; i >= 0; i-- )
{
latestUnityObjectInCallStack = callStack[i] as Object;
if( latestUnityObjectInCallStack )
{
if( !AssetDatabase.Contains( latestUnityObjectInCallStack ) )
{
string scenePath = AssetDatabase.GetAssetOrScenePath( latestUnityObjectInCallStack );
if( !string.IsNullOrEmpty( scenePath ) && SceneManager.GetSceneByPath( scenePath ).IsValid() )
sb.Append( "Scene: " ).AppendLine( scenePath );
}
break;
}
}
for( int i = callStack.Count - 1; i >= 0; i-- )
{
sb.Append( i ).Append( ": " );
Object unityObject = callStack[i] as Object;
if( unityObject )
sb.Append( unityObject.name ).Append( " (" ).Append( unityObject.GetType() ).AppendLine( ")" );
else if( callStack[i] != null )
sb.Append( callStack[i].GetType() ).AppendLine( " object" );
else
sb.AppendLine( "<<destroyed>>" );
}
sb.AppendLine();
}
sb.AppendLine( "Searching references of: " ); sb.AppendLine( "Searching references of: " );
foreach( Object obj in objectsToSearchSet ) foreach( Object obj in objectsToSearchSet )
@@ -635,7 +600,9 @@ namespace AssetUsageDetectorNamespace
if( shouldOpenPrefabStageWithoutContext ) if( shouldOpenPrefabStageWithoutContext )
#endif #endif
AssetDatabase.OpenAsset( AssetDatabase.LoadAssetAtPath<GameObject>( openPrefabStageAssetPath ) ); {
AssetDatabase.OpenAsset( AssetDatabase.LoadAssetAtPath<GameObject>( openPrefabStageAssetPath ) );
}
} }
#endif #endif
} }
@@ -1106,5 +1073,48 @@ namespace AssetUsageDetectorNamespace
Object.DestroyImmediate( temp ); Object.DestroyImmediate( temp );
} }
} }
// Appends contents of callStack to StringBuilder and returns the most recent Unity object in callStack
private Object AppendCallStackToStringBuilder( StringBuilder sb )
{
Object latestUnityObjectInCallStack = null;
if( callStack.Count > 0 )
{
sb.AppendLine().AppendLine( "Stack contents: " );
for( int i = callStack.Count - 1; i >= 0; i-- )
{
latestUnityObjectInCallStack = callStack[i] as Object;
if( latestUnityObjectInCallStack )
{
if( !AssetDatabase.Contains( latestUnityObjectInCallStack ) )
{
string scenePath = AssetDatabase.GetAssetOrScenePath( latestUnityObjectInCallStack );
if( !string.IsNullOrEmpty( scenePath ) && SceneManager.GetSceneByPath( scenePath ).IsValid() )
sb.Append( "Scene: " ).AppendLine( scenePath );
}
break;
}
}
for( int i = callStack.Count - 1; i >= 0; i-- )
{
sb.Append( i ).Append( ": " );
Object unityObject = callStack[i] as Object;
if( unityObject )
sb.Append( unityObject.name ).Append( " (" ).Append( unityObject.GetType() ).AppendLine( ")" );
else if( callStack[i] != null )
sb.Append( callStack[i].GetType() ).AppendLine( " object" );
else
sb.AppendLine( "<<destroyed>>" );
}
sb.AppendLine();
}
return latestUnityObjectInCallStack;
}
} }
} }
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Collections; using System.Collections;
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;
using System.Text;
using UnityEditor; using UnityEditor;
using UnityEditor.Animations; using UnityEditor.Animations;
using UnityEngine; using UnityEngine;
@@ -399,7 +400,11 @@ namespace AssetUsageDetectorNamespace
try try
{ {
ParticleSystem.CollisionModule collisionModule = particleSystem.collision; 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++ ) for( int i = 0, j = collisionModule.maxPlaneCount; i < j; i++ )
#endif
referenceNode.AddLinkTo( SearchObject( collisionModule.GetPlane( i ) ), "Collision Module: Plane" ); referenceNode.AddLinkTo( SearchObject( collisionModule.GetPlane( i ) ), "Collision Module: Plane" );
} }
catch { } catch { }
@@ -407,7 +412,11 @@ namespace AssetUsageDetectorNamespace
try try
{ {
ParticleSystem.TriggerModule triggerModule = particleSystem.trigger; 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++ ) for( int i = 0, j = triggerModule.maxColliderCount; i < j; i++ )
#endif
referenceNode.AddLinkTo( SearchObject( triggerModule.GetCollider( i ) ), "Trigger Module: Collider" ); referenceNode.AddLinkTo( SearchObject( triggerModule.GetCollider( i ) ), "Trigger Module: Collider" );
} }
catch { } catch { }
@@ -1020,26 +1029,38 @@ namespace AssetUsageDetectorNamespace
SerializedProperty iteratorVisible = so.GetIterator(); SerializedProperty iteratorVisible = so.GetIterator();
if( iterator.Next( true ) ) if( iterator.Next( true ) )
{ {
string assetPath = AssetDatabase.GetAssetPath( (Object) referenceNode.nodeObject );
bool isProjectSettings = !string.IsNullOrEmpty( assetPath ) && assetPath.StartsWithFast( "ProjectSettings/" );
bool iteratingVisible = iteratorVisible.NextVisible( true ); bool iteratingVisible = iteratorVisible.NextVisible( true );
bool enterChildren; bool enterChildren;
do do
{ {
// Iterate over NextVisible properties AND the properties that have corresponding FieldInfos (internal Unity if( isProjectSettings )
// 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) // Search Project Settings in full because for some reason, important settings like SRP asset
bool isVisible = iteratingVisible && SerializedProperty.EqualContents( iterator, iteratorVisible ); // slot in Quality Settings aren't searched when iterating over only visible properties
if( isVisible ) enterChildren = true;
iteratingVisible = iteratorVisible.NextVisible( true ); }
else else
{ {
Type propFieldType; // Iterate over NextVisible properties AND the properties that have corresponding FieldInfos (internal Unity
isVisible = iterator.type == "Array" || fieldInfoGetter( iterator, out propFieldType ) != null; // 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 ) if( !isVisible )
{ {
enterChildren = false; enterChildren = false;
continue; continue;
}
} }
ReferenceNode searchResult; ReferenceNode searchResult;
@@ -1101,7 +1122,7 @@ namespace AssetUsageDetectorNamespace
try try
{ {
object variableValue = variables[i].Get( referenceNode.nodeObject ); object variableValue = variables[i].Get( referenceNode.nodeObject );
if( variableValue == null ) if( variableValue == null || variableValue.Equals( null ) )
continue; continue;
// Values stored inside ICollection objects are searched using IEnumerable, // Values stored inside ICollection objects are searched using IEnumerable,
@@ -1132,6 +1153,15 @@ namespace AssetUsageDetectorNamespace
catch( MissingReferenceException ) { } catch( MissingReferenceException ) { }
catch( MissingComponentException ) { } catch( MissingComponentException ) { }
catch( NotImplementedException ) { } catch( NotImplementedException ) { }
catch( Exception e )
{
// Unknown exceptions usually occur when variableValue is an IEnumerable and its enumerator throws an unhandled exception in MoveNext or Current
StringBuilder sb = new StringBuilder( callStack.Count * 50 + 1000 );
sb.Append( "Skipped searching " ).Append( referenceNode.nodeObject.GetType().FullName ).Append( "." ).Append( variables[i].name ).AppendLine( " because it threw exception:" ).Append( e ).AppendLine();
Object latestUnityObjectInCallStack = AppendCallStackToStringBuilder( sb );
Debug.LogWarning( sb.ToString(), latestUnityObjectInCallStack );
}
} }
} }
+1 -1
View File
@@ -1,7 +1,7 @@
{ {
"name": "com.yasirkula.assetusagedetector", "name": "com.yasirkula.assetusagedetector",
"displayName": "Asset Usage Detector", "displayName": "Asset Usage Detector",
"version": "1.9.1", "version": "1.9.4",
"documentationUrl": "https://github.com/yasirkula/UnityAssetUsageDetector", "documentationUrl": "https://github.com/yasirkula/UnityAssetUsageDetector",
"changelogUrl": "https://github.com/yasirkula/UnityAssetUsageDetector/releases", "changelogUrl": "https://github.com/yasirkula/UnityAssetUsageDetector/releases",
"licensesUrl": "https://github.com/yasirkula/UnityAssetUsageDetector/blob/master/LICENSE.txt", "licensesUrl": "https://github.com/yasirkula/UnityAssetUsageDetector/blob/master/LICENSE.txt",