diff --git a/Assets/VRM10/Runtime/Components/Constraint/IVrm10Constraint.cs b/Assets/VRM10/Runtime/Components/Constraint/IVrm10Constraint.cs index 06a32e255..0123028e8 100644 --- a/Assets/VRM10/Runtime/Components/Constraint/IVrm10Constraint.cs +++ b/Assets/VRM10/Runtime/Components/Constraint/IVrm10Constraint.cs @@ -5,11 +5,16 @@ namespace UniVRM10 { public interface IVrm10Constraint { - Transform ConstraintDst { get; } - Transform ConstriantSrc { get; } + /// + /// The object to which the Constraint applies + /// + Transform ConstraintTarget { get; } - /// - /// - internal void Process(in TransformState dstInitState, in TransformState srcInitState); + /// + /// The object for which the Constraint is the source of the pose + /// + Transform ConstraintSource { get; } + + internal void Process(in TransformState targetInitState, in TransformState sourceInitState); } -} +} \ No newline at end of file diff --git a/Assets/VRM10/Runtime/Components/Constraint/Vrm10AimConstraint.cs b/Assets/VRM10/Runtime/Components/Constraint/Vrm10AimConstraint.cs index 524849bcb..1cc480e08 100644 --- a/Assets/VRM10/Runtime/Components/Constraint/Vrm10AimConstraint.cs +++ b/Assets/VRM10/Runtime/Components/Constraint/Vrm10AimConstraint.cs @@ -35,9 +35,9 @@ namespace UniVRM10 } } - Transform IVrm10Constraint.ConstraintDst => transform; + Transform IVrm10Constraint.ConstraintTarget => transform; - Transform IVrm10Constraint.ConstriantSrc => Source; + Transform IVrm10Constraint.ConstraintSource => Source; /// /// https://github.com/vrm-c/vrm-specification/blob/master/specification/VRMC_node_constraint-1.0_beta/README.ja.md#example-of-implementation-1 diff --git a/Assets/VRM10/Runtime/Components/Constraint/Vrm10RollConstraint.cs b/Assets/VRM10/Runtime/Components/Constraint/Vrm10RollConstraint.cs index 2bc949faa..44507b596 100644 --- a/Assets/VRM10/Runtime/Components/Constraint/Vrm10RollConstraint.cs +++ b/Assets/VRM10/Runtime/Components/Constraint/Vrm10RollConstraint.cs @@ -31,9 +31,9 @@ namespace UniVRM10 } } - Transform IVrm10Constraint.ConstraintDst => transform; + Transform IVrm10Constraint.ConstraintTarget => transform; - Transform IVrm10Constraint.ConstriantSrc => Source?.transform; + Transform IVrm10Constraint.ConstraintSource => Source; /// /// https://github.com/vrm-c/vrm-specification/blob/master/specification/VRMC_node_constraint-1.0_beta/README.ja.md#example-of-implementation diff --git a/Assets/VRM10/Runtime/Components/Constraint/Vrm10RotationConstraint.cs b/Assets/VRM10/Runtime/Components/Constraint/Vrm10RotationConstraint.cs index 9b3311322..f33f43e29 100644 --- a/Assets/VRM10/Runtime/Components/Constraint/Vrm10RotationConstraint.cs +++ b/Assets/VRM10/Runtime/Components/Constraint/Vrm10RotationConstraint.cs @@ -9,9 +9,9 @@ namespace UniVRM10 [DisallowMultipleComponent] public class Vrm10RotationConstraint : MonoBehaviour, IVrm10Constraint { - Transform IVrm10Constraint.ConstraintDst => transform; + Transform IVrm10Constraint.ConstraintTarget => transform; - Transform IVrm10Constraint.ConstriantSrc => Source; + Transform IVrm10Constraint.ConstraintSource => Source; [SerializeField] public Transform Source = default; diff --git a/Assets/VRM10/Runtime/Components/Vrm10Runtime/Vrm10Runtime.cs b/Assets/VRM10/Runtime/Components/Vrm10Runtime/Vrm10Runtime.cs index 80da841ec..3d628b13d 100644 --- a/Assets/VRM10/Runtime/Components/Vrm10Runtime/Vrm10Runtime.cs +++ b/Assets/VRM10/Runtime/Components/Vrm10Runtime/Vrm10Runtime.cs @@ -136,11 +136,11 @@ namespace UniVRM10 // 3. Constraints foreach (var constraint in Constraints) { - if (constraint.ConstriantSrc != null) + if (constraint.ConstraintSource != null) { constraint.Process( - dstInitState: _initPose[constraint.ConstraintDst], - srcInitState: _initPose[constraint.ConstriantSrc]); + targetInitState: _initPose[constraint.ConstraintTarget], + sourceInitState: _initPose[constraint.ConstraintSource]); } } diff --git a/Assets/VRM10/Runtime/IO/Vrm10Exporter.cs b/Assets/VRM10/Runtime/IO/Vrm10Exporter.cs index 6eb80dcc5..34b51f3ca 100644 --- a/Assets/VRM10/Runtime/IO/Vrm10Exporter.cs +++ b/Assets/VRM10/Runtime/IO/Vrm10Exporter.cs @@ -601,7 +601,7 @@ namespace UniVRM10 } // serialize to gltfNode - var node = converter.Nodes[constraint.ConstraintDst.gameObject]; + var node = converter.Nodes[constraint.ConstraintTarget.gameObject]; var nodeIndex = model.Nodes.IndexOf(node); var gltfNode = nodes[nodeIndex]; UniGLTF.Extensions.VRMC_node_constraint.GltfSerializer.SerializeTo(ref gltfNode.extensions, vrmConstraint);