initial attempt at implementing android calibration

Source/SenseGlove/Private/SenseGlove/Components/SGVirtualHandComponent.cpp

@@ -38,6 +38,7 @@
 #include "Animation/Skeleton.h"
 #include "Components/SkeletalMeshComponent.h"
 #include "Engine/SkeletalMesh.h"
+#include "Kismet/GameplayStatics.h"
 #include "UObject/ConstructorHelpers.h"
 
 #include "SenseGlove/Animation/SGVirtualHandAnimInstance.h"
@@ -337,7 +338,13 @@ USGHandPose* USGVirtualHandComponent::GetHandPose()
 
     if (IsValid(Glove))
     {
+#if ! PLATFORM_ANDROID
         Glove->GetHandPose(this, HandPose);
+#else   /* ! PLATFORM_ANDROID */
+        const UWorld* World{GetWorld()};
+        const float DeltaTime = UGameplayStatics::GetWorldDeltaSeconds(World);
+        Glove->GetHandPose(this, DeltaTime, HandPose);
+#endif   /* ! PLATFORM_ANDROID */
     }
 
     return HandPose;

Source/SenseGloveCore/Private/SGCore/SGHapticGlove.cpp

@@ -310,6 +310,23 @@ bool USGHapticGlove::GetHandPose(UObject* Outer, USGHandPose*& OutHandPose)
     return bResult;
 }
 
