Merge pull request #18 from qualisys/update_qavatar_with_fingers

qualisys · Mar 5, 2021 · fc7d853 · fc7d853
2 parents 9198efe + 93f1b40
commit fc7d853
Show file tree

Hide file tree

Showing 18 changed files with 177 additions and 52 deletions.
diff --git a/Example Project/Content/BackFlip.umap b/Example Project/Content/BackFlip.umap
diff --git a/Example Project/Content/QAvatar/Body_D_red.uasset b/Example Project/Content/QAvatar/Body_D_red.uasset
diff --git a/Example Project/Content/QAvatar/Body_D_red_ncl1_1.uasset b/Example Project/Content/QAvatar/Body_D_red_ncl1_1.uasset
diff --git a/Example Project/Content/QAvatar/Body_R.uasset b/Example Project/Content/QAvatar/Body_R.uasset
diff --git a/Example Project/Content/QAvatar/Mask_D.uasset b/Example Project/Content/QAvatar/Mask_D.uasset
diff --git a/Example Project/Content/QAvatar/QAFace.uasset b/Example Project/Content/QAvatar/QAFace.uasset
diff --git a/Example Project/Content/QAvatar/QAMask.uasset b/Example Project/Content/QAvatar/QAMask.uasset
diff --git a/Example Project/Content/QAvatar/QASuit_B.uasset b/Example Project/Content/QAvatar/QASuit_B.uasset
diff --git a/Example Project/Content/QAvatar/QAvatar.uasset b/Example Project/Content/QAvatar/QAvatar.uasset
diff --git a/Example Project/Content/QAvatar/QAvatar_PhysicsAsset.uasset b/Example Project/Content/QAvatar/QAvatar_PhysicsAsset.uasset
diff --git a/Example Project/Content/QAvatar/QAvatar_Skeleton.uasset b/Example Project/Content/QAvatar/QAvatar_Skeleton.uasset
diff --git a/Example Project/Content/QAvatar/QAvatar_Skeleton_AnimBlueprintNoRetarget.uasset b/Example Project/Content/QAvatar/QAvatar_Skeleton_AnimBlueprintNoRetarget.uasset
diff --git a/Example Project/Content/QAvatar/QAvatar_Skeleton_AnimBlueprintRetarget.uasset b/Example Project/Content/QAvatar/QAvatar_Skeleton_AnimBlueprintRetarget.uasset
diff --git a/Example Project/Content/QAvatar/face_D.uasset b/Example Project/Content/QAvatar/face_D.uasset
diff --git a/Example Project/ExampleProject.uproject b/Example Project/ExampleProject.uproject
@@ -1,6 +1,6 @@
 {
 	"FileVersion": 3,
-	"EngineAssociation": "4.25",
+	"EngineAssociation": "4.26",
 	"Category": "",
 	"Description": "",
 	"Plugins": [

diff --git a/Example Project/Saved/AutoScreenshot.png b/Example Project/Saved/AutoScreenshot.png
diff --git a/...ys/QTMConnectLiveLink/Source/QTMConnectLiveLink/Private/QualisysLiveLinkRetargetAsset.cpp b/...ys/QTMConnectLiveLink/Source/QTMConnectLiveLink/Private/QualisysLiveLinkRetargetAsset.cpp
diff --git a/Qualisys/QTMConnectLiveLink/Source/QTMConnectLiveLink/Public/QualisysLiveLinkRetargetAsset.h b/Qualisys/QTMConnectLiveLink/Source/QTMConnectLiveLink/Public/QualisysLiveLinkRetargetAsset.h
@@ -24,9 +24,11 @@ class QTMCONNECTLIVELINK_API UQualisysLiveLinkRetargetAsset : public ULiveLinkRe
     bool DebugTPose;
 
 private:
-    TArray<FQuat> LocalPoseCorrections;
+    TArray<FQuat> TargetLocalPoseCorrections;
     TArray<FCompactPoseBoneIndex> CompactPoseBoneIndices;
 
     int32 GetSourceBoneIndex(const FCompactPoseBoneIndex& Index);
-    FTransform GetRefPose(const FCompactPose& Pose, const FCompactPoseBoneIndex& Index, bool UsePoseCorrection);
+
+    FTransform GetWorldPose(const FCompactPose& Pose, const FCompactPoseBoneIndex& Index, bool UsePoseCorrection);
+    FTransform GetWorldReferencePose(const FCompactPose& Pose, const FCompactPoseBoneIndex& Index, bool UsePoseCorrection);
 };