Merge pull request #11 from stereolabs/fix_project_linux

fix ue project build on linux
stereolabs · Apr 3, 2023 · 73701a8 · 73701a8
2 parents 3405d37 + 3058ded
commit 73701a8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/UnrealProject/Source/ZEDUnrealLiveLink/AnimNode_ZEDLiveLinkPose.cpp b/UnrealProject/Source/ZEDUnrealLiveLink/AnimNode_ZEDLiveLinkPose.cpp
@@ -94,7 +94,7 @@ void FAnimNode_ZEDLiveLinkPose::Evaluate_AnyThread(FPoseContext& Output)
 				CurrentRetargetAsset->EnableStickAvatarOnFloor(bStickAvatarOnFloor);
 				CurrentRetargetAsset->EnableBoneScaling(bBoneScaling);
 				CurrentRetargetAsset->SetHeightOffset(HeightOffset);
-				CurrentRetargetAsset->BuildPoseFromAnimationData(CachedDeltaTime, SkeletonData, FrameData, Output.Pose, SkeletalMesh);
+				CurrentRetargetAsset->BuildPoseFromZEDAnimationData(CachedDeltaTime, SkeletonData, FrameData, Output.Pose, SkeletalMesh);
 				CurrentRetargetAsset->BuildPoseAndCurveFromBaseData(CachedDeltaTime, SkeletonData, FrameData, Output.Pose, Output.Curve);
 				CachedDeltaTime = 0.f; // Reset so that if we evaluate again we don't "create" time inside of the retargeter
 			}

diff --git a/UnrealProject/Source/ZEDUnrealLiveLink/LiveLinkOrientationsRemapAsset.cpp b/UnrealProject/Source/ZEDUnrealLiveLink/LiveLinkOrientationsRemapAsset.cpp
@@ -68,7 +68,7 @@ void ULiveLinkOrientationsRemapAsset::propagateRestPoseRotations(int32 parentIdx
 }
 
 // Take Live Link data and apply it to skeleton bones in UE.
-void ULiveLinkOrientationsRemapAsset::BuildPoseFromAnimationData(float DeltaTime,
+void ULiveLinkOrientationsRemapAsset::BuildPoseFromZEDAnimationData(float DeltaTime,
     const FLiveLinkSkeletonStaticData* InSkeletonData,
     const FLiveLinkAnimationFrameData* InFrameData,
     FCompactPose& OutPose,

diff --git a/UnrealProject/Source/ZEDUnrealLiveLink/LiveLinkOrientationsRemapAsset.h b/UnrealProject/Source/ZEDUnrealLiveLink/LiveLinkOrientationsRemapAsset.h
@@ -22,7 +22,7 @@ class ZEDUNREALLIVELINK_API ULiveLinkOrientationsRemapAsset : public ULiveLinkRe
     FCompactPoseBoneIndex GetCPIndex(int32 idx, FCompactPose& OutPose, TArray<FName, TMemStackAllocator<>> TransformedBoneNames);
 
 public:
-    void BuildPoseFromAnimationData(float DeltaTime, const FLiveLinkSkeletonStaticData* InSkeletonData,
+    void BuildPoseFromZEDAnimationData(float DeltaTime, const FLiveLinkSkeletonStaticData* InSkeletonData,
         const FLiveLinkAnimationFrameData* InFrameData,
         FCompactPose& OutPose, USkeletalMeshComponent* SkeletalMesh);