diff --git a/Assets/VRM10/Runtime/Components/Constraint/VRM10PositionConstraint.cs b/Assets/VRM10/Runtime/Components/Constraint/VRM10PositionConstraint.cs index abeec4b9f..12d9f82ba 100644 --- a/Assets/VRM10/Runtime/Components/Constraint/VRM10PositionConstraint.cs +++ b/Assets/VRM10/Runtime/Components/Constraint/VRM10PositionConstraint.cs @@ -41,7 +41,7 @@ namespace UniVRM10 break; case ObjectSpace.model: - m_dst.ApplyModel(DestinationCoords * new TR(DestinationOffset) * new TR(Delta)); + m_dst.ApplyModel(DestinationInitialCoords * new TR(DestinationOffset) * new TR(Delta)); break; default: diff --git a/Assets/VRM10/Runtime/Components/Constraint/VRM10RotationConstraint.cs b/Assets/VRM10/Runtime/Components/Constraint/VRM10RotationConstraint.cs index b78481eb1..31b1c509b 100644 --- a/Assets/VRM10/Runtime/Components/Constraint/VRM10RotationConstraint.cs +++ b/Assets/VRM10/Runtime/Components/Constraint/VRM10RotationConstraint.cs @@ -41,7 +41,7 @@ namespace UniVRM10 break; case ObjectSpace.model: - m_dst.ApplyModel(DestinationCoords * new TR(DestinationOffset) * new TR(Quaternion.Euler(Delta))); + m_dst.ApplyModel(DestinationInitialCoords * new TR(DestinationOffset) * new TR(Quaternion.Euler(Delta))); break; default: diff --git a/Assets/VRM10/Runtime/Components/Constraint/VRM10RotationPositionConstraintBase.cs b/Assets/VRM10/Runtime/Components/Constraint/VRM10RotationPositionConstraintBase.cs index 552d45d91..d3875e93a 100644 --- a/Assets/VRM10/Runtime/Components/Constraint/VRM10RotationPositionConstraintBase.cs +++ b/Assets/VRM10/Runtime/Components/Constraint/VRM10RotationPositionConstraintBase.cs @@ -85,7 +85,7 @@ namespace UniVRM10 } } - TR SourceCoords + TR SourceInitialCoords { get { @@ -115,12 +115,12 @@ namespace UniVRM10 { throw new ConstraintException(ConstraintException.ExceptionTypes.NoModelWithModelSpace); } - return new TR(SourceModelCoords.Rotation * SourceOffset, SourceCoords.Translation); + return new TR(SourceModelCoords.Rotation * SourceOffset, SourceInitialCoords.Translation); } case ObjectSpace.local: { - return new TR(SourceCoords.Rotation * SourceOffset, SourceCoords.Translation); + return new TR(SourceInitialCoords.Rotation * SourceOffset, SourceInitialCoords.Translation); } default: @@ -147,7 +147,7 @@ namespace UniVRM10 } } - public TR DestinationCoords + public TR DestinationInitialCoords { get { @@ -172,12 +172,12 @@ namespace UniVRM10 { throw new ConstraintException(ConstraintException.ExceptionTypes.NoModelWithModelSpace); } - return new TR(DestinationModelCoords.Rotation * DestinationOffset, DestinationCoords.Translation); + return new TR(DestinationModelCoords.Rotation * DestinationOffset, DestinationInitialCoords.Translation); } case ObjectSpace.local: { - return new TR(DestinationCoords.Rotation * DestinationOffset, DestinationCoords.Translation); + return new TR(DestinationInitialCoords.Rotation * DestinationOffset, DestinationInitialCoords.Translation); } default: