matzman666 · nazaroaversano · May 17, 2018 · May 17, 2018 · Apr 27, 2022 · Apr 27, 2022
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,12 @@
-/third-party/LeapSDK/*
+.vs/*
+*/build/*
+*/Release/*
+*/Debug/*
+Debug/*
+Release/*
+build/*
+*/x64/*
+*/bin/*
 /third-party/boost_1_63_0/*
-/build/*
-/Release/*
-/Debug/*
+*.tlog
+driver_vrinputemulator/bin/*
diff --git a/Readme.md b/Readme.md
@@ -1,4 +1,6 @@
-![language](https://img.shields.io/badge/Language-C%2B%2B11-green.svg)  ![dependencies](https://img.shields.io/badge/Dependencies-Boost%201.63-green.svg)  ![license_gpl3](https://img.shields.io/badge/License-GPL%203.0-green.svg)
+![language](https://img.shields.io/badge/Language-C%2B%2B11-green.svg) ![dependencies](https://img.shields.io/badge/Dependencies-Boost%201.63-green.svg) ![license_gpl3](https://img.shields.io/badge/License-GPL%203.0-green.svg)
+
+### This is a fork of OpenVRInputEmulator that is compatible with the latest SteamVR versions (hopefully). Fixes aren't mine, I took code from other people, including p1mp184, and merged it all into one repo.
 
 # OpenVR-InputEmulator
 
@@ -8,7 +10,7 @@ An OpenVR driver that allows to create virtual controllers, emulate controller i
 
 The OpenVR driver hooks into the HTC Vive lighthouse driver and allows to modify any pose updates or button/axis events coming from the Vive controllers before they reach the OpenVR runtime. Due to the nature of this hack the driver may break when Valve decides to update the driver-side OpenVR API.
 
-The motivation of this driver is that I want to make myself a tracked gun that is guaranteed to work in any SteamVR game regardless of whether the original dev wants to support tracked guns or not. To accomplish this I need some way to add translation and rotation offsets to the poses of the motion controllers so that I can line up my tracked gun and the gun in the game. Additionally I need a way to easily switch between the tracking puck on my gun and my motion controller with the game thinking it's still the same controller (Throwing grenades with a tracked gun is not fun). But this driver should also support other use cases. 
+The motivation of this driver is that I want to make myself a tracked gun that is guaranteed to work in any SteamVR game regardless of whether the original dev wants to support tracked guns or not. To accomplish this I need some way to add translation and rotation offsets to the poses of the motion controllers so that I can line up my tracked gun and the gun in the game. Additionally I need a way to easily switch between the tracking puck on my gun and my motion controller with the game thinking it's still the same controller (Throwing grenades with a tracked gun is not fun). But this driver should also support other use cases.
 
 There is also a client-side API which other programs can use to communicate with the driver. This API should be powerful enough to also support the development of full-fledged motion-controller drivers.
 
@@ -17,7 +19,7 @@ There is also a client-side API which other programs can use to communicate with
 - Add translation and rotation offsets to the pose of existing controllers.
 - Redirect the pose from one controller to another.
 - Swap controllers.
-- Motion  compensation for 6-dof motion platforms.
+- Motion compensation for 6-dof motion platforms.
 - Create virtual controllers and control their positions and rotations.
 - Emulate controller input.
 - Remap controller buttons.
@@ -35,14 +37,13 @@ Download the newest installer from the [release section](https://github.com/matz
 
 ## Command-Line Client
 
-Download the newest command-line client from the [release section](https://github.com/matzman666/OpenVR-InputEmulator/releases), unzip it, and then execute the contained binary in a cmd window. Enter *'client_commandline.exe help'* on the command line for usage instructions.
-
+Download the newest command-line client from the [release section](https://github.com/matzman666/OpenVR-InputEmulator/releases), unzip it, and then execute the contained binary in a cmd window. Enter _'client_commandline.exe help'_ on the command line for usage instructions.
 
 # Documentation
 
 ## Fallout 4 VR specific Fixes
 
-There is an Oculus Touch specific fix available for Fallout 4 VR. It allows to emulate trackpad behaviour with the Rift's joysticks. Therefore, on the [input remapping pages](https://github.com/matzman666/OpenVR-InputEmulator#analog-input-settings) of each analog axis a touchpad emulation mode can be configured. 
+There is an Oculus Touch specific fix available for Fallout 4 VR. It allows to emulate trackpad behaviour with the Rift's joysticks. Therefore, on the [input remapping pages](https://github.com/matzman666/OpenVR-InputEmulator#analog-input-settings) of each analog axis a touchpad emulation mode can be configured.
 
 Currently there are two modes available:
 
@@ -93,14 +94,15 @@ Redirect mode can be temporarily suspended by re-mapping a controller button to
 ![Motion Compensation Settings Page](docs/screenshots/MotionCompensationPage.png)
 
 **Vel/Acc Compensation Mode**: How should reported velocities and acceleration values be adjusted. The problem with only adjusting the headset position is that pose prediction also takes velocity and acceleration into accound. As long as the reported values to not differ too much from the real values, pose prediction errors are hardly noticeable. But with fast movements of the motion platform the pose prediction error can be noticeable. Available modes are:
+
 - **Disabled**: Do not adjust velocity/acceration values.
 - **Set Zero**: Set all velocity/acceleration values to zero. Most simple form of velocity/acceleration compensation.
 - **Use Reference Tracker**: Substract the velocity/acceleration values of the motion compensation reference tracker/controller from the values reported from the headset. Most accurate form of velocity/acceleration compensation. However, it requires that the reference tracker/controller is as closely mounted to the head position as possible. The further away it is from the head position the larger the error.
 - **Linear Approximation w/ Moving Average (Experimental)**: Uses linear approximation to estimate the velocity/acceleration values. The used formula is: (current_position - last_position) / time_difference. To reduce jitter the average over the last few values is used.
   - **Moving Average Window**: How many values are used for calculating the average.
 - **Kalman Filter (Experimental)**: The position values are fed into a kalman filter which then outputs a velocity value. The kalman filter implementation is based on the filter described [here](https://en.wikipedia.org/wiki/Kalman_filter#Example_application.2C_technical).
-  - **Process/Observation Noise**: Parameters used to fine-tune the kalman filter. 
-  
+  - **Process/Observation Noise**: Parameters used to fine-tune the kalman filter.
+
 ## Input Remapping Page:
 
 ![Input Remapping Page](docs/screenshots/InputRemappingPage.png)
@@ -183,7 +185,6 @@ Available touch emulation modes:
 - **Swap X/Y**: Swaps the x and the y axis.
 - **Dead Zone**: Allows to configure dead zones in the middle (left value) and at the edges (right value) of an axis. The deadzone in the middle is mapped to 0, and the deadzone at the edges is mapped to 1. All input between the deadzones is remapped to an interval of [0, 1].
 
-
 ## client_commandline commands:
 
 ### listdevices
@@ -288,7 +289,6 @@ setdeviceposition <virtualId> <x> <y> <z>
 
 setdevicerotation <virtualId> <yaw> <pitch> <roll>.
 
-
 ## Client API
 
 ToDo. See [vrinputemulator.h](https://github.com/matzman666/OpenVR-InputEmulator/blob/master/lib_vrinputemulator/include/vrinputemulator.h).
@@ -337,18 +337,17 @@ client_commandline.exe setdeviceposition 0 -1 -1 -1
 ```
 
 ## Initial Setup
-### ~~Download the LeapMotion SDK~~ (Only needed by the now defunct project driver_leapmotion)
-1. Goto https://developer.leapmotion.com/get-started
-1. Click "Download Orion Beta"
-1. Unzip the "LeapSDK" folder in the zip file into `OpenVR-InputEmulator/third-party/LeapSDK`
 
 ### Boost
-1. Goto https://sourceforge.net/projects/boost/files/boost-binaries/1.63.0/
+
+1. Go to https://sourceforge.net/projects/boost/files/boost-binaries/1.63.0/
 1. Download Boost 1.63 Binaries (boost_1_63_0-msvc-14.0-64.exe)
-1. Install Boost into `OpenVR-InputEmulator/third-party/boost_1_63_0`
-
+1. Install Boost into OpenVR-InputEmulator/third-party/boost_1_63_0
+
+
 ### Qt
-1. Goto https://download.qt.io/official_releases/qt/5.7/5.7.0/
+
+1. Go to https://download.qt.io/new_archive/qt/5.7/5.7.0/
 1. Download Qt 5.7.0
 1. Run the Qt installer (I installed it to "c:\Qt")
 1. Goto `OpenVR-InputEmulator\client_overlay`
@@ -366,9 +365,9 @@ client_commandline.exe setdeviceposition 0 -1 -1 -1
 NOTE: Adjust the path the `msvc2015_64` folder in Qt to match your installation
 
 ## Building
-1. Open *'VRInputEmulator.sln'* in Visual Studio 2015.
-2. Build Solution
 
+1. Open _'VRInputEmulator.sln'_ in Visual Studio 2019.
+2. Build driver_vrinputemulator.
 
 # Known Bugs
 

diff --git a/VRInputEmulator.sln b/VRInputEmulator.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31410.357
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_vrinputemulator", "lib_vrinputemulator\lib_vrinputemulator.vcxproj", "{05AC9994-2B63-4DE5-ABF3-95CE346F3A64}"
 EndProject
@@ -10,8 +10,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "driver_vrinputemulator", "d
 		{05AC9994-2B63-4DE5-ABF3-95CE346F3A64} = {05AC9994-2B63-4DE5-ABF3-95CE346F3A64}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client_leapmotion", "client_leapmotion\client_leapmotion.vcxproj", "{329C6147-E62D-456F-8860-A2DD91B113B5}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client_commandline", "client_commandline\client_commandline.vcxproj", "{C4680CF3-74B7-4A1C-9762-1124E7B10634}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client_overlay", "client_overlay\client_overlay.vcxproj", "{33E075DB-922D-3252-976E-46B5721DC3DE}"
@@ -40,14 +38,6 @@ Global
 		{AF6FBE95-527D-499B-9ABD-3A47E9E84C8A}.Release|x64.Build.0 = Release|x64
 		{AF6FBE95-527D-499B-9ABD-3A47E9E84C8A}.Release|x86.ActiveCfg = Release|Win32
 		{AF6FBE95-527D-499B-9ABD-3A47E9E84C8A}.Release|x86.Build.0 = Release|Win32
-		{329C6147-E62D-456F-8860-A2DD91B113B5}.Debug|x64.ActiveCfg = Debug|x64
-		{329C6147-E62D-456F-8860-A2DD91B113B5}.Debug|x64.Build.0 = Debug|x64
-		{329C6147-E62D-456F-8860-A2DD91B113B5}.Debug|x86.ActiveCfg = Debug|Win32
-		{329C6147-E62D-456F-8860-A2DD91B113B5}.Debug|x86.Build.0 = Debug|Win32
-		{329C6147-E62D-456F-8860-A2DD91B113B5}.Release|x64.ActiveCfg = Release|x64
-		{329C6147-E62D-456F-8860-A2DD91B113B5}.Release|x64.Build.0 = Release|x64
-		{329C6147-E62D-456F-8860-A2DD91B113B5}.Release|x86.ActiveCfg = Release|Win32
-		{329C6147-E62D-456F-8860-A2DD91B113B5}.Release|x86.Build.0 = Release|Win32
 		{C4680CF3-74B7-4A1C-9762-1124E7B10634}.Debug|x64.ActiveCfg = Debug|x64
 		{C4680CF3-74B7-4A1C-9762-1124E7B10634}.Debug|x64.Build.0 = Debug|x64
 		{C4680CF3-74B7-4A1C-9762-1124E7B10634}.Debug|x86.ActiveCfg = Debug|Win32
@@ -66,4 +56,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {32AD8E4F-4BB2-40C7-8DA2-071417406482}
+	EndGlobalSection
 EndGlobal
diff --git a/client_commandline/client_commandline.vcxproj b/client_commandline/client_commandline.vcxproj
@@ -22,32 +22,32 @@
     <ProjectGuid>{C4680CF3-74B7-4A1C-9762-1124E7B10634}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>client_commandline</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -89,6 +89,11 @@
     <OutDir>$(SolutionDir)$(Configuration)\bin\$(Platform)\</OutDir>
     <IntDir>$(SolutionDir)build\$(ProjectName)\$(Configuration)\$(Platform)\</IntDir>
   </PropertyGroup>
+  <PropertyGroup>
+    <BOOST_ROOT>$(MSBuildProjectDirectory)\..\third-party\boost_1_63_0</BOOST_ROOT>
+    <BOOST_LIB>$(MSBuildProjectDirectory)\..\third-party\boost_1_63_0\lib64-msvc-14.0</BOOST_LIB>
+    <OPENVR_ROOT>$(MSBuildProjectDirectory)\..\openvr</OPENVR_ROOT>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>
@@ -97,7 +102,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\lib_vrinputemulator\include;..\openvr\headers;..\third-party\boost_1_63_0;..\third-party\easylogging++;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib_vrinputemulator\include;$(OPENVR_ROOT)\headers;$(BOOST_ROOT);..\third-party\easylogging++;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -112,12 +117,12 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\lib_vrinputemulator\include;..\openvr\headers;..\third-party\boost_1_63_0;..\third-party\easylogging++;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib_vrinputemulator\include;$(OPENVR_ROOT)\headers;$(BOOST_ROOT);..\third-party\easylogging++;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>..\openvr\lib\win64;..\third-party\boost_1_63_0\lib64-msvc-14.0;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OPENVR_ROOT)\lib\win64;$(BOOST_LIB);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>openvr_api.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -131,7 +136,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\lib_vrinputemulator\include;..\openvr\headers;..\third-party\boost_1_63_0;..\third-party\easylogging++;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib_vrinputemulator\include;$(OPENVR_ROOT)\headers;$(BOOST_ROOT);..\third-party\easylogging++;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -150,14 +155,14 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\lib_vrinputemulator\include;..\openvr\headers;..\third-party\boost_1_63_0;..\third-party\easylogging++;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib_vrinputemulator\include;$(OPENVR_ROOT)\headers;$(BOOST_ROOT);..\third-party\easylogging++;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>..\openvr\lib\win64;..\third-party\boost_1_63_0\lib64-msvc-14.0;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OPENVR_ROOT)\lib\win64;$(BOOST_LIB);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>openvr_api.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>

diff --git a/client_commandline/client_commandline.vcxproj.user b/client_commandline/client_commandline.vcxproj.user
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup />
+</Project>