+#if PLATFORM_ANDROID
+bool USGHapticGlove::GetHandPose(UObject* Outer, const float DeltaTime,  USGHandPose*& OutHandPose)
+{
+    FSGIC_TSharedPtr_FSGHapticGloveImpl InstanceContainer{ToHapticGloveImpl()};
+    FSGIC_FSGHandPoseImpl OutHandPoseContainer;
+    const bool bResult = SGCoreImpl_FSGHapticGloveImpl_GetHandPose_DeltaTime_OutHandPose(
+        &InstanceContainer, DeltaTime, &OutHandPoseContainer);
+
+    if (bResult)
+    {
+        OutHandPose = USGHandPose::NewHandPose(Outer, MoveTemp(OutHandPoseContainer.HandPoseImpl));
+    }
+
+    return bResult;
+}
+#endif  /* PLATFORM_ANDROID */
+
 void USGHapticGlove::StopHaptics()
 {
     FSGIC_TSharedPtr_FSGHapticGloveImpl InstanceContainer{ToHapticGloveImpl()};

Source/SenseGloveCore/Public/SGCore/SGHapticGlove.h

@@ -217,6 +217,10 @@ public:
      */
     virtual bool GetHandPose(UObject* Outer, USGHandPose*& OutHandPose);
 
+#if PLATFORM_ANDROID
+    virtual bool GetHandPose(UObject* Outer, float DeltaTime, USGHandPose*& OutHandPose);
+#endif  /* PLATFORM_ANDROID */
+
 public:
     /**
      * Stops all Haptic effects if any are currently playing. Useful at the end of simulations or when resetting.
@@ -325,4 +329,4 @@ public:
     virtual void GetGloveLocation(const FVector& ReferencePosition, const FRotator& ReferenceRotation,
                                   ESGPositionalTrackingHardware TrackingHardware,
                                   FVector& OutGlovePosition, FRotator& OutGloveRotation) const;
-};
+};

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGExportedFunctions.cpp

@@ -2352,6 +2352,18 @@ bool SGCoreImpl_FSGHapticGloveImpl_GetHandPose_OutHandPose(
         StaticCast<FSGIC_FSGHandPoseImpl*>(OutHandPose)->HandPoseImpl);
 }
 
+#if PLATFORM_ANDROID
+bool SGCoreImpl_FSGHapticGloveImpl_GetHandPose_DeltaTime_OutHandPose(
+    void* Instance,
+    const float DeltaTime,
+    void* OutHandPose)
+{
+    return StaticCast<FSGIC_TSharedPtr_FSGHapticGloveImpl*>(Instance)->Ptr->GetHandPose(
+        DeltaTime,
+        StaticCast<FSGIC_FSGHandPoseImpl*>(OutHandPose)->HandPoseImpl);
+}
+#endif  /* PLATFORM_ANDROID */
+
 void SGCoreImpl_FSGHapticGloveImpl_StopHaptics(
     void* Instance)
 {

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveImpl.cpp

@@ -205,7 +205,7 @@ bool FSGHapticGloveImpl::GetImuRotation(FQuat& OutImu)
 {
     FSGQuatImpl::FQuatType Imu;
     const bool bResult = ToHapticGlovePtrChecked()->GetImuRotation(Imu);
-    OutImu = FSGQuatImpl(MoveTemp(Imu)).ToFQuat();
+    OutImu = FSGQuatImpl{MoveTemp(Imu)}.ToFQuat();
     return bResult;
 }
 
@@ -215,7 +215,7 @@ bool FSGHapticGloveImpl::GetHandPose(const FSGBasicHandModelImpl& HandGeometry,
     FSGHandPoseImpl::FHandPoseType HandPose;
     const bool bResult = ToHapticGlovePtrChecked()->GetHandPose(HandGeometry.ToBasicHandModel(),
                                                                 HandProfile.ToHandProfile(), HandPose);
-    OutHandPose = FSGHandPoseImpl(MoveTemp(HandPose));
+    OutHandPose = FSGHandPoseImpl{MoveTemp(HandPose)};
     return bResult;
 }
 
@@ -223,7 +223,7 @@ bool FSGHapticGloveImpl::GetHandPose(const FSGHandProfileImpl& HandProfile, FSGH
 {
     FSGHandPoseImpl::FHandPoseType HandPose;
     const bool bResult = ToHapticGlovePtrChecked()->GetHandPose(HandProfile.ToHandProfile(), HandPose);
-    OutHandPose = FSGHandPoseImpl(MoveTemp(HandPose));
+    OutHandPose = FSGHandPoseImpl{MoveTemp(HandPose)};
     return bResult;
 }
 
@@ -231,7 +231,7 @@ bool FSGHapticGloveImpl::GetHandPose(const FSGBasicHandModelImpl& HandGeometry,
 {
     FSGHandPoseImpl::FHandPoseType HandPose;
     const bool bResult = ToHapticGlovePtrChecked()->GetHandPose(HandGeometry.ToBasicHandModel(), HandPose);
-    OutHandPose = FSGHandPoseImpl(MoveTemp(HandPose));
+    OutHandPose = FSGHandPoseImpl{MoveTemp(HandPose)};
     return bResult;
 }
 
@@ -239,10 +239,20 @@ bool FSGHapticGloveImpl::GetHandPose(FSGHandPoseImpl& OutHandPose)
 {
     FSGHandPoseImpl::FHandPoseType HandPose;
     const bool bResult = ToHapticGlovePtrChecked()->GetHandPose(HandPose);
-    OutHandPose = FSGHandPoseImpl(MoveTemp(HandPose));
+    OutHandPose = FSGHandPoseImpl{MoveTemp(HandPose)};
     return bResult;
 }
 
+#if PLATFORM_ANDROID
+bool FSGHapticGloveImpl::GetHandPose(const float DeltaTime, FSGHandPoseImpl& OutHandPose)
+{
+    FSGHandPoseImpl::FHandPoseType HandPose;
+    const bool bResult = ToHapticGlovePtrChecked()->GetHandPose(DeltaTime, HandPose);
+    OutHandPose = FSGHandPoseImpl{MoveTemp(HandPose)};
+    return bResult;
+}
+#endif  /* PLATFORM_ANDROID */
+
 void FSGHapticGloveImpl::StopHaptics()
 {
     ToHapticGlovePtrChecked()->StopHaptics();

Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGExportedFunctions.h

@@ -1185,6 +1185,13 @@ SENSEGLOVECOREIMPL_PUBLIC_API bool SGCoreImpl_FSGHapticGloveImpl_GetHandPose_Out
     void* Instance,
     void* OutHandPose);
 
+#if PLATFORM_ANDROID
+SENSEGLOVECOREIMPL_PUBLIC_API bool SGCoreImpl_FSGHapticGloveImpl_GetHandPose_DeltaTime_OutHandPose(
+    void* Instance,
+    float DeltaTime,
+    void* OutHandPose);
+#endif  /* PLATFORM_ANDROID */
+
 SENSEGLOVECOREIMPL_PUBLIC_API void SGCoreImpl_FSGHapticGloveImpl_StopHaptics(
     void* Instance);
 

Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveImpl.h

@@ -163,6 +163,10 @@ public:
 
     virtual bool GetHandPose(FSGHandPoseImpl& OutHandPose);
 
+#if PLATFORM_ANDROID
+    virtual bool GetHandPose(float DeltaTime, FSGHandPoseImpl& OutHandPose);
+#endif  /* PLATFORM_ANDROID */
+
 public:
     virtual void StopHaptics();
 

Source/SenseGloveCoreKismet/Private/SGCoreKismet/SGHapticGloveKismetLibrary.cpp

@@ -126,6 +126,17 @@ bool USGHapticGloveKismetLibrary::GetHandPose_OutHP(
     return HapticGlove->GetHandPose(WorldContextObject, OutHandPose);
 }
 
+bool USGHapticGloveKismetLibrary::GetHandPose_OutHTP(
+    UObject* WorldContextObject, USGHapticGlove* HapticGlove, const float DeltaTime, USGHandPose*& OutHandPose)
+{
+#if PLATFORM_ANDROID
+    return HapticGlove->GetHandPose(WorldContextObject, DeltaTime, OutHandPose);
+#else   /* PLATFORM_ANDROID */
+    ensureAlwaysMsgf(false, TEXT("This is an Android only method! Do not call it on other platforms!"));
+    return false;
+#endif  /* PLATFORM_ANDROID */
+}
+
 void USGHapticGloveKismetLibrary::StopHaptics(USGHapticGlove* HapticGlove)
 {
     return HapticGlove->StopHaptics();

Source/SenseGloveCoreKismet/Public/SGCoreKismet/SGHapticGloveKismetLibrary.h

@@ -167,6 +167,17 @@ public:
                                   UPARAM(ref) USGHapticGlove* HapticGlove,
                                   USGHandPose*& OutHandPose);
 
+    /**
+     * [ Android Only! Asserts on other platforms! ]
+     * Retrieve a HandPose based on the latest profile and default hand Geometry.
+     */
+    UFUNCTION(BlueprintCallable, DisplayName="Get Hand Pose", Category="SenseGlove | Core | Haptic Glove",
+        meta=(WorldContext="WorldContextObject"))
+    static bool GetHandPose_OutHTP(UObject* WorldContextObject,
+                                  UPARAM(ref) USGHapticGlove* HapticGlove,
+                                  float DeltaTime,
+                                  USGHandPose*& OutHandPose);
+
     /**
      * Stops all Haptic effects if any are currently playing. Useful at the end of simulations or when resetting.
      */