Merge pull request #20 from leapmotion/issue-14

Issue 14
ultraleap · Oct 6, 2018 · 4878118 · 4878118
2 parents 8b066dc + 2f3fb44
commit 4878118
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/Content/Examples/LeapHandsPawn.uasset b/Content/Examples/LeapHandsPawn.uasset
diff --git a/LeapMotion.uplugin b/LeapMotion.uplugin
@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
 	"Version": 1,
-	"VersionName": "3.0.0",
+	"VersionName": "3.0.1",
 	"FriendlyName": "Leap Motion Plugin",
 	"Description": "Support for the Leap Motion input device.",
 	"Category": "Input Devices",

diff --git a/Source/LeapMotion/Private/LeapUtility.cpp b/Source/LeapMotion/Private/LeapUtility.cpp
@@ -1,18 +1,22 @@
 // Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
 
 #include "LeapUtility.h"
+#include "Engine.h"
 #include "IHeadMountedDisplay.h"
 
 DEFINE_LOG_CATEGORY(LeapMotionLog);
 
+//Static vars
 #define LEAP_TO_UE_SCALE 0.1f
 #define UE_TO_LEAP_SCALE 10.f
 
-FVector LeapMountTranslationOffset = FVector(8.f, 0, 0);
-FQuat LeapMountRotationOffset = FQuat(FRotator(0, 0, 0));
 
-FQuat FacingAdjustQuat = FQuat(FRotator(90.f, 0.f, 0.f));
-FQuat LeapRotationOffset = FQuat(FRotator(90.f, 0.f, 180.f));
+//Defaults - NB: these don't get automatically set in a development context since 4.20
+FVector FLeapUtility::LeapMountTranslationOffset = FVector(8.f, 0, 0);
+FQuat FLeapUtility::LeapMountRotationOffset = FQuat(FRotator(0, 0, 0));
+
+FQuat FLeapUtility::FacingAdjustQuat = FQuat(FRotator(90.f, 0.f, 0.f));
+FQuat FLeapUtility::LeapRotationOffset = FQuat(FRotator(90.f, 0.f, 180.f));
 
 //Todo: use and verify this for all values
 float LeapGetWorldScaleFactor()
@@ -37,6 +41,10 @@ void FLeapUtility::SetLeapGlobalOffsets(const FVector& TranslationOffset, const
 {
 	LeapMountTranslationOffset = TranslationOffset;
 	LeapMountRotationOffset = RotationOffset.Quaternion();
+
+	//These need to be set from a call due to static constants not being set since 4.20
+	FacingAdjustQuat = FQuat(FRotator(90.f, 0.f, 0.f));
+	LeapRotationOffset = FQuat(FRotator(90.f, 0.f, 180.f));
 }
 
 //Single point to handle leap conversion
@@ -56,12 +64,12 @@ FQuat FLeapUtility::ConvertLeapQuatToFQuat(const LEAP_QUATERNION& Quaternion)
 	Quat.Z = Quaternion.z;
 	Quat.W = Quaternion.w;
 
-	return Quat * LeapRotationOffset;
+	return Quat * FLeapUtility::LeapRotationOffset;
 }
 
 FVector AdjustForLeapFacing(FVector In)
 {
-	return FacingAdjustQuat.RotateVector(In);
+	return FLeapUtility::FacingAdjustQuat.RotateVector(In);
 }
 
 FVector AdjustForHMD(FVector In)
@@ -72,7 +80,7 @@ FVector AdjustForHMD(FVector In)
 		FVector Position;
 		GEngine->XRSystem->GetCurrentPose(IXRTrackingSystem::HMDDeviceId, OrientationQuat, Position);
 		FVector Out = OrientationQuat.RotateVector(In);
-		Position += OrientationQuat.RotateVector(LeapMountTranslationOffset);
+		Position += OrientationQuat.RotateVector(FLeapUtility::LeapMountTranslationOffset);
 		Out += Position;
 		return Out;
 	}

diff --git a/Source/LeapMotion/Private/LeapUtility.h b/Source/LeapMotion/Private/LeapUtility.h
@@ -32,6 +32,13 @@ class FLeapUtility
 
 	static float ScaleLeapFloatToUE(float LeapFloat);
 	static float ScaleUEToLeap(float UEFloat);
+
+
+	static FVector LeapMountTranslationOffset;
+	static FQuat LeapMountRotationOffset;
+	static FQuat FacingAdjustQuat;
+	static FQuat LeapRotationOffset;
+
 };	
 
 class LeapUtilityTimer