Merge pull request #127 from ultraleap/feature/leap-2

Feature/leap 2
ultraleap · May 17, 2023 · 45d1a1e · 45d1a1e
2 parents 055df9b + 0033f19
commit 45d1a1e
Show file tree

Hide file tree

Showing 70 changed files with 475 additions and 94 deletions.
diff --git a/Binaries/Mac/UE4Editor.modules b/Binaries/Mac/UE4Editor.modules
@@ -0,0 +1,9 @@
+{
+	"BuildId": "17155196",
+	"Modules": 
+	{
+		"BodyState": "UE4Editor-BodyState.dylib",
+		"UltraleapTracking": "UE4Editor-UltraleapTracking.dylib",
+		"UltraleapTrackingEditor": "UE4Editor-UltraleapTrackingEditor.dylib"
+	}
+}
diff --git a/Binaries/Mac/libLeap.dylib b/Binaries/Mac/libLeap.dylib
@@ -0,0 +1 @@
+libLeapC.5.dylib
diff --git a/Binaries/Mac/libLeapC.5.dylib b/Binaries/Mac/libLeapC.5.dylib
diff --git a/Binaries/Win64/LeapC.dll b/Binaries/Win64/LeapC.dll
diff --git a/Content/Examples/HelpBanner.uasset b/Content/Examples/HelpBanner.uasset
diff --git a/Content/HandModules/Hands/UnitySkeletonArm/SkeletonArm_MeshUnderBones_Right.uasset b/Content/HandModules/Hands/UnitySkeletonArm/SkeletonArm_MeshUnderBones_Right.uasset
diff --git a/Content/Mesh/InteractionVolumes/InteractionVolumeInstance.uasset b/Content/Mesh/InteractionVolumes/InteractionVolumeInstance.uasset
diff --git a/Content/Mesh/InteractionVolumes/LeapInteractionZone.uasset b/Content/Mesh/InteractionVolumes/LeapInteractionZone.uasset
diff --git a/Content/Multileap(Preview)/BodyState/BSMultiCombinedLowPolyHand.uasset b/Content/Multileap(Preview)/BodyState/BSMultiCombinedLowPolyHand.uasset
diff --git a/Content/Multileap(Preview)/BodyState/CombinedLeft.uasset b/Content/Multileap(Preview)/BodyState/CombinedLeft.uasset
diff --git a/Content/Multileap(Preview)/BodyState/CombinedRight.uasset b/Content/Multileap(Preview)/BodyState/CombinedRight.uasset
diff --git a/Content/Multileap(Preview)/ExampleScenes/AggregationIEHandsPawn.umap b/Content/Multileap(Preview)/ExampleScenes/AggregationIEHandsPawn.umap
diff --git a/Content/Multileap(Preview)/ExampleScenes/AggregationLeapHandsPawnVRAndDesktop.umap b/Content/Multileap(Preview)/ExampleScenes/AggregationLeapHandsPawnVRAndDesktop.umap
diff --git a/Content/Multileap(Preview)/Geometry/Materials/DeviceBlackUnlitMaterial.uasset b/Content/Multileap(Preview)/Geometry/Materials/DeviceBlackUnlitMaterial.uasset
diff --git a/Content/Multileap(Preview)/Geometry/Materials/DeviceCube.uasset b/Content/Multileap(Preview)/Geometry/Materials/DeviceCube.uasset
diff --git a/Content/Multileap(Preview)/Geometry/Materials/M_DeviceClearCoat.uasset b/Content/Multileap(Preview)/Geometry/Materials/M_DeviceClearCoat.uasset
diff --git a/Content/Multileap(Preview)/Geometry/Materials/M_DeviceClearCoatBlack.uasset b/Content/Multileap(Preview)/Geometry/Materials/M_DeviceClearCoatBlack.uasset
diff --git a/Content/Multileap(Preview)/Geometry/Materials/M_DeviceGreyBall.uasset b/Content/Multileap(Preview)/Geometry/Materials/M_DeviceGreyBall.uasset
diff --git a/Content/Multileap(Preview)/Geometry/Materials/M_Outline.uasset b/Content/Multileap(Preview)/Geometry/Materials/M_Outline.uasset
diff --git a/Content/Multileap(Preview)/Geometry/Materials/M_Outline_Instance.uasset b/Content/Multileap(Preview)/Geometry/Materials/M_Outline_Instance.uasset
diff --git a/Content/Multileap(Preview)/Geometry/Textures/leap_gizmo_colour_Mat.uasset b/Content/Multileap(Preview)/Geometry/Textures/leap_gizmo_colour_Mat.uasset
diff --git a/Content/Multileap(Preview)/Geometry/Textures/rigel_gizmo_colour_Mat.uasset b/Content/Multileap(Preview)/Geometry/Textures/rigel_gizmo_colour_Mat.uasset
diff --git a/Content/Multileap(Preview)/IEPawnHandsMulti.uasset b/Content/Multileap(Preview)/IEPawnHandsMulti.uasset
diff --git a/Content/Multileap(Preview)/JointOcclusionTest/CapsuleHandsCaptureActor.uasset b/Content/Multileap(Preview)/JointOcclusionTest/CapsuleHandsCaptureActor.uasset
diff --git a/Content/Multileap(Preview)/JointOcclusionTest/JointOcclusionTester.uasset b/Content/Multileap(Preview)/JointOcclusionTest/JointOcclusionTester.uasset
diff --git a/Content/Multileap(Preview)/JointOcclusionTest/PalmBlockerMaterial.uasset b/Content/Multileap(Preview)/JointOcclusionTest/PalmBlockerMaterial.uasset
diff --git a/Content/Multileap(Preview)/JointOcclusionTest/SceneTargetTextureMat.uasset b/Content/Multileap(Preview)/JointOcclusionTest/SceneTargetTextureMat.uasset
diff --git a/Content/Multileap(Preview)/Tracking/LeapModel3DDataAsset.uasset b/Content/Multileap(Preview)/Tracking/LeapModel3DDataAsset.uasset
diff --git a/Content/Multileap(Preview)/Tracking/TrackingDeviceActor.uasset b/Content/Multileap(Preview)/Tracking/TrackingDeviceActor.uasset
diff --git a/...ileap(Preview)/BaseDeviceComponent.uasset → ...tileap_Preview/BaseDeviceComponent.uasset b/...ileap(Preview)/BaseDeviceComponent.uasset → ...tileap_Preview/BaseDeviceComponent.uasset
diff --git a/...ent/Multileap(Preview)/DeviceModel.uasset → Content/Multileap_Preview/DeviceModel.uasset b/...ent/Multileap(Preview)/DeviceModel.uasset → Content/Multileap_Preview/DeviceModel.uasset
diff --git a/Content/Multileap_Preview/ExampleScenes/VolumeAndModelVis.umap b/Content/Multileap_Preview/ExampleScenes/VolumeAndModelVis.umap
diff --git a/Content/Multileap_Preview/Geometry/Materials/DeviceBlackUnlitMaterial.uasset b/Content/Multileap_Preview/Geometry/Materials/DeviceBlackUnlitMaterial.uasset
diff --git a/Content/Multileap_Preview/Geometry/Materials/M_DeviceClearCoat.uasset b/Content/Multileap_Preview/Geometry/Materials/M_DeviceClearCoat.uasset
diff --git a/Content/Multileap_Preview/Geometry/Materials/M_DeviceClearCoatBlack.uasset b/Content/Multileap_Preview/Geometry/Materials/M_DeviceClearCoatBlack.uasset
diff --git a/Content/Multileap_Preview/Geometry/Materials/M_DeviceGreyBall.uasset b/Content/Multileap_Preview/Geometry/Materials/M_DeviceGreyBall.uasset
diff --git a/Content/Multileap_Preview/Geometry/Materials/M_Outline.uasset b/Content/Multileap_Preview/Geometry/Materials/M_Outline.uasset
diff --git a/Content/Multileap_Preview/Geometry/Materials/M_Outline_Instance.uasset b/Content/Multileap_Preview/Geometry/Materials/M_Outline_Instance.uasset
diff --git a/Content/Multileap_Preview/Geometry/Meshes/Leap2/Tracker1.uasset b/Content/Multileap_Preview/Geometry/Meshes/Leap2/Tracker1.uasset
diff --git a/Content/Multileap_Preview/Geometry/Meshes/Leap2/TrackerLeapMotionController_2.uasset b/Content/Multileap_Preview/Geometry/Meshes/Leap2/TrackerLeapMotionController_2.uasset
diff --git a/...)/Geometry/Meshes/Rigel/rigeldecim.uasset → ...w/Geometry/Meshes/Rigel/rigeldecim.uasset b/...)/Geometry/Meshes/Rigel/rigeldecim.uasset → ...w/Geometry/Meshes/Rigel/rigeldecim.uasset
diff --git a/...eshes/Tracking/LeapFromInspireHigh.uasset → ...eshes/Tracking/LeapFromInspireHigh.uasset b/...eshes/Tracking/LeapFromInspireHigh.uasset → ...eshes/Tracking/LeapFromInspireHigh.uasset
diff --git a/...eometry/Textures/leap_gizmo_colour.uasset → ...eometry/Textures/leap_gizmo_colour.uasset b/...eometry/Textures/leap_gizmo_colour.uasset → ...eometry/Textures/leap_gizmo_colour.uasset
diff --git a/Content/Multileap_Preview/Geometry/Textures/leap_gizmo_colour_Mat.uasset b/Content/Multileap_Preview/Geometry/Textures/leap_gizmo_colour_Mat.uasset
diff --git a/...ometry/Textures/rigel_gizmo_colour.uasset → ...ometry/Textures/rigel_gizmo_colour.uasset b/...ometry/Textures/rigel_gizmo_colour.uasset → ...ometry/Textures/rigel_gizmo_colour.uasset
diff --git a/Content/Multileap_Preview/Geometry/Textures/rigel_gizmo_colour_Mat.uasset b/Content/Multileap_Preview/Geometry/Textures/rigel_gizmo_colour_Mat.uasset
diff --git a/...p(Preview)/IDevicePositionListener.uasset → ...ap_Preview/IDevicePositionListener.uasset b/...p(Preview)/IDevicePositionListener.uasset → ...ap_Preview/IDevicePositionListener.uasset
diff --git a/...ltileap(Preview)/IDeviceUISettings.uasset → ...ultileap_Preview/IDeviceUISettings.uasset b/...ltileap(Preview)/IDeviceUISettings.uasset → ...ultileap_Preview/IDeviceUISettings.uasset
diff --git a/...tileap(Preview)/IEGameModeCombined.uasset → ...ltileap_Preview/IEGameModeCombined.uasset b/...tileap(Preview)/IEGameModeCombined.uasset → ...ltileap_Preview/IEGameModeCombined.uasset
diff --git a/Content/Multileap_Preview/Tracking/DataAssetLeapMotionController_2.uasset b/Content/Multileap_Preview/Tracking/DataAssetLeapMotionController_2.uasset
diff --git a/Content/Multileap_Preview/Tracking/LeapModel3DDataAsset.uasset b/Content/Multileap_Preview/Tracking/LeapModel3DDataAsset.uasset
diff --git a/...Tracking/MultiDeviceAlignmentActor.uasset → ...Tracking/MultiDeviceAlignmentActor.uasset b/...Tracking/MultiDeviceAlignmentActor.uasset → ...Tracking/MultiDeviceAlignmentActor.uasset
diff --git a/...ew)/Tracking/RigelModelData3DAsset.uasset → ...iew/Tracking/RigelModelData3DAsset.uasset b/...ew)/Tracking/RigelModelData3DAsset.uasset → ...iew/Tracking/RigelModelData3DAsset.uasset
diff --git a/Content/Multileap_Preview/Tracking/TrackingDeviceActor.uasset b/Content/Multileap_Preview/Tracking/TrackingDeviceActor.uasset
diff --git a/...)/Tracking/TrackingDeviceComponent.uasset → ...w/Tracking/TrackingDeviceComponent.uasset b/...)/Tracking/TrackingDeviceComponent.uasset → ...w/Tracking/TrackingDeviceComponent.uasset
diff --git a/Content/Multileap_Preview/VisIEPawnHands.uasset b/Content/Multileap_Preview/VisIEPawnHands.uasset
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ Ultraleap Unreal Plugin
 
 ## Introduction
 
