diff --git a/Source/SenseGloveSettings/Private/SGSettings/SGVirtualHandTrackingSettings.cpp b/Source/SenseGloveSettings/Private/SGSettings/SGVirtualHandTrackingSettings.cpp index 85bb1797..3f3b5bf7 100644 --- a/Source/SenseGloveSettings/Private/SGSettings/SGVirtualHandTrackingSettings.cpp +++ b/Source/SenseGloveSettings/Private/SGSettings/SGVirtualHandTrackingSettings.cpp @@ -41,33 +41,332 @@ FSGVirtualHandTrackingSettings::FSGVirtualHandTrackingSettings() : FSGVirtualHandTrackingSettings( nullptr, nullptr, - FRotator{0.0f, -90.0f, 0.0f}, 1.0f, 1.0f, 1.0f, 1.0f, - 1.0f) + 1.0f, + FRotator{0.0f, -90.0f, 0.0f}) { } FSGVirtualHandTrackingSettings::FSGVirtualHandTrackingSettings( const TSoftObjectPtr& InLeftHandReferenceMesh, const TSoftObjectPtr& InRightHandReferenceMesh, - const FRotator& InHandRootBoneRotationCorrection, const float InThumbDistalPhalanxLength, const float InIndexDistalPhalanxLength, const float InMiddleDistalPhalanxLength, const float InRingDistalPhalanxLength, - const float InLittleDistalPhalanxLength) + const float InLittleDistalPhalanxLength, + const FRotator& InHandRootBoneRotationCorrection) : LeftHandReferenceMesh(InLeftHandReferenceMesh), RightHandReferenceMesh(InRightHandReferenceMesh), - HandRootBoneRotationCorrection(InHandRootBoneRotationCorrection), ThumbDistalPhalanxLength(InThumbDistalPhalanxLength), IndexDistalPhalanxLength(InIndexDistalPhalanxLength), MiddleDistalPhalanxLength(InMiddleDistalPhalanxLength), RingDistalPhalanxLength(InRingDistalPhalanxLength), LittleDistalPhalanxLength(InLittleDistalPhalanxLength), - LeftHandBoneNames{ + HandRootBoneRotationCorrection(InHandRootBoneRotationCorrection), + LeftHandDefaultReferenceBoneTransforms{ + TPair{ + FName{TEXT("hand_l")}, + FTransform{ + FRotator{0.0f, -180.0f, 90.0f}, + FVector{0.0f, 0.0f, 0.0f} + } + }, + TPair{ + FName{TEXT("palm_l")}, + FTransform{ + FRotator{0.0f, 0.0f, 0.0f}, + FVector{0.0f, 0.0f, -6.61557f} + } + }, + TPair{ + FName{TEXT("thumb_01_l")}, + FTransform{ + FRotator{30.400068f, 75.42522f, 33.588919f}, + FVector{2.581536f, 1.356605f, -1.992447f} + } + }, + TPair{ + FName{TEXT("thumb_02_l")}, + FTransform{ + FRotator{-0.379136f, 4.00635f, -23.318826f}, + FVector{0.0f, 0.0f, -4.378f} + } + }, + TPair{ + FName{TEXT("thumb_03_l")}, + FTransform{ + FRotator{0.0f, 0.0f, -10.0f}, + FVector{0.0f, 0.0f, -3.086f} + } + }, + TPair{ + FName{TEXT("index_metacarpal_l")}, + FTransform{ + FRotator{7.277920f, 3.392215f, 1.032481f}, + FVector{2.379324f, -0.384681f, -3.444506f} + } + }, + TPair{ + FName{TEXT("index_01_l")}, + FTransform{ + FRotator{0.0f, 0.0f, -23.373f}, + FVector{-0.240876f, 0.043182f, -5.877098f} + } + }, + TPair{ + FName{TEXT("index_02_l")}, + FTransform{ + FRotator{0.0f, 0.0f, -14.892568f}, + FVector{0.0f, 0.0f, -4.08f} + } + }, + TPair{ + FName{TEXT("index_03_l")}, + FTransform{ + FRotator{0.0f, 0.0f, -12.516401f}, + FVector{0.0f, 0.0f, -2.595f} + } + }, + TPair{ + FName{TEXT("middle_metacarpal_l")}, + FTransform{ + FRotator{0.042392f, -4.274287f, 2.321687f}, + FVector{0.182864f, -0.753571f, -3.375834f} + } + }, + TPair{ + FName{TEXT("middle_01_l")}, + FTransform{ + FRotator{0.0f, 0.0f, -31.572682f}, + FVector{0.0f, 0.0f, -6.098209f} + } + }, + TPair{ + FName{TEXT("middle_02_l")}, + FTransform{ + FRotator{0.0f, 0.0f, -20.76921f}, + FVector{0.0f, 0.0f, -5.169f} + } + }, + TPair{ + FName{TEXT("middle_03_l")}, + FTransform{ + FRotator{0.0f, 0.0f, -10.0f}, + FVector{0.0f, 0.0f, -2.474f} + } + }, + TPair{ + FName{TEXT("ring_metacarpal_l")}, + FTransform{ + FRotator{-11.109678f, -13.886395f, 4.333313f}, + FVector{-1.091757f, -0.542517f, -3.374304f} + } + }, + TPair{ + FName{TEXT("ring_01_l")}, + FTransform{ + FRotator{3.034822f, 5.633827f, -29.271656f}, + FVector{0.020689f, -0.041625f, -5.645517f} + } + }, + TPair{ + FName{TEXT("ring_02_l")}, + FTransform{ + FRotator{0.0f, 0.0f, -18.964f}, + FVector{0.0f, 0.0f, -4.977f} + } + }, + TPair{ + FName{TEXT("ring_03_l")}, + FTransform{ + FRotator{0.0f, 0.0f, -9.167999f}, + FVector{0.0f, 0.0f, -2.265f} + } + }, + TPair{ + FName{TEXT("pinky_metacarpal_l")}, + FTransform{ + FRotator{-22.65256f, -25.358337f, -1.818999f}, + FVector{-2.391111f, -0.305917f, -3.314378f} + } + }, + TPair{ + FName{TEXT("pinky_01_l")}, + FTransform{ + FRotator{3.247850f, 9.999765f, -14.49391f}, + FVector{0.19884f, -0.14312f, -4.957568f} + } + }, + TPair{ + FName{TEXT("pinky_02_l")}, + FTransform{ + FRotator{0.0f, 0.0f, -21.286999f}, + FVector{0.0f, 0.0f, -3.816f} + } + }, + TPair{ + FName{TEXT("pinky_03_l")}, + FTransform{ + FRotator{0.0f, 0.0f, -4.917f}, + FVector{0.0f, 0.0f, -2.04f} + } + }, + }, + RightHandDefaultReferenceBoneTransforms{ + TPair{ + FName{TEXT("hand_r")}, + FTransform{ + FRotator{0.0f, -180.0f, 90.0f}, + FVector{0.0f, 0.0f, 0.0f} + } + }, + TPair{ + FName{TEXT("palm_r")}, + FTransform{ + FRotator{0.0f, 0.0f, 0.0f}, + FVector{0.000052f, -0.000629f, -6.615405f} + } + }, + TPair{ + FName{TEXT("thumb_01_r")}, + FTransform{ + FRotator{-30.400068f, -75.42522f, 33.588919f}, + FVector{-2.581326f, 1.356657f, -1.992833f} + } + }, + TPair{ + FName{TEXT("thumb_02_r")}, + FTransform{ + FRotator{0.379136f, -4.00635f, -23.318826f}, + FVector{0.000136f, -0.000427f, -4.377825f} + } + }, + TPair{ + FName{TEXT("thumb_03_r")}, + FTransform{ + FRotator{0.0f, 0.0f, -10.0f}, + FVector{-0.000046f, 0.000015f, -3.085952f} + } + }, + TPair{ + FName{TEXT("index_metacarpal_r")}, + FTransform{ + FRotator{-7.277920f, -3.392215f, 1.032481f}, + FVector{-2.379309f, -0.385167f, -3.444514f} + } + }, + TPair{ + FName{TEXT("index_01_r")}, + FTransform{ + FRotator{0.0f, 0.0f, -23.373f}, + FVector{0.240952f, 0.043412f, -5.877205f} + } + }, + TPair{ + FName{TEXT("index_02_r")}, + FTransform{ + FRotator{0.0f, 0.0f, -14.892568f}, + FVector{-0.000032f, -0.000005f, -4.079933f} + } + }, + TPair{ + FName{TEXT("index_03_r")}, + FTransform{ + FRotator{0.0f, 0.0f, -12.516401f}, + FVector{0.000004f, -0.00004f, -2.595076f} + } + }, + TPair{ + FName{TEXT("middle_metacarpal_r")}, + FTransform{ + FRotator{-0.042392f, 4.274287f, 2.321687f}, + FVector{-0.182806f, -0.754004f, -3.3758f} + } + }, + TPair{ + FName{TEXT("middle_01_r")}, + FTransform{ + FRotator{0.0f, 0.0f, -31.572682f}, + FVector{-0.000001f, 0.000124f, -6.098366f} + } + }, + TPair{ + FName{TEXT("middle_02_r")}, + FTransform{ + FRotator{0.0f, 0.0f, -20.76921f}, + FVector{0.000037f, 0.000077f, -5.168992f} + } + }, + TPair{ + FName{TEXT("middle_03_r")}, + FTransform{ + FRotator{0.0f, 0.0f, -10.0f}, + FVector{-0.000034f, -0.000046f, -2.474047f} + } + }, + TPair{ + FName{TEXT("ring_metacarpal_r")}, + FTransform{ + FRotator{11.109678f, 13.886395f, 4.333313f}, + FVector{1.091782f, -0.542992f, -3.374208f} + } + }, + TPair{ + FName{TEXT("ring_01_r")}, + FTransform{ + FRotator{-3.034822f, -5.633827f, -29.271656f}, + FVector{-0.020675f, -0.041443f, -5.645712f} + } + }, + TPair{ + FName{TEXT("ring_02_r")}, + FTransform{ + FRotator{0.0f, 0.0f, -18.964f}, + FVector{0.000024f, 0.000021f, -4.977067f} + } + }, + TPair{ + FName{TEXT("ring_03_r")}, + FTransform{ + FRotator{0.0f, 0.0f, -9.167999f}, + FVector{0.000011f, -0.00005f, -2.264975f} + } + }, + TPair{ + FName{TEXT("pinky_metacarpal_r")}, + FTransform{ + FRotator{22.65256f, 25.358337f, -1.818999f}, + FVector{2.391287f, -0.305935f, -3.314677f} + } + }, + TPair{ + FName{TEXT("pinky_01_r")}, + FTransform{ + FRotator{-3.24785f, -9.999765f, -14.49391f}, + FVector{-0.19892f, -0.143261f, -4.957301f} + } + }, + TPair{ + FName{TEXT("pinky_02_r")}, + FTransform{ + FRotator{0.0f, 0.0f, -21.286999f}, + FVector{-0.000033f, -0.00003f, -3.816036f} + } + }, + TPair{ + FName{TEXT("pinky_03_r")}, + FTransform{ + FRotator{0.0f, -0.000002f, -4.917f}, + FVector{0.000031f, 0.000018f, -2.04f} + } + }, + }, + LeftHandBoneNames + { FName{TEXT("palm_l")},// Palm FName{TEXT("hand_l")},// Wrist FName{TEXT("thumb_01_l")},// ThumbMetacarpal @@ -94,9 +393,9 @@ FSGVirtualHandTrackingSettings::FSGVirtualHandTrackingSettings( FName{TEXT("pinky_02_l")},// LittleIntermediate FName{TEXT("pinky_03_l")},// LittleDistal NAME_None,// LittleTip - }, - RightHandBoneNames{ + RightHandBoneNames + { FName{TEXT("palm_r")},// Palm FName{TEXT("hand_r")},// Wrist FName{TEXT("thumb_01_r")},// ThumbMetacarpal diff --git a/Source/SenseGloveSettings/Public/SGSettings/SGVirtualHandTrackingSettings.h b/Source/SenseGloveSettings/Public/SGSettings/SGVirtualHandTrackingSettings.h index 50a04aa0..6c66dd3a 100644 --- a/Source/SenseGloveSettings/Public/SGSettings/SGVirtualHandTrackingSettings.h +++ b/Source/SenseGloveSettings/Public/SGSettings/SGVirtualHandTrackingSettings.h @@ -57,9 +57,6 @@ public: UPROPERTY(Config, EditDefaultsOnly, Category="Virtual Hand") TSoftObjectPtr RightHandReferenceMesh; - UPROPERTY(Config, EditDefaultsOnly, Category="Virtual Hand") - FRotator HandRootBoneRotationCorrection; - UPROPERTY(Config, EditDefaultsOnly, Category="Virtual Hand") float ThumbDistalPhalanxLength; @@ -75,6 +72,15 @@ public: UPROPERTY(Config, EditDefaultsOnly, Category="Virtual Hand") float LittleDistalPhalanxLength; + UPROPERTY(Config, EditDefaultsOnly, Category="Virtual Hand") + FRotator HandRootBoneRotationCorrection; + + UPROPERTY(Config, VisibleDefaultsOnly, Category="Virtual Hand") + TMap LeftHandDefaultReferenceBoneTransforms; + + UPROPERTY(Config, VisibleDefaultsOnly, Category="Virtual Hand") + TMap RightHandDefaultReferenceBoneTransforms; + UPROPERTY(Config, VisibleDefaultsOnly, Category="Virtual Hand") TArray LeftHandBoneNames; @@ -87,11 +93,11 @@ public: FSGVirtualHandTrackingSettings( const TSoftObjectPtr& InLeftHandReferenceMesh, const TSoftObjectPtr& InRightHandReferenceMesh, - const FRotator& InHandRootBoneRotationCorrection, float InThumbDistalPhalanxLength, float InIndexDistalPhalanxLength, float InMiddleDistalPhalanxLength, float InRingDistalPhalanxLength, - float InLittleDistalPhalanxLength); + float InLittleDistalPhalanxLength, + const FRotator& InHandRootBoneRotationCorrection); }; \ No newline at end of file