AnimeFunsion/modular-avatar
1
0
Fork 0
mirror of https://github.com/bdunderscore/modular-avatar.git synced 2025-01-31 02:32:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix a few bugs in MergeArmature's locked mode

Browse Source
This commit is contained in:
bd_ 2022-11-07 18:49:44 -08:00
parent e82892847a
commit 033b316fde
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Packages/net.fushizen.modular-avatar/Runtime/ModularAvatarMergeArmature.cs
View File

@ -35,8 +35,8 @@ namespace net.fushizen.modular_avatar.core
[DisallowMultipleComponent]
public class ModularAvatarMergeArmature : AvatarTagComponent
{
private const float POS_EPSILON = 0.01f;
private const float ROT_EPSILON = 0.01f;
private const float POS_EPSILON = 0.001f * 0.001f;
private const float ROT_EPSILON = 0.001f * 0.001f;
public AvatarObjectReference mergeTarget;
public GameObject mergeTargetObject => mergeTarget.Get(this);
@ -86,7 +86,7 @@ namespace net.fushizen.modular_avatar.core
void EditorUpdate()
{
if (this == null || lockedBones == null)
if (this == null)
{
#if UNITY_EDITOR
EditorApplication.update -= EditorUpdate;
@ -94,6 +94,11 @@ namespace net.fushizen.modular_avatar.core
return;
}
if (!locked || lockedBones == null)
{
CheckLock();
}
if (lockedBones != null)
{
foreach (var bone in lockedBones)
@ -158,6 +163,8 @@ namespace net.fushizen.modular_avatar.core
{
Transform baseObject = FindCorresponding(xform);
if (baseObject == null) continue;
lockedBones.Add(new BoneBinding()
{
baseBone = baseObject,
@ -171,7 +178,7 @@ namespace net.fushizen.modular_avatar.core
}
#if UNITY_EDITOR
if (locked)
if (shouldLock)
{
EditorApplication.update += EditorUpdate;
}