Compare commits

...

6 Commits

8 changed files with 81 additions and 28 deletions
@@ -10,7 +10,7 @@ using System;
using System.IO;
using System.Text;
using Object = UnityEngine.Object;
#if UNITY_2018_3_OR_NEWER
#if UNITY_2018_3_OR_NEWER && !UNITY_2021_2_OR_NEWER
using PrefabStage = UnityEditor.Experimental.SceneManagement.PrefabStage;
using PrefabStageUtility = UnityEditor.Experimental.SceneManagement.PrefabStageUtility;
#endif
@@ -216,6 +216,7 @@ namespace AssetUsageDetectorNamespace
{ typeof( AnimatorStateTransition ), SearchAnimatorStateTransition },
{ typeof( BlendTree ), SearchBlendTree },
{ typeof( AnimationClip ), SearchAnimationClip },
{ typeof( TerrainData ), SearchTerrainData },
#if UNITY_2017_1_OR_NEWER
{ typeof( SpriteAtlas ), SearchSpriteAtlas },
#endif
@@ -966,6 +967,14 @@ namespace AssetUsageDetectorNamespace
return referenceNode;
}
// TerrainData's properties like tree/detail/layer definitions aren't exposed to SerializedObject so use reflection instead
private ReferenceNode SearchTerrainData( Object unityObject )
{
ReferenceNode referenceNode = PopReferenceNode( unityObject );
SearchVariablesWithReflection( referenceNode );
return referenceNode;
}
#if UNITY_2017_1_OR_NEWER
private ReferenceNode SearchSpriteAtlas( Object unityObject )
{
@@ -1112,7 +1121,7 @@ namespace AssetUsageDetectorNamespace
{
// New Shader Graph serialization format is used: https://github.com/Unity-Technologies/Graphics/pull/222
// Iterate over all these occurrences: "guid\": \"GUID_VALUE\" (\" is used instead of " because it is a nested JSON)
IterateOverValuesInString( graphJson, "\"guid\\\"", '"', ( guid ) =>
IterateOverValuesInString( graphJson, new string[] { "\"guid\\\"" }, '"', ( guid ) =>
{
if( guid.Length > 1 )
{
@@ -1132,7 +1141,7 @@ namespace AssetUsageDetectorNamespace
if( shaderIncludesToSearchSet.Count > 0 )
{
// Iterate over all these occurrences: "m_FunctionSource": "GUID_VALUE" (this one is not nested JSON)
IterateOverValuesInString( graphJson, "\"m_FunctionSource\"", '"', ( guid ) =>
IterateOverValuesInString( graphJson, new string[] { "\"m_FunctionSource\"" }, '"', ( guid ) =>
{
string referencePath = AssetDatabase.GUIDToAssetPath( guid );
if( !string.IsNullOrEmpty( referencePath ) && assetsToSearchPathsSet.Contains( referencePath ) )
@@ -1315,8 +1324,8 @@ namespace AssetUsageDetectorNamespace
{
string shaderPath = AssetDatabase.GetAssetPath( (Object) referenceNode.nodeObject );
// Iterate over all these occurrences: #include: "INCLUDE_REFERENCE"
IterateOverValuesInString( File.ReadAllText( shaderPath ), "#include ", '"', ( include ) =>
// Iterate over all these occurrences: #include "INCLUDE_REFERENCE" or #include_with_pragmas "INCLUDE_REFERENCE"
IterateOverValuesInString( File.ReadAllText( shaderPath ), new string[] { "#include ", "#include_with_pragmas " }, '"', ( include ) =>
{
bool isIncludePotentialReference = shaderIncludesToSearchSet.Contains( include );
if( !isIncludePotentialReference )
@@ -1617,6 +1626,10 @@ namespace AssetUsageDetectorNamespace
#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
// property and its "color" property is called, it logs an error to the console, so this rule helps avoid that scenario, as well)
else if( ( propertyName == "color" || propertyName == "mainTexture" ) && typeof( Material ).IsAssignableFrom( currType ) )
continue;
// Ignore "parameters" property of Animator since it doesn't contain any useful data and logs a warning to the console when Animator is inactive
else if( typeof( Animator ).IsAssignableFrom( currType ) && propertyName == "parameters" )
continue;
@@ -1626,6 +1639,11 @@ namespace AssetUsageDetectorNamespace
// Ignore "meshFilter" property of TextMeshPro and TMP_SubMesh components because this property adds a MeshFilter component to the object if it doesn't exist
else if( propertyName == "meshFilter" && ( currType.Name == "TextMeshPro" || currType.Name == "TMP_SubMesh" ) )
continue;
// Ignore "users" property of TerrainData because it returns the Terrains in the scene that use that TerrainData. This causes issues with callStack because TerrainData
// is already in callStack when Terrains are searched via "users" property of it and hence, Terrain->TerrainData references for that TerrainData can't be found in scenes
// (this is how callStack works, it prevents searching an object if it's already in callStack to avoid infinite recursion)
else if( propertyName == "users" && typeof( TerrainData ).IsAssignableFrom( currType ) )
continue;
else
{
VariableGetVal getter = property.CreateGetter();
@@ -1726,26 +1744,30 @@ namespace AssetUsageDetectorNamespace
// Iterates over all occurrences of specific key-value pairs in string
// Example1: #include "VALUE" valuePrefix=#include, valueWrapperChar="
// Example2: "guid": "VALUE" valuePrefix="guid", valueWrapperChar="
private void IterateOverValuesInString( string str, string valuePrefix, char valueWrapperChar, Action<string> valueAction )
private void IterateOverValuesInString( string str, string[] valuePrefixes, char valueWrapperChar, Action<string> valueAction )
{
int valueStartIndex, valueEndIndex = 0;
while( true )
for( int i = 0; i < valuePrefixes.Length; i++ )
{
valueStartIndex = str.IndexOf( valuePrefix, valueEndIndex );
if( valueStartIndex < 0 )
return;
string valuePrefix = valuePrefixes[i];
int valueStartIndex, valueEndIndex = 0;
while( true )
{
valueStartIndex = str.IndexOf( valuePrefix, valueEndIndex );
if( valueStartIndex < 0 )
break;
valueStartIndex = str.IndexOf( valueWrapperChar, valueStartIndex + valuePrefix.Length );
if( valueStartIndex < 0 )
return;
valueStartIndex = str.IndexOf( valueWrapperChar, valueStartIndex + valuePrefix.Length );
if( valueStartIndex < 0 )
break;
valueStartIndex++;
valueEndIndex = str.IndexOf( valueWrapperChar, valueStartIndex );
if( valueEndIndex < 0 )
return;
valueStartIndex++;
valueEndIndex = str.IndexOf( valueWrapperChar, valueStartIndex );
if( valueEndIndex < 0 )
break;
if( valueEndIndex > valueStartIndex )
valueAction( str.Substring( valueStartIndex, valueEndIndex - valueStartIndex ) );
if( valueEndIndex > valueStartIndex )
valueAction( str.Substring( valueStartIndex, valueEndIndex - valueStartIndex ) );
}
}
}
@@ -5,7 +5,10 @@ using UnityEditor;
using System.Collections.Generic;
using System.Reflection;
using Object = UnityEngine.Object;
#if UNITY_2018_3_OR_NEWER
#if UNITY_2021_2_OR_NEWER
using PrefabStage = UnityEditor.SceneManagement.PrefabStage;
using PrefabStageUtility = UnityEditor.SceneManagement.PrefabStageUtility;
#elif UNITY_2018_3_OR_NEWER
using PrefabStage = UnityEditor.Experimental.SceneManagement.PrefabStage;
using PrefabStageUtility = UnityEditor.Experimental.SceneManagement.PrefabStageUtility;
#endif
@@ -149,6 +152,14 @@ namespace AssetUsageDetectorNamespace
objectsToSearch[i].RefreshSubAssets();
} );
}
else if( currentPhase == Phase.Complete )
{
if( searchResult != null && searchResult.NumberOfGroups > 0 )
{
contextMenu.AddSeparator( "" );
contextMenu.AddItem( new GUIContent( "Collapse All" ), false, searchResult.CollapseAllSearchResultGroups );
}
}
}
// Shows lock button at the top-right corner
@@ -458,7 +469,10 @@ namespace AssetUsageDetectorNamespace
GUILayout.Label( ". . . Search in progress or something went wrong (check console) . . ." );
if( GUILayout.Button( "RETURN", Utilities.GL_HEIGHT_30 ) )
{
ReturnToSetupPhase();
GUIUtility.ExitGUI();
}
}
else if( currentPhase == Phase.Setup )
{
@@ -573,7 +587,10 @@ namespace AssetUsageDetectorNamespace
GUI.enabled = true;
if( GUILayout.Button( "Reset Search", Utilities.GL_HEIGHT_30 ) )
{
ReturnToSetupPhase();
GUIUtility.ExitGUI();
}
if( searchResult == null )
{
@@ -371,9 +371,15 @@ namespace AssetUsageDetectorNamespace
return scrollPosition;
}
public int IndexOf( SearchResultGroup searchResult )
public int IndexOf( SearchResultGroup searchResultGroup )
{
return result.IndexOf( searchResult );
return result.IndexOf( searchResultGroup );
}
public void CollapseAllSearchResultGroups()
{
for( int i = 0; i < result.Count; i++ )
result[i].Collapse();
}
public void CancelDelayedTreeViewTooltip()
@@ -600,6 +606,11 @@ namespace AssetUsageDetectorNamespace
treeViewSearchField = null;
}
public void Collapse()
{
IsExpanded = false;
}
// Initializes commonly used variables of the nodes
public void InitializeNodes( HashSet<Object> objectsToSearchSet )
{
@@ -725,7 +736,7 @@ namespace AssetUsageDetectorNamespace
if( searchResult != null )
contextMenu.AddItem( new GUIContent( "Hide" ), false, () => searchResult.RemoveSearchResultGroup( this ) );
if( references.Count > 0 )
if( references.Count > 0 && treeView != null )
{
if( contextMenu.GetItemCount() > 0 )
contextMenu.AddSeparator( "" );
@@ -5,7 +5,10 @@ using System.Text;
using UnityEditor;
using UnityEditor.IMGUI.Controls;
using UnityEngine;
#if UNITY_2018_3_OR_NEWER
#if UNITY_2021_2_OR_NEWER
using PrefabStage = UnityEditor.SceneManagement.PrefabStage;
using PrefabStageUtility = UnityEditor.SceneManagement.PrefabStageUtility;
#elif UNITY_2018_3_OR_NEWER
using PrefabStage = UnityEditor.Experimental.SceneManagement.PrefabStage;
using PrefabStageUtility = UnityEditor.Experimental.SceneManagement.PrefabStageUtility;
#endif
@@ -10,7 +10,7 @@ using UnityEditor.SceneManagement;
using UnityEngine;
using UnityEngine.SceneManagement;
using Object = UnityEngine.Object;
#if UNITY_2018_3_OR_NEWER
#if UNITY_2018_3_OR_NEWER && !UNITY_2021_2_OR_NEWER
using PrefabStage = UnityEditor.Experimental.SceneManagement.PrefabStage;
using PrefabStageUtility = UnityEditor.Experimental.SceneManagement.PrefabStageUtility;
#endif
+1 -1
View File
@@ -1,4 +1,4 @@
= Asset Usage Detector =
= Asset Usage Detector (v2.2.3) =
Online documentation available at: https://github.com/yasirkula/UnityAssetUsageDetector
E-mail: yasirkula@gmail.com
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "com.yasirkula.assetusagedetector",
"displayName": "Asset Usage Detector",
"version": "2.2.0",
"version": "2.2.3",
"documentationUrl": "https://github.com/yasirkula/UnityAssetUsageDetector",
"changelogUrl": "https://github.com/yasirkula/UnityAssetUsageDetector/releases",
"licensesUrl": "https://github.com/yasirkula/UnityAssetUsageDetector/blob/master/LICENSE.txt",