UnrealEngine/Plugin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename SGVirtualHandTrackingSettings to SGVirtualHandSettings

Browse Source
This commit is contained in:
Mamadou Babaei
2024-08-16 16:37:26 +02:00
parent 26daeae7d2
commit f8bec10622
8 changed files with 45 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/SenseGloveTracking/Private/SGTracking/SGXRTracker.cpp
+10 -10
View File
@@ -130,11 +130,11 @@ struct FSGXRTracker::FImpl
return Settings->GetTrackingSettings().HandTrackingSettings;
}
FORCEINLINE static const FSGVirtualHandTrackingSettings& GetVirtualHandTrackingSettings()
FORCEINLINE static const FSGVirtualHandSettings& GetVirtualHandSettings()
{
const USGSettings* Settings{USGSettings::GetInstance()};
ensureAlwaysMsgf(Settings, TEXT("The settings subsystem has not been initialized!"));
return Settings->GetTrackingSettings().VirtualHandTrackingSettings;
return Settings->GetVirtualHandSettings();
}
FORCEINLINE static const FSGWristTrackingSettings& GetWristTrackingSettings()
@@ -403,7 +403,7 @@ struct FSGXRTracker::FImpl
FORCEINLINE static const FName& GetLeftMeshBoneName(const int32 JointIndex)
{
const FName& Name{GetVirtualHandTrackingSettings().LeftHandBoneNames[JointIndex]};
const FName& Name{GetVirtualHandSettings().LeftHandBoneNames[JointIndex]};
return Name;
}
@@ -416,7 +416,7 @@ struct FSGXRTracker::FImpl
FORCEINLINE static const FName& GetRightMeshBoneName(const int32 JointIndex)
{
const FName& Name{GetVirtualHandTrackingSettings().RightHandBoneNames[JointIndex]};
const FName& Name{GetVirtualHandSettings().RightHandBoneNames[JointIndex]};
return Name;
}
@@ -765,7 +765,7 @@ TArray<float> FSGXRTracker::FImpl::GetFingerLengths(
TArray<TArray<float>> FSGXRTracker::FImpl::GetFingerLengths(const bool bRight)
{
const FSGVirtualHandTrackingSettings& Settings{GetVirtualHandTrackingSettings()};
const FSGVirtualHandSettings& Settings{GetVirtualHandSettings()};
const TArray<TArray<float>> Lengths{
GetFingerLengths(bRight,
@@ -901,8 +901,8 @@ FTransform FSGXRTracker::FImpl::GetMeshRawBoneRefTransform(const bool bRight, co
{
const TSoftObjectPtr<USkeletalMesh>& HandMesh{
bRight
? GetVirtualHandTrackingSettings().LeftHandReferenceMesh
: GetVirtualHandTrackingSettings().RightHandReferenceMesh
? GetVirtualHandSettings().LeftHandReferenceMesh
: GetVirtualHandSettings().RightHandReferenceMesh
};
if (HandMesh.IsValid())
@@ -924,7 +924,7 @@ FTransform FSGXRTracker::FImpl::GetMeshRawBoneRefTransform(const bool bRight, co
return Transform;
}
const FSGVirtualHandTrackingSettings& Settings{GetVirtualHandTrackingSettings()};
const FSGVirtualHandSettings& Settings{GetVirtualHandSettings()};
ensureAlwaysMsgf(
bRight
? Settings.RightHandDefaultReferenceBoneTransforms.Contains(BoneName)
@@ -942,7 +942,7 @@ FTransform FSGXRTracker::FImpl::GetMeshRawBoneRefTransform(const bool bRight, co
FTransform FSGXRTracker::FImpl::GetMeshWristChildBoneRefTransform(const bool bRight, const FName& BoneName)
{
FQuat RootRotationCorrection{
GetVirtualHandTrackingSettings().RootBoneRotationCorrection
GetVirtualHandSettings().RootBoneRotationCorrection
};
const FTransform& RootBoneRefTransform{GetMeshRawBoneRefTransform(bRight, EHandKeypoint::Wrist)};
const FTransform& RawTransform{GetMeshRawBoneRefTransform(bRight, BoneName)};
@@ -957,7 +957,7 @@ FTransform FSGXRTracker::FImpl::GetMeshFingerStartBoneRefTransform(
const bool bRight, const EHandKeypoint Parent, const FName& BoneName)
{
FQuat RootRotationCorrection{
GetVirtualHandTrackingSettings().RootBoneRotationCorrection
GetVirtualHandSettings().RootBoneRotationCorrection
};
const FTransform& RootBoneRefTransform{GetMeshRawBoneRefTransform(bRight, EHandKeypoint::Wrist)};
FQuat CorrectedRootBoneRefRotation{MoveTemp(RootRotationCorrection) * RootBoneRefTransform.GetRotation()};