-
Notifications
You must be signed in to change notification settings - Fork 424
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into fix/expression_override
- Loading branch information
Showing
12 changed files
with
258 additions
and
50 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using UnityEngine; | ||
| using UniGLTF; | ||
|
|
||
| namespace VRM | ||
| { | ||
| /// <summary> | ||
| /// SpringBone, LookAt の座標を記録しておき、Dispose で復帰する。 | ||
| /// </summary> | ||
| public class VrmGeometryBackup : IDisposable | ||
| { | ||
| struct VrmSpringBoneColliderBackup | ||
| { | ||
| struct Collider | ||
| { | ||
| Vector3 _offsetInWorld; | ||
| float _radiusMultLossyScale; | ||
|
|
||
| public Collider(Transform transform, VRMSpringBoneColliderGroup.SphereCollider collider) | ||
| { | ||
| _offsetInWorld = transform.TransformPoint(collider.Offset); | ||
| _radiusMultLossyScale = transform.UniformedLossyScale() * collider.Radius; | ||
| } | ||
|
|
||
| public void Restore(Transform transform, VRMSpringBoneColliderGroup.SphereCollider collider) | ||
| { | ||
| collider.Offset = transform.worldToLocalMatrix.MultiplyPoint(_offsetInWorld); | ||
| collider.Radius = _radiusMultLossyScale / transform.UniformedLossyScale(); | ||
| } | ||
| } | ||
| Collider[] _colliers; | ||
|
|
||
| public VrmSpringBoneColliderBackup(VRMSpringBoneColliderGroup colliderGroup) | ||
| { | ||
| _colliers = colliderGroup.Colliders.Select(x => new Collider(colliderGroup.transform, x)).ToArray(); | ||
| } | ||
|
|
||
| public void Restore(VRMSpringBoneColliderGroup colliderGroup) | ||
| { | ||
| for (int i = 0; i < colliderGroup.Colliders.Length; ++i) | ||
| { | ||
| _colliers[i].Restore(colliderGroup.transform, colliderGroup.Colliders[i]); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| struct VrmSpringBoneBackup | ||
| { | ||
| Vector3 _gravityDirInWorld; | ||
| float _radiusMultLossyScale; | ||
|
|
||
| public VrmSpringBoneBackup(VRMSpringBone springBone) | ||
| { | ||
| _gravityDirInWorld = springBone.transform.TransformDirection(springBone.m_gravityDir); | ||
| _radiusMultLossyScale = springBone.transform.UniformedLossyScale() * springBone.m_hitRadius; | ||
| } | ||
| public void Restore(VRMSpringBone springBone) | ||
| { | ||
| springBone.m_gravityDir = springBone.transform.worldToLocalMatrix.MultiplyVector(_gravityDirInWorld); | ||
| springBone.m_hitRadius = _radiusMultLossyScale / springBone.transform.UniformedLossyScale(); | ||
| } | ||
| } | ||
|
|
||
| Dictionary<VRMSpringBoneColliderGroup, VrmSpringBoneColliderBackup> _springBoneColliders; | ||
| Dictionary<VRMSpringBone, VrmSpringBoneBackup> _springBones; | ||
| VRMFirstPerson _firstPerson; | ||
| Vector3 _firstPersonOffsetInWorld; | ||
|
|
||
| public VrmGeometryBackup(GameObject root) | ||
| { | ||
| _springBoneColliders = root.GetComponentsInChildren<VRMSpringBoneColliderGroup>().ToDictionary(x => x, x => new VrmSpringBoneColliderBackup(x)); | ||
| _springBones = root.GetComponentsInChildren<VRMSpringBone>().ToDictionary(x => x, x => new VrmSpringBoneBackup(x)); | ||
| _firstPerson = root.GetComponent<VRMFirstPerson>(); | ||
| _firstPersonOffsetInWorld = _firstPerson.transform.TransformPoint(_firstPerson.FirstPersonOffset); | ||
| } | ||
|
|
||
| public void Dispose() | ||
| { | ||
| foreach (var (k, v) in _springBoneColliders) | ||
| { | ||
| v.Restore(k); | ||
| } | ||
| foreach (var (k, v) in _springBones) | ||
| { | ||
| v.Restore(k); | ||
| } | ||
| _firstPerson.FirstPersonOffset = _firstPerson.transform.worldToLocalMatrix.MultiplyPoint(_firstPersonOffsetInWorld); | ||
| } | ||
| } | ||
| } |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using UnityEngine; | ||
| using UniGLTF; | ||
|
|
||
| namespace UniVRM10 | ||
| { | ||
| /// <summary> | ||
| /// SpringBone, LookAt の座標を記録しておき、Dispose で復帰する。 | ||
| /// </summary> | ||
| public class Vrm10GeometryBackup : IDisposable | ||
| { | ||
| struct Vrm10SpringBoneColliderBackup | ||
| { | ||
| Vector3 _offsetInWorld; | ||
| float _radiusMultLossyScale; | ||
|
|
||
| public Vrm10SpringBoneColliderBackup(VRM10SpringBoneCollider collider) | ||
| { | ||
| _offsetInWorld = collider.transform.TransformPoint(collider.Offset); | ||
| _radiusMultLossyScale = collider.transform.UniformedLossyScale() * collider.Radius; | ||
| } | ||
|
|
||
| public void Restore(VRM10SpringBoneCollider collider) | ||
| { | ||
| collider.Offset = collider.transform.worldToLocalMatrix.MultiplyPoint(_offsetInWorld); | ||
| collider.Radius = _radiusMultLossyScale / collider.transform.UniformedLossyScale(); | ||
| } | ||
| } | ||
|
|
||
| struct Vrm10SpringBoneJointBackup | ||
| { | ||
| Vector3 _gravityDirInWorld; | ||
| float _radiusMultLossyScale; | ||
|
|
||
| public Vrm10SpringBoneJointBackup(VRM10SpringBoneJoint joint) | ||
| { | ||
| _gravityDirInWorld = joint.transform.TransformDirection(joint.m_gravityDir); | ||
| _radiusMultLossyScale = joint.transform.UniformedLossyScale() * joint.m_jointRadius; | ||
| } | ||
| public void Restore(VRM10SpringBoneJoint joint) | ||
| { | ||
| joint.m_gravityDir = joint.transform.worldToLocalMatrix.MultiplyVector(_gravityDirInWorld); | ||
| joint.m_jointRadius = _radiusMultLossyScale / joint.transform.UniformedLossyScale(); | ||
| } | ||
| } | ||
|
|
||
| Dictionary<VRM10SpringBoneCollider, Vrm10SpringBoneColliderBackup> _springBoneColliders; | ||
| Dictionary<VRM10SpringBoneJoint, Vrm10SpringBoneJointBackup> _springBoneJoints; | ||
| Vrm10Instance _vrm; | ||
| Vector3 _lookAtOffsetInWorld; | ||
|
|
||
| public Vrm10GeometryBackup(GameObject root) | ||
| { | ||
| _springBoneColliders = root.GetComponentsInChildren<VRM10SpringBoneCollider>().ToDictionary(x => x, x => new Vrm10SpringBoneColliderBackup(x)); | ||
| _springBoneJoints = root.GetComponentsInChildren<VRM10SpringBoneJoint>().ToDictionary(x => x, x => new Vrm10SpringBoneJointBackup(x)); | ||
| _vrm = root.GetComponent<Vrm10Instance>(); | ||
| _lookAtOffsetInWorld = _vrm.transform.TransformPoint(_vrm.Vrm.LookAt.OffsetFromHead); | ||
| } | ||
|
|
||
| public void Dispose() | ||
| { | ||
| foreach (var (k, v) in _springBoneColliders) | ||
| { | ||
| v.Restore(k); | ||
| } | ||
| foreach (var (k, v) in _springBoneJoints) | ||
| { | ||
| v.Restore(k); | ||
| } | ||
| _vrm.Vrm.LookAt.OffsetFromHead = _vrm.transform.worldToLocalMatrix.MultiplyPoint(_lookAtOffsetInWorld); | ||
| } | ||
| } | ||
| } |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.