diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Avatar.meta b/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Avatar.meta index 22302f45..4047e7f5 100644 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Avatar.meta +++ b/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Avatar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d7e80e79f110af44c95b17bc11762592 +guid: 73d4a8dc0aa5b6842a036f37e8860f22 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Avatar/VrmAvatar.asset b/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Avatar/VrmAvatar.asset index 6627dcb5..2a1989ac 100644 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Avatar/VrmAvatar.asset +++ b/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Avatar/VrmAvatar.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64ec321e2f8f631855b9accfa0441a13d706ee272acd9d6cbb70ce0a25a7cc00 -size 89381 +oid sha256:9f981099b1f717938704857912da3b8ce1bda60cd5a0c6038862eb85b40dd6eb +size 89383 diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Avatar/VrmAvatar.asset.meta b/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Avatar/VrmAvatar.asset.meta index 7390d490..06e9aced 100644 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Avatar/VrmAvatar.asset.meta +++ b/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Avatar/VrmAvatar.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 191d5747ce8e22749b2691c7385616f6 +guid: 34982e5ce57f06a4cbb8b89501912ba0 NativeFormatImporter: externalObjects: {} mainObjectFileID: 9000000 diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Materials.meta b/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Materials.meta index 6bb9f56c..6b86caca 100644 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Materials.meta +++ b/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Materials.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: aac5250f47cbb7c4a967a280a7ef2c4a +guid: b7436ec45c8c84b42bbce12956436aea folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Materials/newton.asset b/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Materials/newton.asset index e01f65b4..1c483676 100644 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Materials/newton.asset +++ b/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Materials/newton.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bee63dd69600ec22f0eaa6c4c3a0eb4d0a2a8643cd723b4c2805667661ad0c97 -size 45440 +oid sha256:511745110c8e55af0270819790e6b70f011fe127d1bb7759898bcadbc6e2df41 +size 3343 diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Materials/newton.asset.meta b/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Materials/newton.asset.meta index 90213797..5939c624 100644 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Materials/newton.asset.meta +++ b/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Materials/newton.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a77c04dec91d4324193a3a329397cf51 +guid: 4ab9ad549aa3f794fbf1a29bd85e49e5 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Meshes.meta b/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Meshes.meta index 3b6d318b..76672e11 100644 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Meshes.meta +++ b/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Meshes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: eb64695156baff044a0165e5cabb739e +guid: ddf18d7b86f54bb418d5719779288ae9 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Meshes/newton.baked.asset b/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Meshes/newton.baked.asset index e1dbc5a2..406b686a 100644 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Meshes/newton.baked.asset +++ b/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Meshes/newton.baked.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aca3bded3a29e6eb78e01d3f329fcfd790d96ccd33d7a6a5000727cb22861786 -size 3201078 +oid sha256:1ed0cca0300fbbfb8d5f9a1bd745c9326b27e101d23bee35be37f5e5d7fc073d +size 3201126 diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Meshes/newton.baked.asset.meta b/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Meshes/newton.baked.asset.meta index 65df27b6..17a386b1 100644 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Meshes/newton.baked.asset.meta +++ b/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Meshes/newton.baked.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ab9bef40b7844734aa03a25a4c78d600 +guid: 42bea6899126190478c2ff01c16e6d6d NativeFormatImporter: externalObjects: {} mainObjectFileID: 4300000 diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.prefab b/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.prefab deleted file mode 100644 index fe21f047..00000000 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.prefab +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3636a534c8134d2addbc1b8783d0e33fa300024650366654bab15af370c3eaa9 -size 88075 diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data.meta b/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data.meta deleted file mode 100644 index bdf470d0..00000000 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6f705ffb70fa1a140bf73185aef44529 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.Avatar.meta b/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.Avatar.meta deleted file mode 100644 index f0980e3a..00000000 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.Avatar.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4b1499ea416adce4daaed7b0b3b2b001 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.Avatar/VrmAvatar.asset b/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.Avatar/VrmAvatar.asset deleted file mode 100644 index 5e366b04..00000000 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.Avatar/VrmAvatar.asset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9ffbb281926810d322481acf6ed4506b0853fa1ca64f4edfb1fe5d7c528e36d4 -size 89653 diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.Materials.meta b/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.Materials.meta deleted file mode 100644 index 18334dfa..00000000 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.Materials.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9a46274a4e01e9d45bc0a3f2c25d5d02 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.Materials/newton.asset b/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.Materials/newton.asset deleted file mode 100644 index e01f65b4..00000000 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.Materials/newton.asset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bee63dd69600ec22f0eaa6c4c3a0eb4d0a2a8643cd723b4c2805667661ad0c97 -size 45440 diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.Materials/newton.asset.meta b/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.Materials/newton.asset.meta deleted file mode 100644 index 20ae006d..00000000 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.Materials/newton.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f5c6e42d92f8225488a96dfaf88b9051 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.Meshes.meta b/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.Meshes.meta deleted file mode 100644 index fce2cff9..00000000 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.Meshes.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d1094b1299f0ba44b9f618231c354db5 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.Meshes/newton.baked.asset b/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.Meshes/newton.baked.asset deleted file mode 100644 index b11da0bd..00000000 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.Meshes/newton.baked.asset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1129516b4c03432a8d25550dd17d204fa72c6100b9527a01f78289039e45eef9 -size 3201114 diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.Meshes/newton.baked.asset.meta b/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.Meshes/newton.baked.asset.meta deleted file mode 100644 index a16f4f05..00000000 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.Meshes/newton.baked.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 23aa04f3a9d0bb84bba05888737ec16e -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 4300000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.prefab b/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.prefab deleted file mode 100644 index 6dd93d8c..00000000 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.prefab +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ca5166aeddce10c2dbb39a2b5ba75bb04853c8ae08d0a99ca6bfeea27c99611f -size 65261 diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.prefab.meta b/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.prefab.meta deleted file mode 100644 index d5490cbc..00000000 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: e40a686a525bda34ebf267268d8b2616 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/Prefabs/BaseAvatar - OptiTrack Last.prefab b/Assets/External/OptiTrack Unity Plugin/OptiTrack/Prefabs/BaseAvatar - OptiTrack Last.prefab deleted file mode 100644 index 0977d2f1..00000000 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/Prefabs/BaseAvatar - OptiTrack Last.prefab +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1a97d4eb39cde31131b51f2f67670d4c93f7a9581d80b1540dae7bc00638aca8 -size 8648 diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/Prefabs/BaseAvatar - OptiTrack Last.prefab.meta b/Assets/External/OptiTrack Unity Plugin/OptiTrack/Prefabs/BaseAvatar - OptiTrack Last.prefab.meta deleted file mode 100644 index cb1d0f90..00000000 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/Prefabs/BaseAvatar - OptiTrack Last.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: c470e4106f9329048b690874ec8ef603 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/Prefabs/BaseAvatar - OptiTrack ver 2.prefab b/Assets/External/OptiTrack Unity Plugin/OptiTrack/Prefabs/BaseAvatar - OptiTrack ver 2.prefab new file mode 100644 index 00000000..42c800a5 --- /dev/null +++ b/Assets/External/OptiTrack Unity Plugin/OptiTrack/Prefabs/BaseAvatar - OptiTrack ver 2.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e5cb0681047fdbfb56a91db6d8b28f482b39966a36570079bed093a85a753f2 +size 86854 diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.prefab.meta b/Assets/External/OptiTrack Unity Plugin/OptiTrack/Prefabs/BaseAvatar - OptiTrack ver 2.prefab.meta similarity index 74% rename from Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.prefab.meta rename to Assets/External/OptiTrack Unity Plugin/OptiTrack/Prefabs/BaseAvatar - OptiTrack ver 2.prefab.meta index 9ca0f6a7..9d4095c7 100644 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.prefab.meta +++ b/Assets/External/OptiTrack Unity Plugin/OptiTrack/Prefabs/BaseAvatar - OptiTrack ver 2.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 77ff24cd2db25c6499f961f926230775 +guid: ecb211056d7c61047aa8380b0b541a81 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/Scripts/OptitrackSkeletonAnimator_Mingle.cs b/Assets/External/OptiTrack Unity Plugin/OptiTrack/Scripts/OptitrackSkeletonAnimator_Mingle.cs index c1f45a62..71901b38 100644 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/Scripts/OptitrackSkeletonAnimator_Mingle.cs +++ b/Assets/External/OptiTrack Unity Plugin/OptiTrack/Scripts/OptitrackSkeletonAnimator_Mingle.cs @@ -21,7 +21,7 @@ public class OptitrackSkeletonAnimator_Mingle : MonoBehaviour [Tooltip("Motive의 스켈레톤 에셋 이름")] public string SkeletonAssetName = "Skeleton1"; - public Animator TargetAnimator; + private Animator TargetAnimator; [Header("모션 적용 범위")] [Tooltip("모션 캡처 데이터를 적용할 범위 선택")] @@ -40,6 +40,8 @@ public class OptitrackSkeletonAnimator_Mingle : MonoBehaviour void Start() { + TargetAnimator = GetComponent(); + InitializeStreamingClient(); // StreamingClient 등록 추가 diff --git a/Assets/External/UniGLTF/Runtime/UniHumanoid/HumanPoseClip.cs b/Assets/External/UniGLTF/Runtime/UniHumanoid/HumanPoseClip.cs index ab0949f2..b5f6b3f7 100644 --- a/Assets/External/UniGLTF/Runtime/UniHumanoid/HumanPoseClip.cs +++ b/Assets/External/UniGLTF/Runtime/UniHumanoid/HumanPoseClip.cs @@ -9,6 +9,8 @@ namespace UniHumanoid public const string IPoseResourcePath = "UniHumanoid/I-Pose.pose"; + public const string SourceTPoseResourcePath = "UniHumanoid/Source-T-Pose.pose"; + public Vector3 bodyPosition; public Quaternion bodyRotation; diff --git a/Assets/Resources/UniHumanoid/Source-T-Pose.pose.asset b/Assets/Resources/UniHumanoid/Source-T-Pose.pose.asset new file mode 100644 index 00000000..0b42bbfa --- /dev/null +++ b/Assets/Resources/UniHumanoid/Source-T-Pose.pose.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dffaa68b307f9732365e8627bebc3758780f22e4daeb2ea0d93de2d9ff47553c +size 1790 diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.Avatar/VrmAvatar.asset.meta b/Assets/Resources/UniHumanoid/Source-T-Pose.pose.asset.meta similarity index 64% rename from Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.Avatar/VrmAvatar.asset.meta rename to Assets/Resources/UniHumanoid/Source-T-Pose.pose.asset.meta index 9a7d4d71..4443cd79 100644 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.Avatar/VrmAvatar.asset.meta +++ b/Assets/Resources/UniHumanoid/Source-T-Pose.pose.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 3c4b192ca3a426b48819a1106d1d927b +guid: baa07033c4400034ca2e6572a7b9b098 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 9000000 + mainObjectFileID: 11400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scripts/KindRetargeting/CustomRetargetingScript.cs b/Assets/Scripts/KindRetargeting/CustomRetargetingScript.cs index ddd0a1d5..f0afb33d 100644 --- a/Assets/Scripts/KindRetargeting/CustomRetargetingScript.cs +++ b/Assets/Scripts/KindRetargeting/CustomRetargetingScript.cs @@ -168,7 +168,7 @@ namespace KindRetargeting CreateIKTargets(); // 원본 및 대상 아바타를 T-포즈로 복원 - SetTPose(sourceAnimator); + SetSourceTPose(sourceAnimator); SetTPose(targetAnimator); // HumanPoseHandler 초기화 @@ -197,7 +197,7 @@ namespace KindRetargeting // 크기 조정 대상 오브젝트 캐싱 CacheScalableObjects(); - + previousScale = avatarScale; ApplyScale(); @@ -412,7 +412,7 @@ namespace KindRetargeting avatarScale = settings.avatarScale; previousScale = avatarScale; - + //너무 자주 출력되어서 주석처리 //Debug.Log($"설정을 로드했습니다: {filePath}"); @@ -975,6 +975,37 @@ namespace KindRetargeting } } + public void SetSourceTPose(Animator animator) + { + if (animator == null || animator.avatar == null) + return; + + Avatar avatar = animator.avatar; + Transform transform = animator.transform; + + // HumanPoseClip에 저장된 T-포즈 데이터를 로드하여 적용 + var humanPoseClip = Resources.Load(HumanPoseClip.SourceTPoseResourcePath); + if (humanPoseClip != null) + { + var pose = humanPoseClip.GetPose(); + HumanPoseTransfer.SetPose(avatar, transform, pose); + + // 소스 아바타의 UpperChest 본 로컬 포지션 초기화 + if (animator == sourceAnimator) + { + Transform upperChest = animator.GetBoneTransform(HumanBodyBones.UpperChest); + if (upperChest != null) + { + upperChest.localPosition = Vector3.zero; + } + } + } + else + { + Debug.LogWarning("T-Pose 데이터가 존재하지 않습니다."); + } + } + public static void SetIPose(Animator animator) { if (animator == null || animator.avatar == null) @@ -1067,6 +1098,7 @@ namespace KindRetargeting // T-포즈로 복원 SetTPose(sourceAnimator); + SetTPose(targetAnimator); // 소스 아바타의 UpperChest 본 로컬 포지션 초기화