Merge branch 'UnrealPluginV4_RC2'

# Conflicts:
#	Config/FilterPlugin.ini
#	Source/UltraleapTrackingCore/Private/LeapWrapper.cpp

.gitignore

@@ -15,3 +15,4 @@ Binaries/Win64/UE4Editor*.dll
 Binaries/Win64/UE4Editor*.dll
 *.a
 Binaries/
+DoxyOutput/

.gitlab-ci.yml

@@ -0,0 +1,129 @@
+variables:
+  # use the strategy set in the project CI settings GIT_STRATEGY: none
+  GIT_SUBMODULE_STRATEGY: none
+  ErrorActionPreference: stop
+
+  PROJECT_NAME: "UltraleapTracking"
+  PROJECT_PATH: "$CI_PROJECT_DIR"  
+
+  ENGINE_PATH: "C:/Program Files/Epic Games/UE_4.27"
+  ENGINE_UAT_PATH: "$ENGINE_PATH/Engine/Build/BatchFiles/RunUAT.bat"
+
+  # this holds the unreal version
+  UNREAL_ENGINE_BUILD_VERSION_FILE: "$ENGINE_PATH/Engine/Build/Build.version"
+
+  VERSIONTRUNC: "Unknown"
+stages:
+  - documentation
+  - build
+
+documentation::generate-tracking-documentation:
+  stage: documentation
+  tags:
+    - unreal
+    - windows  
+  timeout: 30m
+
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      when: always
+      allow_failure: true
+
+    - if: $CI_PIPELINE_SOURCE == "pipeline"
+      when: always
+      allow_failure: true
+
+    - if: $CI_COMMIT_BRANCH
+      when: manual
+      allow_failure: true
+
+
+  script:
+     # Generate XML documentation using Doxygen
+    - echo "Generate docs"
+
+    # this uses the presets saved in Doxyfile and outputs to DoxyOutput/xml
+    - doxygen
+
+  after_script:
+    - $DOXY_LOCATION = "$PROJECT_PATH/DoxyOutput"
+    - echo "$DOXY_LOCATION"
+
+    - mv "$DOXY_LOCATION/*" "$CI_PROJECT_DIR"
+  artifacts:
+    name: "Artifacts"
+    paths:
+      - "xml"
+
+    when: always
+    expire_in: never
+
+build:build-project:
+  stage: build
+  tags:
+    - unreal
+    - windows
+  when: always
+  retry: 2
+  timeout: 1h
+  allow_failure: false
+
+  script:   
+    # Get Unreal version and changeset from the project. from json
+    - $UNREAL_VERSION_CONTENT = Get-Content -Raw -Path $UNREAL_ENGINE_BUILD_VERSION_FILE | ConvertFrom-Json
+    - $UNREAL_VERSION = $UNREAL_VERSION_CONTENT.MajorVersion.ToString() + "." + $UNREAL_VERSION_CONTENT.MinorVersion.ToString()  + "." + $UNREAL_VERSION_CONTENT.PatchVersion.ToString()
+
+    - echo "$ENGINE_PATH"
+    - echo "$PROJECT_PATH"
+    - echo "$PROJECT_PATH/$PROJECT_NAME.uplugin"
+    - echo "$ENGINE_UAT_PATH"
+    - echo "Working dir"
+    - pwd
+
+    # Build the project.
+    - echo "==============================================="
+    - echo "Build with UAT"
+    - echo "==============================================="
+
+    # Piped to a log file, remove at the end of this line if you want to see the output during build
+    - $process = Start-Process -Wait -PassThru -NoNewWindow -FilePath "$ENGINE_UAT_PATH" -ArgumentList "BuildPlugin -Plugin=$PROJECT_PATH/$PROJECT_NAME.uplugin -Package=$PROJECT_PATH/$PROJECT_NAME -CreateSubFolder -VS2019 -Rocket > ./$PROJECT_NAME.log" 
+    - echo $process.ExitCode
+    - if (-not ($process.ExitCode -eq 0)) { exit $process.ExitCode }
+
+
+    - echo "Unreal build complete."
+
+
+  after_script:
+     # Get the project/app version from the uplugin file
+     # this holds the plugin version
+    - $UNREAL_PLUGIN_FILE = "$PROJECT_PATH/$PROJECT_NAME.uplugin"
+    - $BUILD_LOCATION = "$PROJECT_PATH/$PROJECT_NAME"
+
+    - $VERSION =  Get-Content $UNREAL_PLUGIN_FILE | Where-Object {$_ -like '*VersionName*'}
+    - $VERSIONTRUNC = $VERSION.Replace('VersionName','')
+    - $VERSIONTRUNC = $VERSIONTRUNC.Replace(':','')
+    - $VERSIONTRUNC = $VERSIONTRUNC.Replace(' ','')
+    - $VERSIONTRUNC = $VERSIONTRUNC.Replace('",','')
+    - $VERSIONTRUNC = $VERSIONTRUNC.Replace('"','')
+    - $VERSIONTRUNC = $VERSIONTRUNC.Replace('	','')
+
+
+    - echo "$UNREAL_VERSION"
+    - echo "$VERSIONTRUNC"
+
+    - $BUILD_FULL_VERSION = $VERSIONTRUNC
+    - $BUILD_PATH = "./build/$PROJECT_NAME-$BUILD_FULL_VERSION/"
+    - mkdir "$BUILD_PATH"  
+    - echo "$BUILD_PATH"
+    - echo "$BUILD_LOCATION"
+
+    - mv "$BUILD_LOCATION/*" "$BUILD_PATH"
+
+  artifacts:
+    name: "$env:CI_PROJECT_NAME-$env:CI_COMMIT_REF_SLUG-$env:CI_JOB_ID-$env:CI_COMMIT_SHORT_SHA"
+    paths:
+    - "./build/"
+    - "./$PROJECT_NAME.log"
+    when: always
+    expire_in: 2 weeks

