add formation rotation
This commit is contained in:
@@ -19,6 +19,8 @@ public class UmaContainer : MonoBehaviour
|
||||
public GameObject Head;
|
||||
public GameObject Hair;
|
||||
|
||||
public Transform Position;
|
||||
|
||||
public List<Texture2D> TailTextures = new List<Texture2D>();
|
||||
|
||||
[Header("Animator")]
|
||||
|
||||
@@ -312,6 +312,9 @@ public class UmaViewerBuilder : MonoBehaviour
|
||||
CurrentUMAContainer.MergeModel();
|
||||
CurrentUMAContainer.SetHeight(-1);
|
||||
CurrentUMAContainer.Initialize(!UI.isTPose);
|
||||
|
||||
CurrentUMAContainer.Position = CurrentUMAContainer.transform.Find("Position");
|
||||
|
||||
if (!UI.isTPose && loadMotion)
|
||||
{
|
||||
if (Main.AbList.TryGetValue($"3d/motion/event/body/chara/chr{id}_00/anm_eve_chr{id}_00_idle01_loop", out UmaDatabaseEntry entry))
|
||||
@@ -530,6 +533,8 @@ public class UmaViewerBuilder : MonoBehaviour
|
||||
CurrentUMAContainer.SetHeight(-1);
|
||||
CurrentUMAContainer.Initialize(!UI.isTPose);
|
||||
|
||||
CurrentUMAContainer.Position = CurrentUMAContainer.transform.Find("Position");
|
||||
|
||||
if (!UI.isTPose && loadMotion)
|
||||
{
|
||||
if (Main.AbList.TryGetValue($"3d/motion/event/body/type00/anm_eve_type00_homestand{personality.PadLeft(2, '0')}_loop", out UmaDatabaseEntry entry))
|
||||
|
||||
@@ -524,8 +524,26 @@ namespace Gallop.Live.Cutt
|
||||
LiveTimelineKeyFormationOffsetData curKey = curKeyIndex.key as LiveTimelineKeyFormationOffsetData;
|
||||
LiveTimelineKeyFormationOffsetData nextKey = curKeyIndex.nextKey as LiveTimelineKeyFormationOffsetData;
|
||||
|
||||
Director.instance.charaObjs[targetIndex].position = curKey.Position;
|
||||
Director.instance.charaObjs[targetIndex].localScale = (curKey.visible ? Vector3.one : Vector3.zero);
|
||||
Director.instance.CharaContainerScript[targetIndex].transform.localScale = (curKey.visible ? Vector3.one : Vector3.zero);
|
||||
|
||||
if (curKey.visible)
|
||||
{
|
||||
if(nextKey != null && nextKey.interpolateType != LiveCameraInterpolateType.None)
|
||||
{
|
||||
float ratio = CalculateInterpolationValue(curKey, nextKey, time * 60);
|
||||
Director.instance.CharaContainerScript[targetIndex].transform.position = Vector3.Slerp(curKey.Position, nextKey.Position, ratio);
|
||||
var x = Director.instance.CharaContainerScript[targetIndex].Position.localEulerAngles.x;
|
||||
var z = Director.instance.CharaContainerScript[targetIndex].Position.localEulerAngles.z;
|
||||
Director.instance.CharaContainerScript[targetIndex].Position.localEulerAngles = Vector3.Slerp(new Vector3(x, curKey.LocalRotationY, z), new Vector3(x, nextKey.LocalRotationY, z), ratio);
|
||||
}
|
||||
else
|
||||
{
|
||||
Director.instance.CharaContainerScript[targetIndex].transform.position = curKey.Position;
|
||||
var x = Director.instance.CharaContainerScript[targetIndex].Position.localEulerAngles.x;
|
||||
var z = Director.instance.CharaContainerScript[targetIndex].Position.localEulerAngles.z;
|
||||
Director.instance.CharaContainerScript[targetIndex].Position.localEulerAngles = new Vector3(x, curKey.LocalRotationY, z);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static void FindTimelineKeyCurrent(out LiveTimelineKey curKey, ILiveTimelineKeyDataList keys, int curFrame)
|
||||
@@ -855,7 +873,7 @@ namespace Gallop.Live.Cutt
|
||||
return GetPositionWithCharacters(posFlags, parts, charaPos, _cameraLayerOffset);
|
||||
}
|
||||
|
||||
public static float CalculateInterpolationValue(LiveTimelineKey curKey, LiveTimelineKeyWithInterpolate nextKey, int frame)
|
||||
public static float CalculateInterpolationValue(LiveTimelineKey curKey, LiveTimelineKeyWithInterpolate nextKey, float frame)
|
||||
{
|
||||
float result = 0f;
|
||||
switch (nextKey.interpolateType)
|
||||
|
||||
Reference in New Issue
Block a user