From 4e56d4b5caffe17b9974e5cde9a85578c59de8f2 Mon Sep 17 00:00:00 2001
From: Mamadou Babaei <info@babaei.net>
Date: Wed, 29 May 2024 14:03:26 +0200
Subject: [PATCH] fix android build issues

---
 .../SGSettings/SGVirtualHandTrackingSettings.h     |  2 +-
 .../Private/SGTracking/SGXRTracker.cpp             | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Source/SenseGloveSettings/Public/SGSettings/SGVirtualHandTrackingSettings.h b/Source/SenseGloveSettings/Public/SGSettings/SGVirtualHandTrackingSettings.h
index ab350d05..ae7d75f2 100644
--- a/Source/SenseGloveSettings/Public/SGSettings/SGVirtualHandTrackingSettings.h
+++ b/Source/SenseGloveSettings/Public/SGSettings/SGVirtualHandTrackingSettings.h
@@ -40,7 +40,7 @@
 
 #include "SGVirtualHandTrackingSettings.generated.h"
 
-USkeletalMesh;
+class USkeletalMesh;
 
 /**
 * Implements the hand tracking settings for the SenseGlove Tracking module.
diff --git a/Source/SenseGloveTracking/Private/SGTracking/SGXRTracker.cpp b/Source/SenseGloveTracking/Private/SGTracking/SGXRTracker.cpp
index 447e94bc..2ac70407 100644
--- a/Source/SenseGloveTracking/Private/SGTracking/SGXRTracker.cpp
+++ b/Source/SenseGloveTracking/Private/SGTracking/SGXRTracker.cpp
@@ -281,30 +281,30 @@ struct FSGXRTracker::FImpl
         return Name;
     }
 
-    static const FTransform& GetMeshRawBoneRefTransform(bool bRight, const FName& BoneName);
+    static FTransform GetMeshRawBoneRefTransform(bool bRight, const FName& BoneName);
 
-    FORCEINLINE static const FTransform& GetMeshRawBoneRefTransform(const bool bRight, const int32 JointIndex)
+    FORCEINLINE static FTransform GetMeshRawBoneRefTransform(const bool bRight, const int32 JointIndex)
     {
         const FName& BoneName{GetMeshBoneName(bRight, JointIndex)};
         const FTransform& Transform{GetMeshRawBoneRefTransform(bRight, BoneName)};
         return Transform;
     }
 
-    FORCEINLINE static const FTransform& GetMeshRawBoneRefTransform(const bool bRight, const EHandKeypoint Keypoint)
+    FORCEINLINE static FTransform GetMeshRawBoneRefTransform(const bool bRight, const EHandKeypoint Keypoint)
     {
         const FName& BoneName{GetMeshBoneName(bRight, Keypoint)};
         const FTransform& Transform{GetMeshRawBoneRefTransform(bRight, BoneName)};
         return Transform;
     }
 
-    FORCEINLINE static const FTransform& GetMeshRawBoneRefTransform(const EControllerHand Hand, const FName& BoneName)
+    FORCEINLINE static FTransform GetMeshRawBoneRefTransform(const EControllerHand Hand, const FName& BoneName)
     {
         const bool bRight = Hand == EControllerHand::Right;
         const FTransform& Transform{GetMeshRawBoneRefTransform(bRight, BoneName)};
         return Transform;
     }
 
-    FORCEINLINE static const FTransform& GetMeshRawBoneRefTransform(const EControllerHand Hand, const int32 JointIndex)
+    FORCEINLINE static FTransform GetMeshRawBoneRefTransform(const EControllerHand Hand, const int32 JointIndex)
     {
         const bool bRight = Hand == EControllerHand::Right;
         const FName& BoneName{GetMeshBoneName(bRight, JointIndex)};
@@ -312,7 +312,7 @@ struct FSGXRTracker::FImpl
         return Transform;
     }
 
-    FORCEINLINE static const FTransform& GetMeshRawBoneRefTransform(
+    FORCEINLINE static FTransform GetMeshRawBoneRefTransform(
         const EControllerHand Hand, const EHandKeypoint Keypoint)
     {
         const bool bRight = Hand == EControllerHand::Right;
@@ -769,7 +769,7 @@ USGHandPose* FSGXRTracker::FImpl::GetHandPose(const bool bRight)
     return HandPose;
 }
 
-const FTransform& FSGXRTracker::FImpl::GetMeshRawBoneRefTransform(const bool bRight, const FName& BoneName)
+FTransform FSGXRTracker::FImpl::GetMeshRawBoneRefTransform(const bool bRight, const FName& BoneName)
 {
     const TSoftObjectPtr<USkeletalMesh>& HandMesh{
         bRight