CurrentUmaContainer is now of type UmaContainerCharacter

This commit is contained in:
Katboi01
2023-08-20 22:27:30 +02:00
parent 9bb4539095
commit 124e03fb9c
10 changed files with 588 additions and 594 deletions
+2 -2
View File
@@ -17,7 +17,7 @@ public class ModelExporter
{
static string modelInfo = $"Generated by UmaViewer {Application.version}, Copyright Cygames \nLink : https://github.com/katboi01/UmaViewer";
public static void ExportModel(UmaContainer container, string path)
public static void ExportModel(UmaContainerCharacter container, string path)
{
container.SetDynamicBoneEnable(false);
container.UmaFaceAnimator?.Rebind();
@@ -93,7 +93,7 @@ public class ModelExporter
return tmp;
}
private static void AddBlendShape(UmaContainer container)
private static void AddBlendShape(UmaContainerCharacter container)
{
if (!container.FaceDrivenKeyTarget) return;
SkinnedMeshRenderer faceMesh = null;
@@ -139,7 +139,7 @@ public class UnityHumanoidVMDRecorder : MonoBehaviour
transformDictionary.Add(pair.Key.ToString(), pair.Value);
}
var animator = GetComponentInParent<UmaContainer>().UmaAnimator;
var animator = GetComponentInParent<UmaContainerCharacter>().UmaAnimator;
var state = animator.GetCurrentAnimatorStateInfo(0);
animator.Rebind();
@@ -814,7 +814,7 @@ public class UnityHumanoidVMDRecorder : MonoBehaviour
public MorphRecorder(Transform model)
{
var facialTarget = model.GetComponentInParent<UmaContainer>().FaceDrivenKeyTarget;
var facialTarget = model.GetComponentInParent<UmaContainerCharacter>().FaceDrivenKeyTarget;
FacialMorphList = new List<FacialMorph>();
FacialMorphList.AddRange(facialTarget.EyeBrowMorphs);
FacialMorphList.AddRange(facialTarget.EyeMorphs);
-429
View File
@@ -12,74 +12,8 @@ using Random = UnityEngine.Random;
public class UmaContainer : MonoBehaviour
{
public CharaEntry CharaEntry;
public DataRow CharaData;
public GameObject Body;
public GameObject Tail;
public GameObject Head;
public GameObject Hair;
public Transform Position;
public List<Texture2D> TailTextures = new List<Texture2D>();
[Header("Animator")]
public Animator UmaAnimator;
public AnimatorOverrideController OverrideController;
public Animator UmaFaceAnimator;
public AnimatorOverrideController FaceOverrideController;
public bool isAnimatorControl;
[Header("Body")]
public GameObject UpBodyBone;
public Vector3 UpBodyPosition;
public Quaternion UpBodyRotation;
[Header("Face")]
public FaceDrivenKeyTarget FaceDrivenKeyTarget;
public FaceEmotionKeyTarget FaceEmotionKeyTarget;
public FaceOverrideData FaceOverrideData;
public GameObject HeadBone;
public Transform TrackTarget;
public float EyeHeight;
public bool EnableEyeTracking = true;
public Material FaceMaterial;
[Header("Cheek")]
public Texture CheekTex_0;
public Texture CheekTex_1;
public Texture CheekTex_2;
[Header("Manga")]
public List<GameObject> LeftMangaObject = new List<GameObject>();
public List<GameObject> RightMangaObject = new List<GameObject>();
[Header("Tear")]
public GameObject TearPrefab_0;
public GameObject TearPrefab_1;
public List<TearController> TearControllers = new List<TearController>();
[Header("Generic")]
public bool IsGeneric = false;
public string VarCostumeIdShort, VarCostumeIdLong, VarSkin, VarHeight, VarSocks, VarBust;
public List<Texture2D> GenericBodyTextures = new List<Texture2D>();
[Header("Mini")]
public bool IsMini = false;
public List<Texture2D> MiniHeadTextures = new List<Texture2D>();
[Header("Mob")]
public bool IsMob = false;
public DataRow MobDressColor;
public DataRow MobHeadColor;
public List<Texture2D> MobHeadTextures = new List<Texture2D>();
[Header("Physics")]
public bool EnablePhysics = true;
public List<CySpringDataContainer> cySpringDataContainers;
public GameObject PhysicsContainer;
public float BodyScale = 1;
[Header("Live")]
public bool IsLive = false;
public bool LiveVisible = true;
@@ -93,369 +27,6 @@ public class UmaContainer : MonoBehaviour
protected UmaViewerMain Main => UmaViewerMain.Instance;
protected UmaViewerUI UI => UmaViewerUI.Instance;
public void Initialize(bool smile)
{
TrackTarget = new GameObject("TrackTarget").transform;
TrackTarget.SetParent(transform);
TrackTarget.position = HeadBone.transform.TransformPoint(0, 0, 10);
UpBodyPosition = UpBodyBone.transform.localPosition;
UpBodyRotation = UpBodyBone.transform.localRotation;
//Models must be merged before handling extra morphs
if (FaceDrivenKeyTarget && smile)
FaceDrivenKeyTarget.ChangeMorphWeight(FaceDrivenKeyTarget.MouthMorphs[3], 1);
CreateIK();
}
public void MergeModel()
{
if (!Body) return;
var bodyBones = Body.GetComponentInChildren<SkinnedMeshRenderer>().bones.ToDictionary(bone => bone.name, bone => bone.transform);
List<Transform> emptyBones = new List<Transform>();
emptyBones.Add(Body.transform.Find("Position/Hip/Tail_Ctrl"));
while (Body.transform.childCount > 0)
{
Body.transform.GetChild(0).SetParent(transform);
}
Body.SetActive(false); //for debugging
//MergeHead
if (Head)
{
var headskins = Head.GetComponentsInChildren<SkinnedMeshRenderer>();
foreach (SkinnedMeshRenderer headskin in headskins)
{
MergeBone(headskin, bodyBones,ref emptyBones);
}
var eyes = new GameObject("Eyes");
eyes.transform.SetParent(transform);
while (Head.transform.childCount > 0)
{
var child = Head.transform.GetChild(0);
child.SetParent(child.name.Contains("info") ? eyes.transform : transform);
}
Head.SetActive(false); //for debugging
}
//MergeTail
if (Tail)
{
var tailskin = Tail.GetComponentInChildren<SkinnedMeshRenderer>();
MergeBone(tailskin, bodyBones, ref emptyBones);
while (Tail.transform.childCount > 0)
{
var child = Tail.transform.GetChild(0);
child.SetParent(transform);
}
Tail.SetActive(false); //for debugging
}
emptyBones.ForEach(a => { if (a) Destroy(a.gameObject); });
//MergeAvatar
UmaAnimator = gameObject.AddComponent<Animator>();
UmaAnimator.avatar = AvatarBuilder.BuildGenericAvatar(gameObject, gameObject.name);
OverrideController = Instantiate(UmaViewerBuilder.Instance.OverrideController);
UmaAnimator.runtimeAnimatorController = OverrideController;
//Materials
foreach (var rend in gameObject.GetComponentsInChildren<Renderer>())
{
for(int i = 0; i < rend.materials.Length; i++)
{
Material mat = rend.materials[i];
var matHlp = Materials.FirstOrDefault(m => m.Mat == mat);
if (matHlp == null)
{
matHlp = new MaterialHelper()
{
Mat = mat,
Renderers = new Dictionary<Renderer, List<int>>(),
Toggle = Instantiate(UmaViewerUI.Instance.UmaContainerTogglePrefab, UmaViewerUI.Instance.MaterialsList.content)
};
matHlp.Toggle.Name = mat.name;
matHlp.Toggle.Toggle.onValueChanged.AddListener((value) => { Debug.Log("e"); matHlp.ToggleMaterials(value); });
Materials.Add(matHlp);
}
if (!matHlp.Renderers.ContainsKey(rend))
{
matHlp.Renderers.Add(rend, new List<int> { i });
}
else
{
matHlp.Renderers[rend].Add(i);
}
}
}
}
public void MergeHairModel()
{
if (!Head || !Hair) return;
var bodyBones = Head.GetComponentInChildren<SkinnedMeshRenderer>().bones.ToDictionary(bone => bone.name, bone => bone.transform);
List<Transform> emptyBones = new List<Transform>();
var headHolder = Head.GetComponent<AssetHolder>();
var hairHolder = Hair.GetComponent<AssetHolder>();
headHolder._assetTable.list.AddRange(hairHolder._assetTable.list);
headHolder._assetTableValue.list.AddRange(hairHolder._assetTableValue.list);
//MergeHair
var hairskins = Hair.GetComponentsInChildren<SkinnedMeshRenderer>();
foreach (SkinnedMeshRenderer hairskin in hairskins)
{
hairskin.gameObject.transform.SetParent(Head.transform);
MergeBone(hairskin, bodyBones ,ref emptyBones);
}
Hair.gameObject.SetActive(false);
emptyBones.ForEach(a => { if (a) Destroy(a.gameObject); });
}
public void SetHeight(int scale = 0)
{
if (scale == 0)
{
BodyScale = 1;
}
else if (scale == -1)
{
BodyScale = (Convert.ToInt32(CharaData[IsMob ? "chara_height" : "scale"]) / 160.7529f);
}
else
{
BodyScale = (scale / 160.7529f);
}
transform.Find("Position").localScale = new Vector3(BodyScale, BodyScale, BodyScale);
}
public void MergeBone(SkinnedMeshRenderer from, Dictionary<string, Transform> targetBones,ref List<Transform> emptyBones)
{
var rootbone = targetBones[from.rootBone.name];
if (rootbone) from.rootBone = rootbone;
Transform[] tmpBone = new Transform[from.bones.Length];
for (int i = 0; i < tmpBone.Length; i++)
{
if (targetBones.TryGetValue(from.bones[i].name, out Transform targetbone))
{
tmpBone[i] = targetbone;
from.bones[i].position = targetbone.position;
while (from.bones[i].transform.childCount > 0)
{
from.bones[i].transform.GetChild(0).SetParent(targetbone);
}
emptyBones.Add(from.bones[i]);
}
else
{
tmpBone[i] = from.bones[i];
}
}
from.bones = tmpBone;
}
public void LoadPhysics()
{
cySpringDataContainers = new List<CySpringDataContainer>(PhysicsContainer.GetComponentsInChildren<CySpringDataContainer>());
var bones = new Dictionary<string,Transform>();
foreach (var bone in GetComponentsInChildren<Transform>())
{
if (!bones.ContainsKey(bone.name))
bones.Add(bone.name, bone);
}
var colliders = new Dictionary<string, Transform>();
for (int i = 0; i < cySpringDataContainers.Count; i++)
{
colliders = UmaUtility.MergeDictionaries(colliders,cySpringDataContainers[i].InitiallizeCollider(bones));
}
for (int i = 0; i < cySpringDataContainers.Count; i++)
{
cySpringDataContainers[i].InitializePhysics(bones, colliders);
}
}
public void SetDynamicBoneEnable(bool isOn)
{
if (IsMini) return;
EnablePhysics = isOn;
foreach (CySpringDataContainer cySpring in cySpringDataContainers)
{
cySpring.EnablePhysics(isOn);
}
}
Collider dragCollider;
float dragdistance;
Vector3 dragStartPos;
private void FixedUpdate()
{
if (!IsMini)
{
if (TrackTarget && EnableEyeTracking && !isAnimatorControl)
{
if (IK && !IK.enabled)
{
IK.enabled = true;
if(PuppetMaster.mode != PuppetMaster.Mode.Active)
{
PuppetMaster.mode = PuppetMaster.Mode.Active;
}
}
var finalRotation = FaceDrivenKeyTarget.GetEyeTrackRotation(TrackTarget.transform.position);
FaceDrivenKeyTarget.SetEyeTrack(finalRotation);
var cam = Camera.main;
var distance = Mathf.Clamp(cam.transform.InverseTransformPoint(HeadBone.transform.position).magnitude - 0.1f, 0, 2);
var mousePos = new Vector3(Input.mousePosition.x, Input.mousePosition.y, distance);
var worldPos = cam.ScreenToWorldPoint(mousePos);
//Hold D key to Drag Body
if (Input.GetKey(KeyCode.D))
{
if (dragCollider && dragCollider.attachedRigidbody)
{
if (PuppetMaster)
{
PuppetMaster.pinWeight = 0.75f;
PuppetMaster.muscleWeight = 0.25f;
}
dragCollider.attachedRigidbody.isKinematic = true;
dragCollider.transform.position = Vector3.Lerp(dragCollider.transform.position, cam.ScreenToWorldPoint(new Vector3(mousePos.x, mousePos.y, dragdistance)) - dragStartPos, Time.fixedDeltaTime * 4);
//LookAt Mouse when Dragging
TrackTarget.position = Vector3.Lerp(TrackTarget.position, dragCollider.transform.position, Time.fixedDeltaTime * 3);
}
else
{
if (Physics.Raycast(cam.ScreenPointToRay(mousePos), out RaycastHit hit))
{
dragCollider = hit.collider;
dragStartPos = (hit.point - hit.collider.transform.position);
dragdistance = cam.transform.InverseTransformPoint(hit.point).magnitude;
}
//LookAt Camera
TrackTarget.position = Vector3.Lerp(TrackTarget.position, cam.transform.position, Time.fixedDeltaTime * 3);
}
}
else
{
if (PuppetMaster)
{
PuppetMaster.pinWeight = 1;
PuppetMaster.muscleWeight = 1;
}
//LookAt Camera
TrackTarget.position = Vector3.Lerp(TrackTarget.position, cam.transform.position, Time.fixedDeltaTime * 3);
if (dragCollider && dragCollider.attachedRigidbody) dragCollider.attachedRigidbody.isKinematic = false;
dragCollider = null;
}
}
else
{
if (IK && IK.enabled)
{
IK.enabled = false;
if (PuppetMaster.mode != PuppetMaster.Mode.Kinematic)
{
PuppetMaster.mode = PuppetMaster.Mode.Kinematic;
}
}
}
if (isAnimatorControl)
{
FaceDrivenKeyTarget.ProcessLocator();
}
if (FaceMaterial)
{
if (isAnimatorControl)
{
FaceMaterial.SetVector("_FaceForward", Vector3.zero);
FaceMaterial.SetVector("_FaceUp", Vector3.zero);
FaceMaterial.SetVector("_FaceCenterPos", Vector3.zero);
}
else
{
//Used to calculate facial shadows
FaceMaterial.SetVector("_FaceForward", HeadBone.transform.forward);
FaceMaterial.SetVector("_FaceUp", HeadBone.transform.up);
FaceMaterial.SetVector("_FaceCenterPos", HeadBone.transform.position);
}
FaceMaterial.SetFloat("_faceShadowEndY", HeadBone.transform.position.y);
}
TearControllers.ForEach(a => a.UpdateOffset());
}
}
public void UpBodyReset()
{
if (UpBodyBone)
{
UpBodyBone.transform.localPosition = UpBodyPosition;
UpBodyBone.transform.localRotation = UpBodyRotation;
}
}
BipedIK IK;
PuppetMaster PuppetMaster;
public void CreateIK()
{
if (IsMini) return;
var container = this;
var animator = UmaAnimator;
BipedRagdollReferences r = BipedRagdollReferences.FromAvatar(animator);
BipedRagdollCreator.Options options = BipedRagdollCreator.AutodetectOptions(r);
var ik = container.gameObject.AddComponent<BipedIK>();
ik.references.root = container.transform;
ik.references.pelvis = r.hips;
ik.references.spine = new Transform[] { r.spine, r.chest };
ik.references.leftThigh = r.leftUpperLeg;
ik.references.leftCalf = r.leftLowerLeg;
ik.references.leftFoot = r.leftFoot;
ik.references.rightThigh = r.rightUpperLeg;
ik.references.rightCalf = r.rightLowerLeg;
ik.references.rightFoot = r.rightFoot;
ik.references.leftUpperArm = r.leftUpperArm;
ik.references.leftForearm = r.leftLowerArm;
ik.references.leftHand = r.leftHand;
ik.references.rightUpperArm = r.rightUpperArm;
ik.references.rightForearm = r.rightLowerArm;
ik.references.rightHand = r.rightHand;
ik.references.head = r.head;
new List<IKSolver>(ik.solvers.ikSolvers).ForEach(i => i.IKPositionWeight = 0);
new List<IKSolverLimb>(ik.solvers.limbs).ForEach(i => i.IKRotationWeight = 0);
ik.solvers.lookAt.IKPositionWeight = 1;
ik.solvers.lookAt.headWeight = 0.8f;
ik.solvers.lookAt.bodyWeight = 0.25f;
ik.solvers.lookAt.clampWeightHead = 0.62f;
ik.solvers.lookAt.target = TrackTarget.transform;
ik.solvers.lookAt.spineWeightCurve = new AnimationCurve(new Keyframe[2] { new Keyframe(0f, 1f), new Keyframe(1f, 0.3f) });
IK = ik;
BipedRagdollCreator.Create(r, options);
PuppetMaster = PuppetMaster.SetUp(container.transform, 8, 9);
PuppetMaster.solverIterationCount = 3;
PuppetMaster.FlattenHierarchy();
}
public class MaterialHelper
{
public Material Mat;
+522
View File
@@ -13,6 +13,446 @@ using Random = UnityEngine.Random;
public class UmaContainerCharacter : UmaContainer
{
public CharaEntry CharaEntry;
public DataRow CharaData;
public GameObject Body;
public GameObject Tail;
public GameObject Head;
public GameObject Hair;
public List<Texture2D> TailTextures = new List<Texture2D>();
[Header("Animator")]
public Animator UmaAnimator;
public AnimatorOverrideController OverrideController;
public Animator UmaFaceAnimator;
public AnimatorOverrideController FaceOverrideController;
public bool isAnimatorControl;
[Header("Body")]
public GameObject UpBodyBone;
public Vector3 UpBodyPosition;
public Quaternion UpBodyRotation;
[Header("Face")]
public FaceDrivenKeyTarget FaceDrivenKeyTarget;
public FaceEmotionKeyTarget FaceEmotionKeyTarget;
public FaceOverrideData FaceOverrideData;
public GameObject HeadBone;
public Transform TrackTarget;
public float EyeHeight;
public bool EnableEyeTracking = true;
public Material FaceMaterial;
[Header("Cheek")]
public Texture CheekTex_0;
public Texture CheekTex_1;
public Texture CheekTex_2;
[Header("Manga")]
public List<GameObject> LeftMangaObject = new List<GameObject>();
public List<GameObject> RightMangaObject = new List<GameObject>();
[Header("Tear")]
public GameObject TearPrefab_0;
public GameObject TearPrefab_1;
public List<TearController> TearControllers = new List<TearController>();
[Header("Generic")]
public bool IsGeneric = false;
public string VarCostumeIdShort, VarCostumeIdLong, VarSkin, VarHeight, VarSocks, VarBust;
public List<Texture2D> GenericBodyTextures = new List<Texture2D>();
[Header("Mini")]
public bool IsMini = false;
public List<Texture2D> MiniHeadTextures = new List<Texture2D>();
[Header("Mob")]
public bool IsMob = false;
public DataRow MobDressColor;
public DataRow MobHeadColor;
public List<Texture2D> MobHeadTextures = new List<Texture2D>();
[Header("Physics")]
public bool EnablePhysics = true;
public List<CySpringDataContainer> cySpringDataContainers;
public GameObject PhysicsContainer;
public float BodyScale = 1;
private float dragdistance;
private Vector3 dragStartPos;
private Collider dragCollider;
private BipedIK IK;
private PuppetMaster PuppetMaster;
public void Initialize(bool smile)
{
TrackTarget = new GameObject("TrackTarget").transform;
TrackTarget.SetParent(transform);
TrackTarget.position = HeadBone.transform.TransformPoint(0, 0, 10);
UpBodyPosition = UpBodyBone.transform.localPosition;
UpBodyRotation = UpBodyBone.transform.localRotation;
//Models must be merged before handling extra morphs
if (FaceDrivenKeyTarget && smile)
FaceDrivenKeyTarget.ChangeMorphWeight(FaceDrivenKeyTarget.MouthMorphs[3], 1);
CreateIK();
}
public void MergeModel()
{
if (!Body) return;
var bodyBones = Body.GetComponentInChildren<SkinnedMeshRenderer>().bones.ToDictionary(bone => bone.name, bone => bone.transform);
List<Transform> emptyBones = new List<Transform>();
emptyBones.Add(Body.transform.Find("Position/Hip/Tail_Ctrl"));
while (Body.transform.childCount > 0)
{
Body.transform.GetChild(0).SetParent(transform);
}
Body.SetActive(false); //for debugging
//MergeHead
if (Head)
{
var headskins = Head.GetComponentsInChildren<SkinnedMeshRenderer>();
foreach (SkinnedMeshRenderer headskin in headskins)
{
MergeBone(headskin, bodyBones, ref emptyBones);
}
var eyes = new GameObject("Eyes");
eyes.transform.SetParent(transform);
while (Head.transform.childCount > 0)
{
var child = Head.transform.GetChild(0);
child.SetParent(child.name.Contains("info") ? eyes.transform : transform);
}
Head.SetActive(false); //for debugging
}
//MergeTail
if (Tail)
{
var tailskin = Tail.GetComponentInChildren<SkinnedMeshRenderer>();
MergeBone(tailskin, bodyBones, ref emptyBones);
while (Tail.transform.childCount > 0)
{
var child = Tail.transform.GetChild(0);
child.SetParent(transform);
}
Tail.SetActive(false); //for debugging
}
emptyBones.ForEach(a => { if (a) Destroy(a.gameObject); });
//MergeAvatar
UmaAnimator = gameObject.AddComponent<Animator>();
UmaAnimator.avatar = AvatarBuilder.BuildGenericAvatar(gameObject, gameObject.name);
OverrideController = Instantiate(UmaViewerBuilder.Instance.OverrideController);
UmaAnimator.runtimeAnimatorController = OverrideController;
//Materials
foreach (var rend in gameObject.GetComponentsInChildren<Renderer>())
{
for (int i = 0; i < rend.materials.Length; i++)
{
Material mat = rend.materials[i];
var matHlp = Materials.FirstOrDefault(m => m.Mat == mat);
if (matHlp == null)
{
matHlp = new MaterialHelper()
{
Mat = mat,
Renderers = new Dictionary<Renderer, List<int>>(),
Toggle = Instantiate(UmaViewerUI.Instance.UmaContainerTogglePrefab, UmaViewerUI.Instance.MaterialsList.content)
};
matHlp.Toggle.Name = mat.name;
matHlp.Toggle.Toggle.onValueChanged.AddListener((value) => { Debug.Log("e"); matHlp.ToggleMaterials(value); });
Materials.Add(matHlp);
}
if (!matHlp.Renderers.ContainsKey(rend))
{
matHlp.Renderers.Add(rend, new List<int> { i });
}
else
{
matHlp.Renderers[rend].Add(i);
}
}
}
}
public void MergeHairModel()
{
if (!Head || !Hair) return;
var bodyBones = Head.GetComponentInChildren<SkinnedMeshRenderer>().bones.ToDictionary(bone => bone.name, bone => bone.transform);
List<Transform> emptyBones = new List<Transform>();
var headHolder = Head.GetComponent<AssetHolder>();
var hairHolder = Hair.GetComponent<AssetHolder>();
headHolder._assetTable.list.AddRange(hairHolder._assetTable.list);
headHolder._assetTableValue.list.AddRange(hairHolder._assetTableValue.list);
//MergeHair
var hairskins = Hair.GetComponentsInChildren<SkinnedMeshRenderer>();
foreach (SkinnedMeshRenderer hairskin in hairskins)
{
hairskin.gameObject.transform.SetParent(Head.transform);
MergeBone(hairskin, bodyBones, ref emptyBones);
}
Hair.gameObject.SetActive(false);
emptyBones.ForEach(a => { if (a) Destroy(a.gameObject); });
}
public void SetHeight(int scale = 0)
{
if (scale == 0)
{
BodyScale = 1;
}
else if (scale == -1)
{
BodyScale = (Convert.ToInt32(CharaData[IsMob ? "chara_height" : "scale"]) / 160.7529f);
}
else
{
BodyScale = (scale / 160.7529f);
}
transform.Find("Position").localScale = new Vector3(BodyScale, BodyScale, BodyScale);
}
public void MergeBone(SkinnedMeshRenderer from, Dictionary<string, Transform> targetBones, ref List<Transform> emptyBones)
{
var rootbone = targetBones[from.rootBone.name];
if (rootbone) from.rootBone = rootbone;
Transform[] tmpBone = new Transform[from.bones.Length];
for (int i = 0; i < tmpBone.Length; i++)
{
if (targetBones.TryGetValue(from.bones[i].name, out Transform targetbone))
{
tmpBone[i] = targetbone;
from.bones[i].position = targetbone.position;
while (from.bones[i].transform.childCount > 0)
{
from.bones[i].transform.GetChild(0).SetParent(targetbone);
}
emptyBones.Add(from.bones[i]);
}
else
{
tmpBone[i] = from.bones[i];
}
}
from.bones = tmpBone;
}
public void LoadPhysics()
{
cySpringDataContainers = new List<CySpringDataContainer>(PhysicsContainer.GetComponentsInChildren<CySpringDataContainer>());
var bones = new Dictionary<string, Transform>();
foreach (var bone in GetComponentsInChildren<Transform>())
{
if (!bones.ContainsKey(bone.name))
bones.Add(bone.name, bone);
}
var colliders = new Dictionary<string, Transform>();
for (int i = 0; i < cySpringDataContainers.Count; i++)
{
colliders = UmaUtility.MergeDictionaries(colliders, cySpringDataContainers[i].InitiallizeCollider(bones));
}
for (int i = 0; i < cySpringDataContainers.Count; i++)
{
cySpringDataContainers[i].InitializePhysics(bones, colliders);
}
}
public void SetDynamicBoneEnable(bool isOn)
{
if (IsMini) return;
EnablePhysics = isOn;
foreach (CySpringDataContainer cySpring in cySpringDataContainers)
{
cySpring.EnablePhysics(isOn);
}
}
public void SetEyeTracking(bool isOn)
{
EnableEyeTracking = isOn;
}
public void SetFaceOverrideData(bool isOn)
{
EnableEyeTracking = isOn;
}
private void FixedUpdate()
{
if (!IsMini)
{
if (TrackTarget && EnableEyeTracking && !isAnimatorControl)
{
if (IK && !IK.enabled)
{
IK.enabled = true;
if (PuppetMaster.mode != PuppetMaster.Mode.Active)
{
PuppetMaster.mode = PuppetMaster.Mode.Active;
}
}
var finalRotation = FaceDrivenKeyTarget.GetEyeTrackRotation(TrackTarget.transform.position);
FaceDrivenKeyTarget.SetEyeTrack(finalRotation);
var cam = Camera.main;
var distance = Mathf.Clamp(cam.transform.InverseTransformPoint(HeadBone.transform.position).magnitude - 0.1f, 0, 2);
var mousePos = new Vector3(Input.mousePosition.x, Input.mousePosition.y, distance);
var worldPos = cam.ScreenToWorldPoint(mousePos);
//Hold D key to Drag Body
if (Input.GetKey(KeyCode.D))
{
if (dragCollider && dragCollider.attachedRigidbody)
{
if (PuppetMaster)
{
PuppetMaster.pinWeight = 0.75f;
PuppetMaster.muscleWeight = 0.25f;
}
dragCollider.attachedRigidbody.isKinematic = true;
dragCollider.transform.position = Vector3.Lerp(dragCollider.transform.position, cam.ScreenToWorldPoint(new Vector3(mousePos.x, mousePos.y, dragdistance)) - dragStartPos, Time.fixedDeltaTime * 4);
//LookAt Mouse when Dragging
TrackTarget.position = Vector3.Lerp(TrackTarget.position, dragCollider.transform.position, Time.fixedDeltaTime * 3);
}
else
{
if (Physics.Raycast(cam.ScreenPointToRay(mousePos), out RaycastHit hit))
{
dragCollider = hit.collider;
dragStartPos = (hit.point - hit.collider.transform.position);
dragdistance = cam.transform.InverseTransformPoint(hit.point).magnitude;
}
//LookAt Camera
TrackTarget.position = Vector3.Lerp(TrackTarget.position, cam.transform.position, Time.fixedDeltaTime * 3);
}
}
else
{
if (PuppetMaster)
{
PuppetMaster.pinWeight = 1;
PuppetMaster.muscleWeight = 1;
}
//LookAt Camera
TrackTarget.position = Vector3.Lerp(TrackTarget.position, cam.transform.position, Time.fixedDeltaTime * 3);
if (dragCollider && dragCollider.attachedRigidbody) dragCollider.attachedRigidbody.isKinematic = false;
dragCollider = null;
}
}
else
{
if (IK && IK.enabled)
{
IK.enabled = false;
if (PuppetMaster.mode != PuppetMaster.Mode.Kinematic)
{
PuppetMaster.mode = PuppetMaster.Mode.Kinematic;
}
}
}
if (isAnimatorControl)
{
FaceDrivenKeyTarget.ProcessLocator();
}
if (FaceMaterial)
{
if (isAnimatorControl)
{
FaceMaterial.SetVector("_FaceForward", Vector3.zero);
FaceMaterial.SetVector("_FaceUp", Vector3.zero);
FaceMaterial.SetVector("_FaceCenterPos", Vector3.zero);
}
else
{
//Used to calculate facial shadows
FaceMaterial.SetVector("_FaceForward", HeadBone.transform.forward);
FaceMaterial.SetVector("_FaceUp", HeadBone.transform.up);
FaceMaterial.SetVector("_FaceCenterPos", HeadBone.transform.position);
}
FaceMaterial.SetFloat("_faceShadowEndY", HeadBone.transform.position.y);
}
TearControllers.ForEach(a => a.UpdateOffset());
}
}
public void UpBodyReset()
{
if (UpBodyBone)
{
UpBodyBone.transform.localPosition = UpBodyPosition;
UpBodyBone.transform.localRotation = UpBodyRotation;
}
}
public void CreateIK()
{
if (IsMini) return;
var container = this;
var animator = UmaAnimator;
BipedRagdollReferences r = BipedRagdollReferences.FromAvatar(animator);
BipedRagdollCreator.Options options = BipedRagdollCreator.AutodetectOptions(r);
var ik = container.gameObject.AddComponent<BipedIK>();
ik.references.root = container.transform;
ik.references.pelvis = r.hips;
ik.references.spine = new Transform[] { r.spine, r.chest };
ik.references.leftThigh = r.leftUpperLeg;
ik.references.leftCalf = r.leftLowerLeg;
ik.references.leftFoot = r.leftFoot;
ik.references.rightThigh = r.rightUpperLeg;
ik.references.rightCalf = r.rightLowerLeg;
ik.references.rightFoot = r.rightFoot;
ik.references.leftUpperArm = r.leftUpperArm;
ik.references.leftForearm = r.leftLowerArm;
ik.references.leftHand = r.leftHand;
ik.references.rightUpperArm = r.rightUpperArm;
ik.references.rightForearm = r.rightLowerArm;
ik.references.rightHand = r.rightHand;
ik.references.head = r.head;
new List<IKSolver>(ik.solvers.ikSolvers).ForEach(i => i.IKPositionWeight = 0);
new List<IKSolverLimb>(ik.solvers.limbs).ForEach(i => i.IKRotationWeight = 0);
ik.solvers.lookAt.IKPositionWeight = 1;
ik.solvers.lookAt.headWeight = 0.8f;
ik.solvers.lookAt.bodyWeight = 0.25f;
ik.solvers.lookAt.clampWeightHead = 0.62f;
ik.solvers.lookAt.target = TrackTarget.transform;
ik.solvers.lookAt.spineWeightCurve = new AnimationCurve(new Keyframe[2] { new Keyframe(0f, 1f), new Keyframe(1f, 0.3f) });
IK = ik;
BipedRagdollCreator.Create(r, options);
PuppetMaster = PuppetMaster.SetUp(container.transform, 8, 9);
PuppetMaster.solverIterationCount = 3;
PuppetMaster.FlattenHierarchy();
}
public void LoadTextures(UmaDatabaseEntry entry)
{
foreach(Texture2D tex2D in entry.GetAll<Texture2D>())
@@ -793,4 +1233,86 @@ public class UmaContainerCharacter : UmaContainer
{
UmaViewerUI.Instance.AnimationPause();
}
public void LoadFaceMorph(int id, string costumeId)
{
if (!Head) return;
var locatorEntry = Main.AbList["3d/animator/drivenkeylocator"];
var bundle = UmaAssetManager.LoadAssetBundle(locatorEntry);
var locator = Instantiate(bundle.LoadAsset("DrivenKeyLocator"), transform) as GameObject;
locator.name = "DrivenKeyLocator";
var headBone = (GameObject)Head.GetComponent<AssetHolder>()._assetTable["head"];
var eyeLocator_L = headBone.transform.Find("Eye_target_locator_L");
var eyeLocator_R = headBone.transform.Find("Eye_target_locator_R");
var mangaEntry = new List<UmaDatabaseEntry>()
{
Main.AbList["3d/effect/charaemotion/pfb_eff_chr_emo_eye_000"],
Main.AbList["3d/effect/charaemotion/pfb_eff_chr_emo_eye_001"],
Main.AbList["3d/effect/charaemotion/pfb_eff_chr_emo_eye_002"],
Main.AbList["3d/effect/charaemotion/pfb_eff_chr_emo_eye_003"],
};
var mangaObjects = new List<GameObject>();
mangaEntry.ForEach(entry =>
{
AssetBundle ab = UmaAssetManager.LoadAssetBundle(entry);
var obj = ab.LoadAsset(Path.GetFileNameWithoutExtension(entry.Name)) as GameObject;
obj.SetActive(false);
var leftObj = Instantiate(obj, eyeLocator_L.transform);
new List<Renderer>(leftObj.GetComponentsInChildren<Renderer>()).ForEach(a => a.material.renderQueue = -1);
LeftMangaObject.Add(leftObj);
var RightObj = Instantiate(obj, eyeLocator_R.transform);
if (RightObj.TryGetComponent<AssetHolder>(out var holder))
{
if (holder._assetTableValue["invert"] > 0)
RightObj.transform.localScale = new Vector3(-1, 1, 1);
}
new List<Renderer>(RightObj.GetComponentsInChildren<Renderer>()).ForEach(a => { a.material.renderQueue = -1; });
RightMangaObject.Add(RightObj);
});
var tearEntry = new List<UmaDatabaseEntry>() {
Main.AbList["3d/chara/common/tear/tear000/pfb_chr_tear000"],
Main.AbList["3d/chara/common/tear/tear001/pfb_chr_tear001"],
};
if (tearEntry.Count > 0)
{
tearEntry.ForEach(a => LoadTear(a));
}
if (TearPrefab_0 && TearPrefab_1)
{
var p0 = TearPrefab_0;
var p1 = TearPrefab_1;
var t = headBone.transform;
TearControllers.Add(new TearController(t, Instantiate(p0, t), Instantiate(p1, t), 0, 1));
TearControllers.Add(new TearController(t, Instantiate(p0, t), Instantiate(p1, t), 1, 1));
TearControllers.Add(new TearController(t, Instantiate(p0, t), Instantiate(p1, t), 0, 0));
TearControllers.Add(new TearController(t, Instantiate(p0, t), Instantiate(p1, t), 1, 0));
}
var firsehead = Head;
var faceDriven = Instantiate(firsehead.GetComponent<AssetHolder>()._assetTable["facial_target"]) as FaceDrivenKeyTarget;
var earDriven = firsehead.GetComponent<AssetHolder>()._assetTable["ear_target"] as DrivenKeyTarget;
var faceOverride = firsehead.GetComponent<AssetHolder>()._assetTable["face_override"] as FaceOverrideData;
faceDriven._earTarget = earDriven._targetFaces;
FaceDrivenKeyTarget = faceDriven;
FaceDrivenKeyTarget.Container = this;
FaceOverrideData = faceOverride;
faceOverride?.SetEnable(UI.EnableFaceOverride);
faceDriven.DrivenKeyLocator = locator.transform;
faceDriven.Initialize(UmaUtility.ConvertArrayToDictionary(firsehead.GetComponentsInChildren<Transform>()));
var emotionDriven = ScriptableObject.CreateInstance<FaceEmotionKeyTarget>();
emotionDriven.name = $"char{id}_{costumeId}_emotion_target";
FaceEmotionKeyTarget = emotionDriven;
emotionDriven.FaceDrivenKeyTarget = faceDriven;
emotionDriven.FaceEmotionKey = UmaDatabaseController.Instance.FaceTypeData;
emotionDriven.Initialize();
}
}
+37 -121
View File
@@ -24,7 +24,7 @@ public class UmaViewerBuilder : MonoBehaviour
public List<Shader> ShaderList = new List<Shader>();
public Material TransMaterialCharas;
public Material TransMaterialProps;
public UmaContainer CurrentUMAContainer;
public UmaContainerCharacter CurrentUMAContainer;
public UmaContainer CurrentOtherContainer;
public UmaHeadData CurrentHead;
@@ -50,28 +50,29 @@ public class UmaViewerBuilder : MonoBehaviour
public IEnumerator LoadUma(CharaEntry chara, string costumeId, bool mini)
{
int id = chara.Id;
CurrentUMAContainer = new GameObject($"Chara_{id}_{costumeId}").AddComponent<UmaContainerCharacter>();
CurrentUMAContainer.CharaEntry = chara;
var umaContainer = new GameObject($"Chara_{id}_{costumeId}").AddComponent<UmaContainerCharacter>();
umaContainer.CharaEntry = chara;
CurrentUMAContainer = umaContainer;
if (mini)
{
CurrentUMAContainer.CharaData = UmaDatabaseController.ReadCharaData(chara);
LoadMiniUma(chara, costumeId);
umaContainer.CharaData = UmaDatabaseController.ReadCharaData(chara);
LoadMiniUma(umaContainer, chara, costumeId);
}
else if (chara.IsMob)
{
CurrentUMAContainer.CharaData = UmaDatabaseController.ReadCharaData(chara);
LoadMobUma(chara, costumeId, loadMotion: true);
umaContainer.CharaData = UmaDatabaseController.ReadCharaData(chara);
LoadMobUma(umaContainer, chara, costumeId, loadMotion: true);
}
else if (UI.isHeadFix && CurrentHead != null && CurrentHead.chara.IsMob)
{
CurrentUMAContainer.CharaData = UmaDatabaseController.ReadCharaData(CurrentHead.chara);
LoadMobUma(CurrentHead.chara, costumeId, chara.Id, true);
umaContainer.CharaData = UmaDatabaseController.ReadCharaData(CurrentHead.chara);
LoadMobUma(umaContainer, CurrentHead.chara, costumeId, chara.Id, true);
}
else
{
CurrentUMAContainer.CharaData = UmaDatabaseController.ReadCharaData(chara);
LoadNormalUma(chara, costumeId, true);
umaContainer.CharaData = UmaDatabaseController.ReadCharaData(chara);
LoadNormalUma(umaContainer, chara, costumeId, true);
}
yield break;
@@ -84,33 +85,32 @@ public class UmaViewerBuilder : MonoBehaviour
{
if (characters[i].CharaEntry.Name != "")
{
CurrentUMAContainer = new GameObject($"Chara_{characters[i].CharaEntry.Id}_{characters[i].CostumeId}").AddComponent<UmaContainerCharacter>();
var umaContainer = new GameObject($"Chara_{characters[i].CharaEntry.Id}_{characters[i].CostumeId}").AddComponent<UmaContainerCharacter>();
if (characters[i].CharaEntry.IsMob)
{
CurrentUMAContainer.IsLive = true;
CurrentUMAContainer.CharaData = UmaDatabaseController.ReadCharaData(characters[i].CharaEntry);
CurrentUMAContainer.transform.parent = Gallop.Live.Director.instance.charaObjs[i];
CurrentUMAContainer.transform.localPosition = new Vector3();
LoadMobUma(characters[i].CharaEntry, characters[i].CostumeId);
umaContainer.IsLive = true;
umaContainer.CharaData = UmaDatabaseController.ReadCharaData(characters[i].CharaEntry);
umaContainer.transform.parent = Gallop.Live.Director.instance.charaObjs[i];
umaContainer.transform.localPosition = new Vector3();
LoadMobUma(umaContainer, characters[i].CharaEntry, characters[i].CostumeId);
}
else
{
CurrentUMAContainer.IsLive = true;
CurrentUMAContainer.CharaData = UmaDatabaseController.ReadCharaData(characters[i].CharaEntry);
CurrentUMAContainer.transform.parent = Gallop.Live.Director.instance.charaObjs[i];
CurrentUMAContainer.transform.localPosition = new Vector3();
LoadNormalUma(characters[i].CharaEntry, characters[i].CostumeId);
umaContainer.IsLive = true;
umaContainer.CharaData = UmaDatabaseController.ReadCharaData(characters[i].CharaEntry);
umaContainer.transform.parent = Gallop.Live.Director.instance.charaObjs[i];
umaContainer.transform.localPosition = new Vector3();
LoadNormalUma(umaContainer, characters[i].CharaEntry, characters[i].CostumeId);
}
Gallop.Live.Director.instance.CharaContainerScript.Add(CurrentUMAContainer);
Gallop.Live.Director.instance.CharaContainerScript.Add(umaContainer);
}
}
}
private void LoadNormalUma(CharaEntry chara, string costumeId, bool loadMotion = false)
private void LoadNormalUma(UmaContainerCharacter umaContainer, CharaEntry chara, string costumeId, bool loadMotion = false)
{
var umaContainer = CurrentUMAContainer as UmaContainerCharacter;
int id = chara.Id;
DataRow charaData = umaContainer.CharaData;
bool genericCostume = umaContainer.IsGeneric = costumeId.Length >= 4;
@@ -299,7 +299,7 @@ public class UmaViewerBuilder : MonoBehaviour
umaContainer.LoadPhysics();
umaContainer.SetDynamicBoneEnable(UI.DynamicBoneEnable);
LoadFaceMorph(id, costumeId);
umaContainer.LoadFaceMorph(id, costumeId);
umaContainer.TearControllers.ForEach(a => a.SetDir(a.CurrentDir));
umaContainer.HeadBone = (GameObject)umaContainer.Body.GetComponent<AssetHolder>()._assetTable["head"];
umaContainer.EyeHeight = umaContainer.Head.GetComponent<AssetHolder>()._assetTableValue["head_center_offset_y"];
@@ -318,9 +318,8 @@ public class UmaViewerBuilder : MonoBehaviour
}
}
private void LoadMobUma(CharaEntry chara, string costumeId, int bodyid = -1, bool loadMotion = false)
private void LoadMobUma(UmaContainerCharacter umaContainer, CharaEntry chara, string costumeId, int bodyid = -1, bool loadMotion = false)
{
var umaContainer = CurrentUMAContainer as UmaContainerCharacter;
int id = chara.Id;
umaContainer.IsMob = chara.IsMob;
umaContainer.MobDressColor = UmaDatabaseController.ReadMobDressColor(umaContainer.CharaData["dress_color_id"].ToString());
@@ -519,7 +518,7 @@ public class UmaViewerBuilder : MonoBehaviour
umaContainer.SetDynamicBoneEnable(UI.DynamicBoneEnable);
//Load FacialMorph
LoadFaceMorph(id, costumeId);
umaContainer.LoadFaceMorph(id, costumeId);
umaContainer.TearControllers.ForEach(a => a.SetDir(a.CurrentDir));
umaContainer.HeadBone = (GameObject)umaContainer.Body.GetComponent<AssetHolder>()._assetTable["head"];
@@ -539,9 +538,8 @@ public class UmaViewerBuilder : MonoBehaviour
}
}
private void LoadMiniUma(CharaEntry chara, string costumeId)
private void LoadMiniUma(UmaContainerCharacter umaContainer, CharaEntry chara, string costumeId)
{
var umaContainer = CurrentUMAContainer as UmaContainerCharacter;
int id = chara.Id;
DataRow charaData = umaContainer.CharaData;
umaContainer.IsMini = true;
@@ -836,90 +834,7 @@ public class UmaViewerBuilder : MonoBehaviour
public void LoadAssetPath(string path, Transform SetParent)
{
Instantiate(UmaViewerMain.Instance.AbList[path].Get<GameObject>(), SetParent);
}
private void LoadFaceMorph(int id, string costumeId)
{
if (!CurrentUMAContainer.Head) return;
var umaContainer = CurrentUMAContainer as UmaContainerCharacter;
var locatorEntry = Main.AbList["3d/animator/drivenkeylocator"];
var bundle = UmaAssetManager.LoadAssetBundle(locatorEntry);
var locator = Instantiate(bundle.LoadAsset("DrivenKeyLocator"), umaContainer.transform) as GameObject;
locator.name = "DrivenKeyLocator";
var headBone = (GameObject)umaContainer.Head.GetComponent<AssetHolder>()._assetTable["head"];
var eyeLocator_L = headBone.transform.Find("Eye_target_locator_L");
var eyeLocator_R = headBone.transform.Find("Eye_target_locator_R");
var mangaEntry = new List<UmaDatabaseEntry>()
{
Main.AbList["3d/effect/charaemotion/pfb_eff_chr_emo_eye_000"],
Main.AbList["3d/effect/charaemotion/pfb_eff_chr_emo_eye_001"],
Main.AbList["3d/effect/charaemotion/pfb_eff_chr_emo_eye_002"],
Main.AbList["3d/effect/charaemotion/pfb_eff_chr_emo_eye_003"],
};
var mangaObjects = new List<GameObject>();
mangaEntry.ForEach(entry =>
{
AssetBundle ab = UmaAssetManager.LoadAssetBundle(entry);
var obj = ab.LoadAsset(Path.GetFileNameWithoutExtension(entry.Name)) as GameObject;
obj.SetActive(false);
var leftObj = Instantiate(obj, eyeLocator_L.transform);
new List<Renderer>(leftObj.GetComponentsInChildren<Renderer>()).ForEach(a => a.material.renderQueue = -1);
umaContainer.LeftMangaObject.Add(leftObj);
var RightObj = Instantiate(obj, eyeLocator_R.transform);
if (RightObj.TryGetComponent<AssetHolder>(out var holder))
{
if (holder._assetTableValue["invert"] > 0)
RightObj.transform.localScale = new Vector3(-1, 1, 1);
}
new List<Renderer>(RightObj.GetComponentsInChildren<Renderer>()).ForEach(a => { a.material.renderQueue = -1; });
umaContainer.RightMangaObject.Add(RightObj);
});
var tearEntry = new List<UmaDatabaseEntry>() {
Main.AbList["3d/chara/common/tear/tear000/pfb_chr_tear000"],
Main.AbList["3d/chara/common/tear/tear001/pfb_chr_tear001"],
};
if (tearEntry.Count > 0)
{
tearEntry.ForEach(a => umaContainer.LoadTear(a));
}
if (umaContainer.TearPrefab_0 && umaContainer.TearPrefab_1)
{
var p0 = umaContainer.TearPrefab_0;
var p1 = umaContainer.TearPrefab_1;
var t = headBone.transform;
umaContainer.TearControllers.Add(new TearController(t, Instantiate(p0, t), Instantiate(p1, t), 0, 1));
umaContainer.TearControllers.Add(new TearController(t, Instantiate(p0, t), Instantiate(p1, t), 1, 1));
umaContainer.TearControllers.Add(new TearController(t, Instantiate(p0, t), Instantiate(p1, t), 0, 0));
umaContainer.TearControllers.Add(new TearController(t, Instantiate(p0, t), Instantiate(p1, t), 1, 0));
}
var firsehead = umaContainer.Head;
var faceDriven = Instantiate(firsehead.GetComponent<AssetHolder>()._assetTable["facial_target"]) as FaceDrivenKeyTarget;
var earDriven = firsehead.GetComponent<AssetHolder>()._assetTable["ear_target"] as DrivenKeyTarget;
var faceOverride = firsehead.GetComponent<AssetHolder>()._assetTable["face_override"] as FaceOverrideData;
faceDriven._earTarget = earDriven._targetFaces;
umaContainer.FaceDrivenKeyTarget = faceDriven;
umaContainer.FaceDrivenKeyTarget.Container = umaContainer;
umaContainer.FaceOverrideData = faceOverride;
faceOverride?.SetEnable(UI.EnableFaceOverride);
faceDriven.DrivenKeyLocator = locator.transform;
faceDriven.Initialize(UmaUtility.ConvertArrayToDictionary(firsehead.GetComponentsInChildren<Transform>()));
var emotionDriven = ScriptableObject.CreateInstance<FaceEmotionKeyTarget>();
emotionDriven.name = $"char{id}_{costumeId}_emotion_target";
umaContainer.FaceEmotionKeyTarget = emotionDriven;
emotionDriven.FaceDrivenKeyTarget = faceDriven;
emotionDriven.FaceEmotionKey = UmaDatabaseController.Instance.FaceTypeData;
emotionDriven.Initialize();
}
}
public void SetPreviewCamera(AnimationClip clip)
{
@@ -932,12 +847,12 @@ public class UmaViewerBuilder : MonoBehaviour
(AnimationCameraAnimator.runtimeAnimatorController as AnimatorOverrideController)["clip_1"] = clip;
AnimationCamera.enabled = true;
AnimationCameraAnimator.Play("motion_1", 0, 0);
CurrentUMAContainer.SetHeight(0);
CurrentUMAContainer?.SetHeight(0);
}
else
{
AnimationCamera.enabled = false;
CurrentUMAContainer.SetHeight(-1);
CurrentUMAContainer?.SetHeight(-1);
}
}
@@ -1038,7 +953,8 @@ public class UmaViewerBuilder : MonoBehaviour
public void ClearMorphs()
{
if (CurrentUMAContainer != null && CurrentUMAContainer.FaceDrivenKeyTarget != null)
var umaContainer = CurrentUMAContainer;
if (umaContainer != null && umaContainer.FaceDrivenKeyTarget != null)
{
foreach (var container in UI.EmotionList.GetComponentsInChildren<UmaUIContainer>())
{
@@ -1050,10 +966,10 @@ public class UmaViewerBuilder : MonoBehaviour
if (container.Slider != null)
container.Slider.SetValueWithoutNotify(0);
}
if (CurrentUMAContainer.FaceDrivenKeyTarget)
if (umaContainer.FaceDrivenKeyTarget)
{
CurrentUMAContainer.FaceDrivenKeyTarget.ClearAllWeights();
CurrentUMAContainer.FaceDrivenKeyTarget.ChangeMorph();
umaContainer.FaceDrivenKeyTarget.ClearAllWeights();
umaContainer.FaceDrivenKeyTarget.ChangeMorph();
}
}
}
+8 -14
View File
@@ -128,21 +128,15 @@ public class UmaViewerGlobalShader : MonoBehaviour
{
//Used to calculate the correct outline
//Outline need more adjust in live
if (UmaViewerBuilder.Instance.AnimationCamera != null)
var umaContainer = UmaViewerBuilder.Instance.CurrentUMAContainer;
if (umaContainer != null && umaContainer.UpBodyBone)
{
if (UmaViewerBuilder.Instance.CurrentUMAContainer)
{
if (UmaViewerBuilder.Instance.CurrentUMAContainer.UpBodyBone)
{
var container = UmaViewerBuilder.Instance.CurrentUMAContainer;
var upBone = container.UpBodyBone;
var aniCamera = UmaViewerBuilder.Instance.AnimationCamera;
var camera = aniCamera.enabled ? aniCamera : Camera.main;
var distance = Vector3.Distance(camera.transform.position, upBone.transform.position);
var outlineWidth = (container.IsMini ? 20f : 40.0f) * (distance * Mathf.Tan(camera.fieldOfView * 0.5f * Mathf.Deg2Rad));
Shader.SetGlobalFloat("_GlobalCameraFov", outlineWidth);
}
}
var upBone = umaContainer.UpBodyBone;
var aniCamera = UmaViewerBuilder.Instance.AnimationCamera;
var camera = aniCamera.enabled ? aniCamera : Camera.main;
var distance = Vector3.Distance(camera.transform.position, upBone.transform.position);
var outlineWidth = (umaContainer.IsMini ? 20f : 40.0f) * (distance * Mathf.Tan(camera.fieldOfView * 0.5f * Mathf.Deg2Rad));
Shader.SetGlobalFloat("_GlobalCameraFov", outlineWidth);
}
else
{
+13 -22
View File
@@ -181,14 +181,15 @@ public class UmaViewerUI : MonoBehaviour
}
}
if (Builder.CurrentUMAContainer != null && Builder.CurrentUMAContainer.OverrideController != null)
var umaContainer = Builder.CurrentUMAContainer;
if (umaContainer != null && umaContainer.OverrideController != null)
{
if (Builder.CurrentUMAContainer.OverrideController["clip_2"].name != "clip_2")
if (umaContainer.OverrideController["clip_2"].name != "clip_2")
{
bool isLoop = Builder.CurrentUMAContainer.OverrideController["clip_2"].name.Contains("_loop");
var AnimeState = Builder.CurrentUMAContainer.UmaAnimator.GetCurrentAnimatorStateInfo(0);
var AnimeClip = Builder.CurrentUMAContainer.OverrideController["clip_2"];
if (AnimeClip && Builder.CurrentUMAContainer.UmaAnimator.speed != 0)
bool isLoop = umaContainer.OverrideController["clip_2"].name.Contains("_loop");
var AnimeState = umaContainer.UmaAnimator.GetCurrentAnimatorStateInfo(0);
var AnimeClip = umaContainer.OverrideController["clip_2"];
if (AnimeClip && umaContainer.UmaAnimator.speed != 0)
{
var normalizedTime = (isLoop) ? Mathf.Repeat(AnimeState.normalizedTime, 1) : Mathf.Min(AnimeState.normalizedTime, 1);
AnimationTitleText.text = AnimeClip.name;
@@ -837,7 +838,7 @@ public class UmaViewerUI : MonoBehaviour
pageentry.OnClick = (container) =>
{
HighlightChildImage(animationList.content, container);
(Builder.CurrentUMAContainer as UmaContainerCharacter)?.LoadAnimation(entry);
(Builder.CurrentUMAContainer)?.LoadAnimation(entry);
LoadedAnimation();
};
pageentrys.Add(pageentry);
@@ -885,7 +886,7 @@ public class UmaViewerUI : MonoBehaviour
container.Button.onClick.AddListener(() =>
{
HighlightChildImage(parent, container);
(Builder.CurrentUMAContainer as UmaContainerCharacter)?.LoadAnimation(entry);
(Builder.CurrentUMAContainer)?.LoadAnimation(entry);
LoadedAnimation();
});
}
@@ -1048,29 +1049,19 @@ public class UmaViewerUI : MonoBehaviour
public void SetDynamicBoneEnable(bool isOn)
{
DynamicBoneEnable = isOn;
if (Builder.CurrentUMAContainer)
{
Builder.CurrentUMAContainer.SetDynamicBoneEnable(isOn);
}
(Builder.CurrentUMAContainer)?.SetDynamicBoneEnable(isOn);
}
public void SetEyeTrackingEnable(bool isOn)
{
EnableEyeTracking = isOn;
if (Builder.CurrentUMAContainer)
{
Builder.CurrentUMAContainer.EnableEyeTracking = isOn;
}
(Builder.CurrentUMAContainer)?.SetEyeTracking(isOn);
}
public void SetFaceOverrideEnable(bool isOn)
{
EnableFaceOverride = isOn;
var container = Builder.CurrentUMAContainer;
if (container && container.FaceOverrideData)
{
container.FaceOverrideData.Enable = isOn;
}
(Builder.CurrentUMAContainer)?.SetFaceOverrideData(isOn);
}
public void AudioPause()
@@ -1162,7 +1153,7 @@ public class UmaViewerUI : MonoBehaviour
var animator_cam = Builder.AnimationCameraAnimator;
if (animator != null)
{
var AnimeClip = Builder.CurrentUMAContainer.OverrideController["clip_2"];
var AnimeClip = container.OverrideController["clip_2"];
// Pause and Seek;
animator.speed = 0;
@@ -12,7 +12,7 @@ namespace Gallop
{
public class FaceDrivenKeyTarget : ScriptableObject
{
public UmaContainer Container;
public UmaContainerCharacter Container;
public List<EyeTarget> _eyeTarget;
public List<EyebrowTarget> _eyebrowTarget;
@@ -9,11 +9,11 @@ namespace Gallop.Live.Cutt
{
public class LiveTimelineCharaLocator : ILiveTimelineCharactorLocator
{
public UmaContainer UmaContainer;
public UmaContainerCharacter UmaContainer;
public Dictionary<string, Transform> Bones;
public LiveTimelineCharaLocator(UmaContainer umaContainer)
public LiveTimelineCharaLocator(UmaContainerCharacter umaContainer)
{
UmaContainer = umaContainer;
Bones = new Dictionary<string, Transform>();
@@ -317,7 +317,7 @@ namespace Gallop.Live
public List<Transform> charaObjs;
public List<UmaContainer> CharaContainerScript = new List<UmaContainer>();
public List<UmaContainerCharacter> CharaContainerScript = new List<UmaContainerCharacter>();
public List<Animation> charaAnims;