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

chore: remove PhysBone pruning as it is no longer needed

Browse Source
This commit is contained in:
nekobako 2023-09-30 15:20:10 +09:00
parent ff28d43671
commit b0c339e9d0
1 changed files with 0 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
Packages/nadena.dev.modular-avatar/Editor/MergeArmatureHook.cs
View File

@ -32,7 +32,6 @@ using UnityEngine;
using UnityEngine.Animations;
using VRC.Dynamics;
using VRC.SDK3.Dynamics.PhysBone.Components;
using Object = UnityEngine.Object;
namespace nadena.dev.modular_avatar.core.editor
{
@ -46,9 +45,6 @@ namespace nadena.dev.modular_avatar.core.editor
private PathMappings PathMappings => frameworkContext.Extension<AnimationServicesContext>()
.PathMappings;
private HashSet<Transform> mergedObjects = new HashSet<Transform>();
private HashSet<Transform> thisPassAdded = new HashSet<Transform>();
internal void OnPreprocessAvatar(ndmf.BuildContext context, GameObject avatarGameObject)
{
this.frameworkContext = context;
@ -162,10 +158,7 @@ namespace nadena.dev.modular_avatar.core.editor
BuildReport.ReportingObject(config, () =>
{
mergedObjects.Clear();
thisPassAdded.Clear();
MergeArmature(config, target);
PruneDuplicatePhysBones();
UnityEngine.Object.DestroyImmediate(config);
});
}
@ -236,8 +229,6 @@ namespace nadena.dev.modular_avatar.core.editor
RecursiveMerge(mergeArmature, mergeArmature.gameObject, mergeTargetObject, true);
_activeRetargeter.FixupAnimations();
thisPassAdded.UnionWith(_activeRetargeter.AddedGameObjects.Select(x => x.transform));
}
/**
@ -255,12 +246,6 @@ namespace nadena.dev.modular_avatar.core.editor
return;
}
if (zipMerge)
{
mergedObjects.Add(src.transform);
thisPassAdded.Add(src.transform);
}
bool retain = HasAdditionalComponents(src) || !zipMerge;
zipMerge = zipMerge && src.GetComponent<IConstraint>() == null;
@ -302,7 +287,6 @@ namespace nadena.dev.modular_avatar.core.editor
BoneDatabase.AddMergedBone(mergedSrcBone.transform);
BoneDatabase.RetainMergedBone(mergedSrcBone.transform);
PathMappings.MarkTransformLookthrough(mergedSrcBone);
thisPassAdded.Add(mergedSrcBone.transform);
}
src.transform.SetParent(mergedSrcBone.transform, true);
@ -357,51 +341,5 @@ namespace nadena.dev.modular_avatar.core.editor
{
return physBones.Any(x => target.IsChildOf(x.GetRootTransform()) && !x.ignoreTransforms.Any(target.IsChildOf));
}
Transform FindOriginalParent(Transform merged)
{
while (merged != null && thisPassAdded.Contains(merged)) merged = merged.parent;
return merged;
}
/**
* Sometimes outfit authors copy the entire armature, including PhysBones components. If we merge these and
* end up with multiple PB components referencing the same target, PB refuses to animate the bone. So detect
* and prune this case.
*
* TODO - detect duplicate colliders, contacts, et - these can cause perf issues but usually not quite as large
* of a correctness issue.
*/
private void PruneDuplicatePhysBones()
{
foreach (var obj in mergedObjects)
{
if (obj.GetComponent<VRCPhysBone>() == null) continue;
var baseObj = FindOriginalParent(obj);
if (baseObj == null || baseObj.GetComponent<VRCPhysBone>() == null) continue;
HashSet<Transform> baseTargets = new HashSet<Transform>();
foreach (var component in baseObj.GetComponents<VRCPhysBone>())
{
var target = component.rootTransform == null ? baseObj.transform : component.rootTransform;
baseTargets.Add(target);
}
foreach (var component in obj.GetComponents<VRCPhysBone>())
{
var target = component.rootTransform == null
? baseObj.transform
: FindOriginalParent(component.rootTransform);
if (baseTargets.Contains(target))
{
Object.DestroyImmediate(component);
}
else
{
BoneDatabase.RetainMergedBone(component.transform);
}
}
}
}
}
}