-Ultraleap's Unreal Plugin enables the data produced by integrating Ultraleap's hand tracking data to be used by developers inside their Unreal projects. It has been built to make it as easy as possible to design and use hand tracking in XR projects. Examples are included to quickly get you up and running with Ultraleap's hand tracking technology.
+Ultraleap's Unreal Engine Plugin enables the data produced by integrating Ultraleap's hand tracking data to be used by developers inside their Unreal projects. It has been built to make it as easy as possible to design and use hand tracking in XR projects. Examples are included to quickly get you up and running with Ultraleap's hand tracking technology.
 
 ## Getting Started
 

diff --git a/Source/ThirdParty/BodyState/Private/BodyStateAnimInstance.cpp b/Source/ThirdParty/BodyState/Private/BodyStateAnimInstance.cpp
@@ -215,7 +215,11 @@ TMap<EBodyStateBasicBoneType, FBodyStateIndexedBone> UBodyStateAnimInstance::Aut
 	}
 
 	// Get bones and parent indices
+#if ENGINE_MAJOR_VERSION >= 5 
+	USkinnedAsset* SkeletalMesh = Component->GetSkinnedAsset();
+#else
 	USkeletalMesh* SkeletalMesh = Component->SkeletalMesh;
+#endif
 
 #if ENGINE_MAJOR_VERSION >= 5 || (ENGINE_MAJOR_VERSION >= 4 && ENGINE_MINOR_VERSION >= 27)
 	FReferenceSkeleton& RefSkeleton = SkeletalMesh->GetRefSkeleton();
