From 8cbb441b9a708c3fa60ba343fe6081b6eb48b4cc Mon Sep 17 00:00:00 2001
From: Mamadou Babaei <info@babaei.net>
Date: Tue, 12 Mar 2024 12:22:40 +0100
Subject: [PATCH] apply senseglove/unreal angle conversions in the gloves' api

---
 .../Private/SGCoreImpl/SGHapticGloveImpl.cpp          |  5 +----
 .../Private/SGCoreImpl/SGNova2GloveImpl.cpp           | 11 +++++------
 .../Private/SGCoreImpl/SGNovaGloveImpl.cpp            |  5 ++---
 .../Private/SGCoreImpl/SGSenseGloveImpl.cpp           |  3 +--
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveImpl.cpp
index 46ec7582..9f91ba9a 100644
--- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveImpl.cpp
+++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveImpl.cpp
@@ -239,10 +239,7 @@ bool FSGHapticGloveImpl::GetHandAngles(TArray<TArray<FVector>>& OutHandAngles) c
 {
     std::vector<std::vector<FSGVect3DImpl::FVect3DType>> HandAngles;
     const bool bResult = ToHapticGlovePtrChecked()->GetHandAngles(HandAngles);
-
-    OutHandAngles = FSGArrayUtils::FromStdVector<
-        FSGVect3DImpl::FVect3DType, FVector, FSGVect3DImpl, &FSGVect3DImpl::ToFVector>(HandAngles);
-
+    OutHandAngles = FSGArrayUtils::FromSenseGloveAngles<FSGVect3DImpl::FVect3DType>(HandAngles);
     return bResult;
 }
 
diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNova2GloveImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNova2GloveImpl.cpp
index 9646a938..fb6aaec9 100644
--- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNova2GloveImpl.cpp
+++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNova2GloveImpl.cpp
@@ -190,9 +190,9 @@ TArray<TArray<FVector>> FSGNova2GloveImpl::CalculateHandAngles(
     std::vector<float> NormalizedValuesVector{FSGArrayUtils::ToStdVector(NormalizedValues)};
 
     TArray<TArray<FVector>> Angles{
-        FSGArrayUtils::FromStdVector<FSGVect3DImpl::FVect3DType, FVector, FSGVect3DImpl, &FSGVect3DImpl::ToFVector>(
-            FNova2GloveType::CalculateHandAngles(MoveTemp(NormalizedValuesVector), Interpolator.ToHandInterpolator(),
-                                                 bInfluenceIndex))
+        FSGArrayUtils::FromSenseGloveAngles<FSGVect3DImpl::FVect3DType>(
+            FNova2GloveType::CalculateHandAngles(
+                MoveTemp(NormalizedValuesVector), Interpolator.ToHandInterpolator(), bInfluenceIndex))
     };
 
     return MoveTemp(Angles);
@@ -204,7 +204,7 @@ TArray<TArray<FVector>> FSGNova2GloveImpl::ToNormalizedAngles(
     std::vector<float> NormalizedDataVector{FSGArrayUtils::ToStdVector(NormalizedData)};
 
     TArray<TArray<FVector>> Angles{
-        FSGArrayUtils::FromStdVector<FSGVect3DImpl::FVect3DType, FVector, FSGVect3DImpl, &FSGVect3DImpl::ToFVector>(
+        FSGArrayUtils::FromSenseGloveAngles<FSGVect3DImpl::FVect3DType>(
             FNova2GloveType::ToNormalizedAngles(MoveTemp(NormalizedDataVector), GloveInfo.ToNovaGloveInfo()))
     };
 
@@ -351,8 +351,7 @@ bool FSGNova2GloveImpl::GetHandAngles(TArray<TArray<FVector>>& OutHandAngles) co
 {
     std::vector<std::vector<FSGVect3DImpl::FVect3DType>> HandAngles;
     const bool bResult = ToNova2GlovePtrChecked()->GetHandAngles(HandAngles);
-    OutHandAngles = FSGArrayUtils::FromStdVector<
-        FSGVect3DImpl::FVect3DType, FVector, FSGVect3DImpl, &FSGVect3DImpl::ToFVector>(MoveTemp(HandAngles));
+    OutHandAngles = FSGArrayUtils::FromSenseGloveAngles<FSGVect3DImpl::FVect3DType>(MoveTemp(HandAngles));
     return bResult;
 }
 
diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveImpl.cpp
index 57b1bf16..64023bfd 100644
--- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveImpl.cpp
+++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveImpl.cpp
@@ -211,7 +211,7 @@ TArray<TArray<FVector>> FSGNovaGloveImpl::CalculateHandAngles(
     std::vector<float> NormalizedValuesVector{FSGArrayUtils::ToStdVector(NormalizedValues)};
 
     TArray<TArray<FVector>> Angles{
-        FSGArrayUtils::FromStdVector<FSGVect3DImpl::FVect3DType, FVector, FSGVect3DImpl, &FSGVect3DImpl::ToFVector>(
+        FSGArrayUtils::FromSenseGloveAngles<FSGVect3DImpl::FVect3DType>(
             FNovaGloveType::CalculateHandAngles(MoveTemp(NormalizedValuesVector), Interpolator.ToHandInterpolator()))
     };
 
@@ -370,8 +370,7 @@ bool FSGNovaGloveImpl::GetHandAngles(TArray<TArray<FVector>>& OutHandAngles) con
 {
     std::vector<std::vector<FSGVect3DImpl::FVect3DType>> HandAngles;
     const bool bResult = ToNovaGlovePtrChecked()->GetHandAngles(HandAngles);
-    OutHandAngles = FSGArrayUtils::FromStdVector<
-        FSGVect3DImpl::FVect3DType, FVector, FSGVect3DImpl, &FSGVect3DImpl::ToFVector>(MoveTemp(HandAngles));
+    OutHandAngles = FSGArrayUtils::FromSenseGloveAngles<FSGVect3DImpl::FVect3DType>(MoveTemp(HandAngles));
     return bResult;
 }
 
diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveImpl.cpp
index 83cec29c..b187c08b 100644
--- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveImpl.cpp
+++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveImpl.cpp
@@ -373,8 +373,7 @@ bool FSGSenseGloveImpl::GetHandAngles(TArray<TArray<FVector>>& OutHandAngles) co
     std::vector<std::vector<FSGVect3DImpl::FVect3DType>> HandAngles;
     const bool bResult = ToSenseGlovePtrChecked()->GetHandAngles(HandAngles);
     OutHandAngles =
-        FSGArrayUtils::FromStdVector<FSGVect3DImpl::FVect3DType, FVector, FSGVect3DImpl, &FSGVect3DImpl::ToFVector>(
-            MoveTemp(HandAngles));
+        FSGArrayUtils::FromSenseGloveAngles<FSGVect3DImpl::FVect3DType>(MoveTemp(HandAngles));
     return bResult;
 }