Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-08-20 17:45:22 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1815 from Santarh/fixRog

Browse Source 
Fix a bug of incorrect pose set when EnforceTPose called
This commit is contained in:
ousttrue
2022-09-21 17:41:24 +09:00
committed by GitHub
parent 8864846a7f 59b88c3f6e
commit dcdcee46eb
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Assets/VRM10/Runtime/Components/Vrm10Runtime/ControlRig/Vrm10ControlBone.cs
View File

@@ -45,7 +45,7 @@ namespace UniVRM10
private readonly Quaternion _initialTargetGlobalRotation;
private readonly List<Vrm10ControlBone> _children = new List<Vrm10ControlBone>();
internal Vrm10ControlBone(Transform controlTarget, HumanBodyBones boneType)
private Vrm10ControlBone(Transform controlTarget, HumanBodyBones boneType, Vrm10ControlBone parent)
{
if (boneType == HumanBodyBones.LastBone)
{
@@ -61,6 +61,13 @@ namespace UniVRM10
// NOTE: bone name must be unique in the vrm instance.
ControlBone = new GameObject($"{nameof(Vrm10ControlBone)}:{boneType.ToString()}").transform;
ControlBone.position = controlTarget.position;
if (parent != null)
{
ControlBone.SetParent(parent.ControlBone, true);
parent._children.Add(this);
}
InitialControlBoneLocalPosition = ControlBone.localPosition;
InitialControlBoneLocalRotation = ControlBone.localRotation;
_initialTargetLocalRotation = controlTarget.localRotation;
@@ -81,7 +88,7 @@ namespace UniVRM10
public static Vrm10ControlBone Build(UniHumanoid.Humanoid humanoid, out Dictionary<HumanBodyBones, Vrm10ControlBone> boneMap)
{
var hips = new Vrm10ControlBone(humanoid.Hips, HumanBodyBones.Hips);
var hips = new Vrm10ControlBone(humanoid.Hips, HumanBodyBones.Hips, null);
boneMap = new Dictionary<HumanBodyBones, Vrm10ControlBone>();
boneMap.Add(HumanBodyBones.Hips, hips);
@@ -97,9 +104,7 @@ namespace UniVRM10
{
if (humanoid.TryGetBoneForTransform(current, out var bone))
{
var newBone = new Vrm10ControlBone(current, bone);
newBone.ControlBone.SetParent(parent.ControlBone, true);
parent._children.Add(newBone);
var newBone = new Vrm10ControlBone(current, bone, parent);
parent = newBone;
boneMap.Add(bone, newBone);
}