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

fix: performance issues with Scale Adjuster Preview (#912)

Browse Source 
* fix: performance issues with Scale Adjuster Preview

* chore: update .gitignore
This commit is contained in:
bd_ 2024-07-03 12:00:27 +09:00 committed by GitHub
parent 65d229d338
commit 2efcc670df
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -1,2 +1,3 @@
UnitTests/ UnitTests
UnitTests.meta UnitTests.meta
/UnitTests/

27
Editor/ScaleAdjuster/ScaleAdjusterPreview.cs
View File

@ -65,7 +65,7 @@ namespace nadena.dev.modular_avatar.core.editor
public Task<IRenderFilterNode> Instantiate(RenderGroup group, IEnumerable<(Renderer, Renderer)> proxyPairs, public Task<IRenderFilterNode> Instantiate(RenderGroup group, IEnumerable<(Renderer, Renderer)> proxyPairs,
ComputeContext context) ComputeContext context)
{ {
return Task.FromResult((IRenderFilterNode)new ScaleAdjusterPreviewNode()); return new ScaleAdjusterPreviewNode().Refresh(proxyPairs, context, 0);
} }
} }
@ -83,6 +83,9 @@ namespace nadena.dev.modular_avatar.core.editor
// blendshapes themselves. // blendshapes themselves.
public RenderAspects WhatChanged => 0; public RenderAspects WhatChanged => 0;
private readonly Dictionary<Transform, ModularAvatarScaleAdjuster> _boneOverrides
= new(new ObjectIdentityComparer<Transform>());
public Task<IRenderFilterNode> Refresh public Task<IRenderFilterNode> Refresh
( (
IEnumerable<(Renderer, Renderer)> proxyPairs, IEnumerable<(Renderer, Renderer)> proxyPairs,
@ -90,6 +93,23 @@ namespace nadena.dev.modular_avatar.core.editor
RenderAspects updatedAspects RenderAspects updatedAspects
) )
{ {
var pair = proxyPairs.First();
Renderer original = pair.Item1;
Renderer proxy = pair.Item2;
if (original != null && proxy != null && original is SkinnedMeshRenderer smr)
{
_boneOverrides.Clear();
foreach (var bone in smr.bones)
{
var sa = bone?.GetComponent<ModularAvatarScaleAdjuster>();
if (sa != null) {
_boneOverrides.Add(bone, sa);
}
}
}
return Task.FromResult((IRenderFilterNode)this); return Task.FromResult((IRenderFilterNode)this);
} }
@ -100,8 +120,9 @@ namespace nadena.dev.modular_avatar.core.editor
p_smr.rootBone = _bones.GetBone(o_smr.rootBone)?.proxy ?? o_smr.rootBone; p_smr.rootBone = _bones.GetBone(o_smr.rootBone)?.proxy ?? o_smr.rootBone;
p_smr.bones = o_smr.bones.Select(b => p_smr.bones = o_smr.bones.Select(b =>
{ {
var sa = (Component)b?.GetComponent<ModularAvatarScaleAdjuster>(); _boneOverrides.TryGetValue(b, out var sa);
return _bones.GetBone(sa ?? b, true)?.proxy ?? b;
return _bones.GetBone(sa, true)?.proxy ?? b;
}).ToArray(); }).ToArray();
} }