AnimeFunsion/modular-avatar
1
0
Fork 0
mirror of https://github.com/bdunderscore/modular-avatar.git synced 2025-04-12 15:38:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(visible-head-accessory): workaround unity crash

Browse Source 
Reported-By: Momishiro
This commit is contained in:
bd_ 2023-01-30 22:55:56 +09:00
parent d6ab6c676f
commit 85617735e9
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Packages/nadena.dev.modular-avatar/Editor/AvatarProcessor.cs
View File

@ -165,7 +165,7 @@ namespace nadena.dev.modular_avatar.core.editor
new MenuInstallHook().OnPreprocessAvatar(avatarGameObject, context); new MenuInstallHook().OnPreprocessAvatar(avatarGameObject, context);
new MergeArmatureHook().OnPreprocessAvatar(context, avatarGameObject); new MergeArmatureHook().OnPreprocessAvatar(context, avatarGameObject);
new BoneProxyProcessor().OnPreprocessAvatar(avatarGameObject); new BoneProxyProcessor().OnPreprocessAvatar(avatarGameObject);
new VisibleHeadAccessoryProcessor(vrcAvatarDescriptor).Process(); new VisibleHeadAccessoryProcessor(vrcAvatarDescriptor).Process(context);
new RemapAnimationPass(vrcAvatarDescriptor).Process(context.AnimationDatabase); new RemapAnimationPass(vrcAvatarDescriptor).Process(context.AnimationDatabase);
new BlendshapeSyncAnimationProcessor().OnPreprocessAvatar(avatarGameObject, context); new BlendshapeSyncAnimationProcessor().OnPreprocessAvatar(avatarGameObject, context);
PhysboneBlockerPass.Process(avatarGameObject); PhysboneBlockerPass.Process(avatarGameObject);

4
Packages/nadena.dev.modular-avatar/Editor/VisibleHeadAccessoryMeshProcessor.cs
View File

@ -33,14 +33,14 @@ namespace nadena.dev.modular_avatar.core.editor
return _renderer.bones.Any(_visibleBones.Contains) && _renderer.bones.Any(b => !_visibleBones.Contains(b)); return _renderer.bones.Any(_visibleBones.Contains) && _renderer.bones.Any(b => !_visibleBones.Contains(b));
} }
public void Retarget() public void Retarget(BuildContext context)
{ {
if (!NeedsRetargeting()) return; if (!NeedsRetargeting()) return;
bool anyVisible = false; bool anyVisible = false;
var originalMesh = _renderer.sharedMesh; var originalMesh = _renderer.sharedMesh;
var newMesh = Object.Instantiate(originalMesh); var newMesh = Object.Instantiate(originalMesh);
AssetDatabase.CreateAsset(newMesh, Util.GenerateAssetPath()); context.SaveAsset(newMesh);
// Identify the manifolds which need to be retargeted. Generally, we define a manifold as the maximal set of // Identify the manifolds which need to be retargeted. Generally, we define a manifold as the maximal set of
// points which are connected by primitives. If this manifold contains both visible and retargeted bones, // points which are connected by primitives. If this manifold contains both visible and retargeted bones,

4
Packages/nadena.dev.modular-avatar/Editor/VisibleHeadAccessoryProcessor.cs
View File

@ -55,7 +55,7 @@ namespace nadena.dev.modular_avatar.core.editor
} }
} }
public void Process() public void Process(BuildContext context)
{ {
bool didWork = false; bool didWork = false;
@ -70,7 +70,7 @@ namespace nadena.dev.modular_avatar.core.editor
// Process meshes // Process meshes
foreach (var smr in _avatar.GetComponentsInChildren<SkinnedMeshRenderer>(true)) foreach (var smr in _avatar.GetComponentsInChildren<SkinnedMeshRenderer>(true))
{ {
new VisibleHeadAccessoryMeshProcessor(smr, _visibleBones, _proxyHead).Retarget(); new VisibleHeadAccessoryMeshProcessor(smr, _visibleBones, _proxyHead).Retarget(context);
} }
} }
} }