Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-04-25 07:28:51 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

impl rotationConstraint SourceOffset

Browse Source
This commit is contained in:
ousttrue 2021-05-17 15:10:55 +09:00
parent a1af1a943d
commit 79465de4ad
4 changed files with 67 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Assets/VRM10/Editor/Components/Constraint/VRM10RotationConstraintEditor.cs
View File

@ -53,6 +53,18 @@ namespace UniVRM10
return;
}
// source offset
if (!Application.isPlaying)
{
EditorGUI.BeginChangeCheck();
Quaternion sourceOffset = Handles.RotationHandle(m_target.SourceOffset.Rotation, m_target.Source.position);
if (EditorGUI.EndChangeCheck())
{
Undo.RecordObject(m_target, "source offset");
m_target.SourceOffset.Rotation = sourceOffset;
}
}
// this to target line
Handles.color = Color.yellow;
Handles.DrawLine(m_target.Source.position, m_target.transform.position);

7
Assets/VRM10/Runtime/Components/Constraint/ConstraintSource.cs
View File

@ -30,13 +30,13 @@ namespace UniVRM10
}
}
public Quaternion RotationDelta(ObjectSpace coords)
public Quaternion RotationDelta(ObjectSpace coords, Quaternion sourceRotationOffset)
{
switch (coords)
{
// case SourceCoordinates.World: return m_transform.rotation * Quaternion.Inverse(m_initial.Rotation);
case ObjectSpace.local: return m_transform.localRotation * Quaternion.Inverse(LocalInitial.Rotation);
case ObjectSpace.model: return m_transform.rotation * Quaternion.Inverse(ModelInitial.Rotation) * Quaternion.Inverse(ModelRoot.rotation);
case ObjectSpace.local: return m_transform.localRotation * Quaternion.Inverse(LocalInitial.Rotation * sourceRotationOffset);
case ObjectSpace.model: return m_transform.rotation * Quaternion.Inverse(ModelInitial.Rotation * sourceRotationOffset) * Quaternion.Inverse(ModelRoot.rotation);
default: throw new NotImplementedException();
}
}
@ -49,6 +49,7 @@ namespace UniVRM10
LocalInitial = TR.FromLocal(t);
}
if (modelRoot != null)
{
var world = TR.FromWorld(t);
ModelRoot = modelRoot;

3
Assets/VRM10/Runtime/Components/Constraint/VRM10PositionConstraint.cs
View File

@ -16,6 +16,9 @@ namespace UniVRM10
[SerializeField]
public ObjectSpace SourceCoordinate = default;
[SerializeField]
public VRM10RotationOffset SourceOffset = VRM10RotationOffset.Identity;
[SerializeField]
public ObjectSpace DestinationCoordinate = default;

148
Assets/VRM10/Runtime/Components/Constraint/VRM10RotationConstraint.cs
View File

@ -15,10 +15,10 @@ namespace UniVRM10
public Transform Source = default;
[SerializeField]
public VRM10RotationOffset SourceOffset = VRM10RotationOffset.Identity;
public ObjectSpace SourceCoordinate = default;
[SerializeField]
public ObjectSpace SourceCoordinate = default;
public VRM10RotationOffset SourceOffset = VRM10RotationOffset.Identity;
[SerializeField]
public ObjectSpace DestinationCoordinate = default;
@ -38,67 +38,52 @@ namespace UniVRM10
public TR GetSourceCoords()
{
if (Source == null)
{
throw new ConstraintException(ConstraintException.ExceptionTypes.NoSource);
}
switch (SourceCoordinate)
{
case ObjectSpace.model:
{
var r = Quaternion.identity;
if (Source != null)
if (ModelRoot == null)
{
if (ModelRoot != null)
{
r = ModelRoot.rotation;
}
throw new ConstraintException(ConstraintException.ExceptionTypes.NoModelWithModelSpace);
}
var t = Vector3.zero;
if (Source != null)
{
t = Source.position;
}
return new TR(r, t);
return new TR(ModelRoot.rotation * SourceOffset.Rotation, Source.position);
}
case ObjectSpace.local:
{
if (Source != null)
if (m_src == null)
{
if (m_src != null)
{
// runtime
var parent = TR.Identity;
if (Source.parent != null)
{
parent = TR.FromWorld(Source.parent);
}
return parent * m_src.LocalInitial;
}
else
{
return TR.FromWorld(Source);
}
return new TR(Source.rotation * SourceOffset.Rotation, Source.position);
}
return TR.Identity;
// runtime
var parent = Quaternion.identity;
if (Source.parent != null)
{
parent = Source.parent.rotation;
}
return new TR(parent * m_src.LocalInitial.Rotation * SourceOffset.Rotation, Source.position);
}
}
throw new NotImplementedException();
default:
throw new NotImplementedException();
}
}
public TR GetSourceCurrent()
{
var coords = GetSourceCoords();
if (m_src != null)
{
return coords * new TR(m_src.RotationDelta(SourceCoordinate));
}
else
if (m_src == null)
{
return coords;
}
return coords * new TR(Delta);
}
public Quaternion Delta
@ -114,79 +99,43 @@ namespace UniVRM10
{
case ObjectSpace.model:
{
var r = Quaternion.identity;
if (ModelRoot != null)
if (ModelRoot == null)
{
r = ModelRoot.rotation;
throw new ConstraintException(ConstraintException.ExceptionTypes.NoModelWithModelSpace);
}
return new TR(r, transform.position);
return new TR(ModelRoot.rotation, transform.position);
}
case ObjectSpace.local:
{
if (m_src != null)
{
// runtime
var parent = TR.Identity;
if (transform.parent != null)
{
parent = TR.FromWorld(transform.parent);
}
return parent * m_dst.LocalInitial;
}
else
if (m_src == null)
{
return TR.FromWorld(transform);
}
}
}
throw new NotImplementedException();
// runtime
var parent = TR.Identity;
if (transform.parent != null)
{
parent = TR.FromWorld(transform.parent);
}
return parent * m_dst.LocalInitial;
}
default:
throw new NotImplementedException();
}
}
public TR GetDstCurrent()
{
var coords = GetDstCoords();
if (m_src != null)
{
return coords * new TR(m_src.RotationDelta(SourceCoordinate));
}
else
if (m_src == null)
{
return coords;
}
// switch (DestinationCoordinate)
// {
// case ObjectSpace.model:
// {
// var r = Quaternion.identity;
// if (ModelRoot != null)
// {
// r = ModelRoot.rotation;
// }
// return new TR(r, transform.position);
// }
// case ObjectSpace.local:
// {
// if (m_src != null)
// {
// // runtime
// var parent = TR.Identity;
// if (transform.parent != null)
// {
// parent = TR.FromWorld(transform.parent);
// }
// return parent * m_dst.LocalInitial;
// }
// else
// {
// return TR.FromWorld(transform);
// }
// }
// }
// throw new NotImplementedException();
return coords * new TR(Delta);
}
/// <summary>
@ -215,10 +164,6 @@ namespace UniVRM10
ModelRoot = current;
}
/// <summary>
/// SourceのUpdateよりも先か後かはその時による。
/// 厳密に制御するのは無理。
/// </summary>
public override void Process()
{
if (Source == null)
@ -236,10 +181,13 @@ namespace UniVRM10
m_dst = new ConstraintDestination(transform, ModelRoot);
}
// 軸制限をしたオイラー角
Delta = m_src.RotationDelta(SourceCoordinate);
// 回転差分
Delta = m_src.RotationDelta(SourceCoordinate, SourceOffset.Rotation);
// 軸制限
var fleezed = FreezeAxes.Freeze(Delta.eulerAngles);
var rotation = Quaternion.Euler(fleezed);
// Debug.Log($"{delta} => {rotation}");
// オイラー角を再度Quaternionへ。weight を加味してSlerpする
m_dst.ApplyRotation(rotation, Weight, DestinationCoordinate, ModelRoot);