improve SearchUtilities.Find (#341)

writes it as a 3-strategy process, since that's effectively what it is. makes it so that not finding the root wont immediately return null
This commit is contained in:
Noah 2022-09-02 07:39:15 -04:00 committed by GitHub
commit a1db1bc5d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -95,40 +95,43 @@ namespace NewHorizons.Utility
{
if (CachedGameObjects.TryGetValue(path, out var go)) return go;
// 1: normal find
go = GameObject.Find(path);
if (go == null)
if (go)
{
// find inactive use root + transform.find
var names = path.Split('/');
var rootName = names[0];
var root = SceneManager.GetActiveScene().GetRootGameObjects().FirstOrDefault(x => x.name == rootName);
if (root == null)
{
if (warn) Logger.LogWarning($"Couldn't find root object in path {path}");
return null;
}
var childPath = string.Join("/", names.Skip(1));
go = root.FindChild(childPath);
if (go == null)
{
var name = names.Last();
if (warn) Logger.LogWarning($"Couldn't find object in path {path}, will look for potential matches for name {name}");
// find resource to include inactive objects
// also includes prefabs but hopefully thats okay
go = FindResourceOfTypeAndName<GameObject>(name);
if (go == null)
{
if (warn) Logger.LogWarning($"Couldn't find object with name {name}");
return null;
}
}
}
CachedGameObjects.Add(path, go);
return go;
}
// 2: find inactive using root + transform.find
var names = path.Split('/');
var rootName = names[0];
var root = SceneManager.GetActiveScene().GetRootGameObjects().FirstOrDefault(x => x.name == rootName);
var childPath = string.Join("/", names.Skip(1));
go = root ? root.FindChild(childPath) : null;
if (go)
{
CachedGameObjects.Add(path, go);
return go;
}
var name = names.Last();
if (warn) Logger.LogWarning($"Couldn't find object in path {path}, will look for potential matches for name {name}");
// 3: find resource to include inactive objects
// also includes prefabs but hopefully thats okay
go = FindResourceOfTypeAndName<GameObject>(name);
if (go)
{
CachedGameObjects.Add(path, go);
return go;
}
if (warn) Logger.LogWarning($"Couldn't find object with name {name}");
return null;
}
public static List<GameObject> GetAllChildren(this GameObject parent)
{
var children = new List<GameObject>();