Binaries/Win64/LeapC.dll.manifest

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+    <file name="LeapC.dll" />
+</assembly>

CHANGELOG.md

@@ -1,9 +1,46 @@
-LeapUnreal - Change Log
+Ultraleap Tracking - Change Log
 ====================
 
 Versions
 
+### Version 4.3.0
+
+- Plugin rebranded to UltraleapTracking from LeapMotion
+- Added Interaction Engine
+- Added UI input modules
+- Added OpenXR hand tracking support
+
+ Known issues:
+	* Auto calculating orientations with imported meshes that have negative scales require manual correction to the PreBaseRotation.
+	* HMD offset is not set automatically for SteamVR devices and should be set manually for your headset in the IEPawnHands blueprint.
+
+### Version 3.9.0
+
+* Added Gemini 5.2.0.0 LeapC.dll (Gen2 support)
+* Added hand modules 
+  * One click auto orientation and new auto bone mapping logic to enable fast import and rigging of hand models.
+  * New premapped example hand models - skeleton arms, ghost hands, UE Mannequin and outline hands, with example scenes.
+  * Streamlined auto rigging so no nodes are needed in the anim instance's event graph. 
+
+Known issues:
+	* Auto calculating orientations with imported meshes that have negative scales require manual correction to the PreBaseRotation.
+
+### Version 3.7.1
+
+* Adds Support for new "ScreenTop" Tracking Mode: Compatible with 4.9+ Services. This is a feature preview only.
+* Tracking mode APIs and notifications now replace Policy flag APIs and notifications
+* Fixed: Failure to compile in UE 4.26.x
+* Fixed: Pinch and grab events both received on grab (grab now overrides pinch)
+* Fixed: Hands tracked/not tracked notifications events being fired even when no change has occurred
+* Fixed: Hands not tracked when run in Stand Alone mode from the editor
+* Fixed: Intermittent crashes when using body state animation instance based blueprints in editor
+* Fixed: Right pinch leap component event not sent
+* Removed 32bit Leap DLL and 32bit support.
+* Fixed: Live Link hand bone positions are incorrect (spread out in space)
+* This version will still re-compile and run with UE 4.25.x
+
 ### Version 3.6.0
+
 * Now supports Unreal 4.25. Tracking tested for HMD based hand tracking. However, desktop mode hand tracking still has some bugs/performance issues.
 * Improved performance/stability (due to LeapC.dll change / use of the FastTrack Animation System for Hands).
 * Non-frame based gesture detection system introduced (this reduces the frequency of grabs/pinches dropping out by giving it a buffer time). The old frame based system is still supported through a UI option.
@@ -21,4 +58,4 @@ Versions
 
 Copyright © 2012-2020 Ultraleap Ltd. All rights reserved.
 
-Use of the Leap Motion SDK is subject to the terms of the Leap Motion SDK Agreement available at https://developer.leapmotion.com/sdk_agreement, or another agreement between Ultraleap Ltd. and you, your company or other organization.
+Use of the Leap Motion SDK is subject to the terms of the Leap Motion SDK Agreement available at https://developer.leapmotion.com/sdk_agreement, or another agreement between Ultraleap Ltd. and you, your company or other organization.

Config/FilterPlugin.ini

@@ -6,3 +6,10 @@
 ;    /README.txt
 ;    /Extras/...
 /Binaries/Win64/LeapC.dll
+/Binaries/Win64/LeapC.dll.manifest
+/Config/DefaultUltraleapTracking.ini
+DefaultInput.ini
+README.md
+Documentation.md
+LICENSE
+CHANGELOG.md

ConvertToRST.bat

@@ -0,0 +1 @@
+pandoc -s -f commonmark -t rst documentation.md > Documentation.rst