AnimeFunsion/modular-avatar
1
0
Fork 0
mirror of https://github.com/bdunderscore/modular-avatar.git synced 2024-12-29 18:55:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: scale adjuster preview destroys proxy renderers inappropriately (#1213)

Browse Source 
The scale adjuster preview system reparented proxy renderers under proxy
bones, in order to handle null root bones and MeshRenderers. However, it
then destroyed the entire proxy bone hierarchy, taking all proxy renderers
with it. This change instead tracks proxies, and reparents them back to the
root to avoid this issue.

Closes: #1177
This commit is contained in:
bd_ 2024-09-25 21:09:58 -07:00 committed by GitHub
parent a018df9219
commit e63a34e2ba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Editor/ScaleAdjuster/ScaleAdjusterPreview.cs
View File

@ -97,6 +97,8 @@ namespace nadena.dev.modular_avatar.core.editor
internal class ScaleAdjusterPreviewNode : IRenderFilterNode internal class ScaleAdjusterPreviewNode : IRenderFilterNode
{ {
private readonly HashSet<Transform> _knownProxies = new();
private readonly GameObject SourceAvatarRoot; private readonly GameObject SourceAvatarRoot;
private readonly GameObject VirtualAvatarRoot; private readonly GameObject VirtualAvatarRoot;
@ -230,6 +232,9 @@ namespace nadena.dev.modular_avatar.core.editor
{ {
if (SourceAvatarRoot == null) return Task.FromResult<IRenderFilterNode>(null); if (SourceAvatarRoot == null) return Task.FromResult<IRenderFilterNode>(null);
// Clean any destroyed objects out of _knownProxies to avoid growing this set indefinitely
_knownProxies.RemoveWhere(p => p == null);
var proxyPairList = proxyPairs.ToList(); var proxyPairList = proxyPairs.ToList();
if (!GetSourceBonesSet(context, proxyPairList).SetEquals(_shadowBoneMap.Keys)) if (!GetSourceBonesSet(context, proxyPairList).SetEquals(_shadowBoneMap.Keys))
@ -339,7 +344,15 @@ namespace nadena.dev.modular_avatar.core.editor
if (proxy == null) return; if (proxy == null) return;
var curParent = proxy.transform.parent ?? original.transform.parent; var curParent = proxy.transform.parent ?? original.transform.parent;
if (_finalBonesMap.TryGetValue(curParent, out var newRoot)) proxy.transform.SetParent(newRoot, false); if (_finalBonesMap.TryGetValue(curParent, out var newRoot))
{
// We need to remember this proxy so we can avoid destroying it when we destroy VirtualAvatarRoot
// in Dispose
_knownProxies.Add(proxy.transform);
proxy.transform.SetParent(newRoot, false);
}
var smr = proxy as SkinnedMeshRenderer; var smr = proxy as SkinnedMeshRenderer;
if (smr == null) return; if (smr == null) return;
@ -351,6 +364,14 @@ namespace nadena.dev.modular_avatar.core.editor
public void Dispose() public void Dispose()
{ {
foreach (var proxy in _knownProxies)
{
if (proxy != null && proxy.IsChildOf(VirtualAvatarRoot.transform))
{
proxy.transform.SetParent(null, false);
}
}
Object.DestroyImmediate(VirtualAvatarRoot); Object.DestroyImmediate(VirtualAvatarRoot);
_srcBones.Dispose(); _srcBones.Dispose();