ADD : 손가락 부분 패치에 대한 최종 업데이트
This commit is contained in:
parent
c73c7cbc18
commit
d5d49646b3
@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: d7e80e79f110af44c95b17bc11762592
|
guid: 73d4a8dc0aa5b6842a036f37e8860f22
|
||||||
folderAsset: yes
|
folderAsset: yes
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
|
|||||||
BIN
Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Avatar/VrmAvatar.asset
(Stored with Git LFS)
vendored
BIN
Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Avatar/VrmAvatar.asset
(Stored with Git LFS)
vendored
Binary file not shown.
@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 191d5747ce8e22749b2691c7385616f6
|
guid: 34982e5ce57f06a4cbb8b89501912ba0
|
||||||
NativeFormatImporter:
|
NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 9000000
|
mainObjectFileID: 9000000
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: aac5250f47cbb7c4a967a280a7ef2c4a
|
guid: b7436ec45c8c84b42bbce12956436aea
|
||||||
folderAsset: yes
|
folderAsset: yes
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
|
|||||||
BIN
Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Materials/newton.asset
(Stored with Git LFS)
vendored
BIN
Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Materials/newton.asset
(Stored with Git LFS)
vendored
Binary file not shown.
@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: a77c04dec91d4324193a3a329397cf51
|
guid: 4ab9ad549aa3f794fbf1a29bd85e49e5
|
||||||
NativeFormatImporter:
|
NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 2100000
|
mainObjectFileID: 2100000
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: eb64695156baff044a0165e5cabb739e
|
guid: ddf18d7b86f54bb418d5719779288ae9
|
||||||
folderAsset: yes
|
folderAsset: yes
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
|
|||||||
BIN
Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Meshes/newton.baked.asset
(Stored with Git LFS)
vendored
BIN
Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.Meshes/newton.baked.asset
(Stored with Git LFS)
vendored
Binary file not shown.
@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: ab9bef40b7844734aa03a25a4c78d600
|
guid: 42bea6899126190478c2ff01c16e6d6d
|
||||||
NativeFormatImporter:
|
NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 4300000
|
mainObjectFileID: 4300000
|
||||||
|
|||||||
BIN
Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.prefab
(Stored with Git LFS)
vendored
BIN
Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/BaseAvatar - OptiTrack ver 2.prefab
(Stored with Git LFS)
vendored
Binary file not shown.
@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 6f705ffb70fa1a140bf73185aef44529
|
|
||||||
folderAsset: yes
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 4b1499ea416adce4daaed7b0b3b2b001
|
|
||||||
folderAsset: yes
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
BIN
Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.Avatar/VrmAvatar.asset
(Stored with Git LFS)
vendored
BIN
Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.Avatar/VrmAvatar.asset
(Stored with Git LFS)
vendored
Binary file not shown.
@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 9a46274a4e01e9d45bc0a3f2c25d5d02
|
|
||||||
folderAsset: yes
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
BIN
Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.Materials/newton.asset
(Stored with Git LFS)
vendored
BIN
Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.Materials/newton.asset
(Stored with Git LFS)
vendored
Binary file not shown.
@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: f5c6e42d92f8225488a96dfaf88b9051
|
|
||||||
NativeFormatImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
mainObjectFileID: 2100000
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: d1094b1299f0ba44b9f618231c354db5
|
|
||||||
folderAsset: yes
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
BIN
Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.Meshes/newton.baked.asset
(Stored with Git LFS)
vendored
BIN
Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.Meshes/newton.baked.asset
(Stored with Git LFS)
vendored
Binary file not shown.
@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 23aa04f3a9d0bb84bba05888737ec16e
|
|
||||||
NativeFormatImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
mainObjectFileID: 4300000
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
BIN
Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.prefab
(Stored with Git LFS)
vendored
BIN
Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar ver 2/Hand Data/Hand Data.prefab
(Stored with Git LFS)
vendored
Binary file not shown.
@ -1,7 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: e40a686a525bda34ebf267268d8b2616
|
|
||||||
PrefabImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
BIN
Assets/External/OptiTrack Unity Plugin/OptiTrack/Prefabs/BaseAvatar - OptiTrack Last.prefab
(Stored with Git LFS)
vendored
BIN
Assets/External/OptiTrack Unity Plugin/OptiTrack/Prefabs/BaseAvatar - OptiTrack Last.prefab
(Stored with Git LFS)
vendored
Binary file not shown.
@ -1,7 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: c470e4106f9329048b690874ec8ef603
|
|
||||||
PrefabImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
BIN
Assets/External/OptiTrack Unity Plugin/OptiTrack/Prefabs/BaseAvatar - OptiTrack ver 2.prefab
(Stored with Git LFS)
vendored
Normal file
BIN
Assets/External/OptiTrack Unity Plugin/OptiTrack/Prefabs/BaseAvatar - OptiTrack ver 2.prefab
(Stored with Git LFS)
vendored
Normal file
Binary file not shown.
@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 77ff24cd2db25c6499f961f926230775
|
guid: ecb211056d7c61047aa8380b0b541a81
|
||||||
PrefabImporter:
|
PrefabImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
@ -21,7 +21,7 @@ public class OptitrackSkeletonAnimator_Mingle : MonoBehaviour
|
|||||||
|
|
||||||
[Tooltip("Motive의 스켈레톤 에셋 이름")]
|
[Tooltip("Motive의 스켈레톤 에셋 이름")]
|
||||||
public string SkeletonAssetName = "Skeleton1";
|
public string SkeletonAssetName = "Skeleton1";
|
||||||
public Animator TargetAnimator;
|
private Animator TargetAnimator;
|
||||||
|
|
||||||
[Header("모션 적용 범위")]
|
[Header("모션 적용 범위")]
|
||||||
[Tooltip("모션 캡처 데이터를 적용할 범위 선택")]
|
[Tooltip("모션 캡처 데이터를 적용할 범위 선택")]
|
||||||
@ -40,6 +40,8 @@ public class OptitrackSkeletonAnimator_Mingle : MonoBehaviour
|
|||||||
void Start()
|
void Start()
|
||||||
{
|
{
|
||||||
|
|
||||||
|
TargetAnimator = GetComponent<Animator>();
|
||||||
|
|
||||||
InitializeStreamingClient();
|
InitializeStreamingClient();
|
||||||
|
|
||||||
// StreamingClient 등록 추가
|
// StreamingClient 등록 추가
|
||||||
|
|||||||
@ -9,6 +9,8 @@ namespace UniHumanoid
|
|||||||
|
|
||||||
public const string IPoseResourcePath = "UniHumanoid/I-Pose.pose";
|
public const string IPoseResourcePath = "UniHumanoid/I-Pose.pose";
|
||||||
|
|
||||||
|
public const string SourceTPoseResourcePath = "UniHumanoid/Source-T-Pose.pose";
|
||||||
|
|
||||||
public Vector3 bodyPosition;
|
public Vector3 bodyPosition;
|
||||||
|
|
||||||
public Quaternion bodyRotation;
|
public Quaternion bodyRotation;
|
||||||
|
|||||||
BIN
Assets/Resources/UniHumanoid/Source-T-Pose.pose.asset
(Stored with Git LFS)
Normal file
BIN
Assets/Resources/UniHumanoid/Source-T-Pose.pose.asset
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,8 +1,8 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 3c4b192ca3a426b48819a1106d1d927b
|
guid: baa07033c4400034ca2e6572a7b9b098
|
||||||
NativeFormatImporter:
|
NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 9000000
|
mainObjectFileID: 11400000
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName:
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
@ -168,7 +168,7 @@ namespace KindRetargeting
|
|||||||
CreateIKTargets();
|
CreateIKTargets();
|
||||||
|
|
||||||
// 원본 및 대상 아바타를 T-포즈로 복원
|
// 원본 및 대상 아바타를 T-포즈로 복원
|
||||||
SetTPose(sourceAnimator);
|
SetSourceTPose(sourceAnimator);
|
||||||
SetTPose(targetAnimator);
|
SetTPose(targetAnimator);
|
||||||
|
|
||||||
// HumanPoseHandler 초기화
|
// HumanPoseHandler 초기화
|
||||||
@ -197,7 +197,7 @@ namespace KindRetargeting
|
|||||||
|
|
||||||
// 크기 조정 대상 오브젝트 캐싱
|
// 크기 조정 대상 오브젝트 캐싱
|
||||||
CacheScalableObjects();
|
CacheScalableObjects();
|
||||||
|
|
||||||
previousScale = avatarScale;
|
previousScale = avatarScale;
|
||||||
|
|
||||||
ApplyScale();
|
ApplyScale();
|
||||||
@ -412,7 +412,7 @@ namespace KindRetargeting
|
|||||||
avatarScale = settings.avatarScale;
|
avatarScale = settings.avatarScale;
|
||||||
previousScale = avatarScale;
|
previousScale = avatarScale;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//너무 자주 출력되어서 주석처리
|
//너무 자주 출력되어서 주석처리
|
||||||
//Debug.Log($"설정을 로드했습니다: {filePath}");
|
//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>(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)
|
public static void SetIPose(Animator animator)
|
||||||
{
|
{
|
||||||
if (animator == null || animator.avatar == null)
|
if (animator == null || animator.avatar == null)
|
||||||
@ -1067,6 +1098,7 @@ namespace KindRetargeting
|
|||||||
|
|
||||||
// T-포즈로 복원
|
// T-포즈로 복원
|
||||||
SetTPose(sourceAnimator);
|
SetTPose(sourceAnimator);
|
||||||
|
|
||||||
SetTPose(targetAnimator);
|
SetTPose(targetAnimator);
|
||||||
|
|
||||||
// 소스 아바타의 UpperChest 본 로컬 포지션 초기화
|
// 소스 아바타의 UpperChest 본 로컬 포지션 초기화
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user