@@ -786,8 +790,11 @@ bool UBodyStateAnimInstance::GetNamesAndTransforms(
 	USkeletalMeshComponent* Component = GetSkelMeshComponent();
 	ComponentSpaceTransforms = Component->GetComponentSpaceTransforms();
 	// Get bones and parent indices
+#if ENGINE_MAJOR_VERSION >= 5
+	USkinnedAsset* SkeletalMesh = Component->GetSkinnedAsset();
+#else
 	USkeletalMesh* SkeletalMesh = Component->SkeletalMesh;
-	
+#endif
 
 	INodeMappingProviderInterface* INodeMapping = Cast<INodeMappingProviderInterface>(SkeletalMesh);
 

diff --git a/Source/ThirdParty/BodyState/Private/BodyStateUtility.h b/Source/ThirdParty/BodyState/Private/BodyStateUtility.h
@@ -36,7 +36,11 @@ class BODYSTATE_API FBodyStateUtility
 	template <typename T>
 	static FString EnumToString(const FString& enumName, const T value)
 	{
+#if ENGINE_MAJOR_VERSION >= 5
+		UEnum* pEnum = FindObject<UEnum>(nullptr, *enumName);
+#else
 		UEnum* pEnum = FindObject<UEnum>(ANY_PACKAGE, *enumName);
+#endif
 		return *(pEnum ? pEnum->GetNameStringByIndex(static_cast<uint8>(value)) : "null");
 	}
 };