Update to OpenVR SDK 1.9.16

Author: r57zone

OpenVR/FreeTrack/headers/openvr.h

@@ -8,8 +8,9 @@
 #include <thread>
 #include <chrono>
 
-#include <Windows.h>
-//#include "Shlwapi.h"
+#if defined( _WINDOWS )
+#include <windows.h>
+#endif
 
 using namespace vr;
 
@@ -52,7 +53,7 @@ inline void HmdMatrix_SetIdentity( HmdMatrix34_t *pMatrix )
 
 
 // keys for use with the settings API
-static const char * const k_pch_Sample_Section = "driver_null";
+static const char * const k_pch_Sample_Section = "opentrack";
 static const char * const k_pch_Sample_SerialNumber_String = "serialNumber";
 static const char * const k_pch_Sample_ModelNumber_String = "modelNumber";
 static const char * const k_pch_Sample_WindowX_Int32 = "windowX";
@@ -63,6 +64,7 @@ static const char * const k_pch_Sample_RenderWidth_Int32 = "renderWidth";
 static const char * const k_pch_Sample_RenderHeight_Int32 = "renderHeight";
 static const char * const k_pch_Sample_SecondsFromVsyncToPhotons_Float = "secondsFromVsyncToPhotons";
 static const char * const k_pch_Sample_DisplayFrequency_Float = "displayFrequency";
+
 static const char * const k_pch_Sample_DistortionK1_Float = "DistortionK1";
 static const char * const k_pch_Sample_DistortionK2_Float = "DistortionK2";
 static const char * const k_pch_Sample_ZoomWidth_Float = "ZoomWidth";
@@ -71,6 +73,7 @@ static const char * const k_pch_Sample_DistanceBetweenEyes_Int32 = "DistanceBetw
 static const char * const k_pch_Sample_ScreenOffsetX_Int32 = "ScreenOffsetX";
 static const char * const k_pch_Sample_DebugMode_Bool = "DebugMode";
 
+
 #define FREETRACK_HEAP "FT_SharedMem"
 #define FREETRACK_MUTEX "FT_Mutext"
 
@@ -157,90 +160,6 @@ void FTRead()
 	}
 }
 
-//-----------------------------------------------------------------------------
-// Purpose:
-//-----------------------------------------------------------------------------
-
-class CWatchdogDriver_Sample : public IVRWatchdogProvider
-{
-public:
-	CWatchdogDriver_Sample()
-	{
-		m_pWatchdogThread = nullptr;
-	}
-
-	virtual EVRInitError Init( vr::IVRDriverContext *pDriverContext ) ;
-	virtual void Cleanup() ;
-
-private:
-	std::thread *m_pWatchdogThread;
-};
-
-CWatchdogDriver_Sample g_watchdogDriverNull;
-
-
-bool g_bExiting = false;
-
-void WatchdogThreadFunction(  )
-{
-	while ( !g_bExiting )
-	{
-#if defined( _WINDOWS )
-		// on windows send the event when the Y key is pressed.
-		//if ( (0x01 & GetAsyncKeyState( 'Y' )) != 0 )
-		//{
-			// Y key was pressed. 
-		//	vr::VRWatchdogHost()->WatchdogWakeUp();
-	//	}
-		std::this_thread::sleep_for( std::chrono::microseconds( 500 ) );
-#else
-		// for the other platforms, just send one every five seconds
-		std::this_thread::sleep_for( std::chrono::seconds( 5 ) );
-		vr::VRWatchdogHost()->WatchdogWakeUp();
-#endif
-	}
-}
-
-EVRInitError CWatchdogDriver_Sample::Init( vr::IVRDriverContext *pDriverContext )
-{
-	VR_INIT_WATCHDOG_DRIVER_CONTEXT( pDriverContext );
-//	InitDriverLog( vr::VRDriverLog() );
-
-	// Watchdog mode on Windows starts a thread that listens for the 'Y' key on the keyboard to 
-	// be pressed. A real driver should wait for a system button event or something else from the 
-	// the hardware that signals that the VR system should start up.
-	g_bExiting = false;
-	m_pWatchdogThread = new std::thread( WatchdogThreadFunction );
-	if ( !m_pWatchdogThread )
-	{
-	//	DriverLog( "Unable to create watchdog thread\n");
-		return VRInitError_Driver_Failed;
-	}
-
-	return VRInitError_None;
-}
-
-
-void CWatchdogDriver_Sample::Cleanup()
-{
-	if (HMDConnected) {
-		HMDConnected = false;
-		if (pFTthread) {
-			pFTthread->join();
-			delete pFTthread;
-			pFTthread = nullptr;
-		}
-	}
-	g_bExiting = true;
-	if ( m_pWatchdogThread )
-	{
-		m_pWatchdogThread->join();
-		delete m_pWatchdogThread;
-		m_pWatchdogThread = nullptr;
-	}
-}
-
-
 //-----------------------------------------------------------------------------
 // Purpose:
 //-----------------------------------------------------------------------------
@@ -262,14 +181,14 @@ class CSampleDeviceDriver : public vr::ITrackedDeviceServerDriver, public vr::IV
 		vr::VRSettings()->GetString( k_pch_Sample_Section, k_pch_Sample_ModelNumber_String, buf, sizeof( buf ) );
 		m_sModelNumber = buf;
 
-		m_nWindowX = vr::VRSettings()->GetInt32(k_pch_Sample_Section, k_pch_Sample_WindowX_Int32);
-		m_nWindowY = vr::VRSettings()->GetInt32(k_pch_Sample_Section, k_pch_Sample_WindowY_Int32);
-		m_nWindowWidth = vr::VRSettings()->GetInt32(k_pch_Sample_Section, k_pch_Sample_WindowWidth_Int32);
-		m_nWindowHeight = vr::VRSettings()->GetInt32(k_pch_Sample_Section, k_pch_Sample_WindowHeight_Int32);
-		m_nRenderWidth = vr::VRSettings()->GetInt32(k_pch_Sample_Section, k_pch_Sample_RenderWidth_Int32);
-		m_nRenderHeight = vr::VRSettings()->GetInt32(k_pch_Sample_Section, k_pch_Sample_RenderHeight_Int32);
-		m_flSecondsFromVsyncToPhotons = vr::VRSettings()->GetFloat(k_pch_Sample_Section, k_pch_Sample_SecondsFromVsyncToPhotons_Float);
-		m_flDisplayFrequency = vr::VRSettings()->GetFloat(k_pch_Sample_Section, k_pch_Sample_DisplayFrequency_Float);
+		m_nWindowX = vr::VRSettings()->GetInt32( k_pch_Sample_Section, k_pch_Sample_WindowX_Int32 );
+		m_nWindowY = vr::VRSettings()->GetInt32( k_pch_Sample_Section, k_pch_Sample_WindowY_Int32 );
+		m_nWindowWidth = vr::VRSettings()->GetInt32( k_pch_Sample_Section, k_pch_Sample_WindowWidth_Int32 );
+		m_nWindowHeight = vr::VRSettings()->GetInt32( k_pch_Sample_Section, k_pch_Sample_WindowHeight_Int32 );
+		m_nRenderWidth = vr::VRSettings()->GetInt32( k_pch_Sample_Section, k_pch_Sample_RenderWidth_Int32 );
+		m_nRenderHeight = vr::VRSettings()->GetInt32( k_pch_Sample_Section, k_pch_Sample_RenderHeight_Int32 );
+		m_flSecondsFromVsyncToPhotons = vr::VRSettings()->GetFloat( k_pch_Sample_Section, k_pch_Sample_SecondsFromVsyncToPhotons_Float );
+		m_flDisplayFrequency = vr::VRSettings()->GetFloat( k_pch_Sample_Section, k_pch_Sample_DisplayFrequency_Float );
 
 		m_fDistortionK1 = vr::VRSettings()->GetFloat(k_pch_Sample_Section, k_pch_Sample_DistortionK1_Float);
 		m_fDistortionK2 = vr::VRSettings()->GetFloat(k_pch_Sample_Section, k_pch_Sample_DistortionK2_Float);
@@ -279,22 +198,14 @@ class CSampleDeviceDriver : public vr::ITrackedDeviceServerDriver, public vr::IV
 		m_nScreenOffsetX = vr::VRSettings()->GetFloat(k_pch_Sample_Section, k_pch_Sample_ScreenOffsetX_Int32);
 		m_bDebugMode = vr::VRSettings()->GetBool(k_pch_Sample_Section, k_pch_Sample_DebugMode_Bool);
 
-		//DriverLog( "driver_null: Serial Number: %s\n", m_sSerialNumber.c_str() );
-		//DriverLog( "driver_null: Model Number: %s\n", m_sModelNumber.c_str() );
-		//DriverLog( "driver_null: Window: %d %d %d %d\n", m_nWindowX, m_nWindowY, m_nWindowWidth, m_nWindowHeight );
-		//DriverLog( "driver_null: Render Target: %d %d\n", m_nRenderWidth, m_nRenderHeight );
-		//DriverLog( "driver_null: Seconds from Vsync to Photons: %f\n", m_flSecondsFromVsyncToPhotons );
-		//DriverLog( "driver_null: Display Frequency: %f\n", m_flDisplayFrequency );
-		//DriverLog( "driver_null: IPD: %f\n", m_flIPD ); 
-
-		
-		if (impl_create_mapping() == false) {
-			HMDConnected = false;
-		}
-		else {
-			HMDConnected = true;
-			pFTthread = new std::thread(FTRead);
-		}
+
+		/*DriverLog( "driver_null: Serial Number: %s\n", m_sSerialNumber.c_str() );
+		DriverLog( "driver_null: Model Number: %s\n", m_sModelNumber.c_str() );
+		DriverLog( "driver_null: Window: %d %d %d %d\n", m_nWindowX, m_nWindowY, m_nWindowWidth, m_nWindowHeight );
+		DriverLog( "driver_null: Render Target: %d %d\n", m_nRenderWidth, m_nRenderHeight );
+		DriverLog( "driver_null: Seconds from Vsync to Photons: %f\n", m_flSecondsFromVsyncToPhotons );
+		DriverLog( "driver_null: Display Frequency: %f\n", m_flDisplayFrequency );
+		DriverLog( "driver_null: IPD: %f\n", m_flIPD );*/
 	}
 
 	virtual ~CSampleDeviceDriver()
@@ -323,6 +234,7 @@ class CSampleDeviceDriver : public vr::ITrackedDeviceServerDriver, public vr::IV
 
 		//Debug mode activate Windowed Mode (borderless fullscreen), lock to 30 FPS 
 		vr::VRProperties()->SetBoolProperty(m_ulPropertyContainer, Prop_DisplayDebugMode_Bool, m_bDebugMode);
+
 		// Icons can be configured in code or automatically configured by an external file "drivername\resources\driver.vrresources".
 		// Icon properties NOT configured in code (post Activate) are then auto-configured by the optional presence of a driver's "drivername\resources\driver.vrresources".
 		// In this manner a driver can configure their icons in a flexible data driven fashion by using an external file.
@@ -346,20 +258,20 @@ class CSampleDeviceDriver : public vr::ITrackedDeviceServerDriver, public vr::IV
 		// Thus "Prop_NamedIconPathDeviceAlertLow_String" in each model's block represent a specialization specific for that "model".
 		// Keys in "Model-v Defaults" are an example of mapping to the same states, and here all map to "Prop_NamedIconPathDeviceOff_String".
 		//
-		bool bSetupIconUsingExternalResourceFile = true;
+		/*bool bSetupIconUsingExternalResourceFile = true;
 		if ( !bSetupIconUsingExternalResourceFile )
 		{
 			// Setup properties directly in code.
 			// Path values are of the form {drivername}\icons\some_icon_filename.png
-			vr::VRProperties()->SetStringProperty( m_ulPropertyContainer, vr::Prop_NamedIconPathDeviceOff_String, "{null}/icons/headset_sample_status_off.png" );
-			vr::VRProperties()->SetStringProperty( m_ulPropertyContainer, vr::Prop_NamedIconPathDeviceSearching_String, "{null}/icons/headset_sample_status_searching.gif" );
-			vr::VRProperties()->SetStringProperty( m_ulPropertyContainer, vr::Prop_NamedIconPathDeviceSearchingAlert_String, "{null}/icons/headset_sample_status_searching_alert.gif" );
-			vr::VRProperties()->SetStringProperty( m_ulPropertyContainer, vr::Prop_NamedIconPathDeviceReady_String, "{null}/icons/headset_sample_status_ready.png" );
-			vr::VRProperties()->SetStringProperty( m_ulPropertyContainer, vr::Prop_NamedIconPathDeviceReadyAlert_String, "{null}/icons/headset_sample_status_ready_alert.png" );
-			vr::VRProperties()->SetStringProperty( m_ulPropertyContainer, vr::Prop_NamedIconPathDeviceNotReady_String, "{null}/icons/headset_sample_status_error.png" );
-			vr::VRProperties()->SetStringProperty( m_ulPropertyContainer, vr::Prop_NamedIconPathDeviceStandby_String, "{null}/icons/headset_sample_status_standby.png" );
-			vr::VRProperties()->SetStringProperty( m_ulPropertyContainer, vr::Prop_NamedIconPathDeviceAlertLow_String, "{null}/icons/headset_sample_status_ready_low.png" );
-		}
+			vr::VRProperties()->SetStringProperty( m_ulPropertyContainer, vr::Prop_NamedIconPathDeviceOff_String, "{sample}/icons/headset_sample_status_off.png" );
+			vr::VRProperties()->SetStringProperty( m_ulPropertyContainer, vr::Prop_NamedIconPathDeviceSearching_String, "{sample}/icons/headset_sample_status_searching.gif" );
+			vr::VRProperties()->SetStringProperty( m_ulPropertyContainer, vr::Prop_NamedIconPathDeviceSearchingAlert_String, "{sample}/icons/headset_sample_status_searching_alert.gif" );
+			vr::VRProperties()->SetStringProperty( m_ulPropertyContainer, vr::Prop_NamedIconPathDeviceReady_String, "{sample}/icons/headset_sample_status_ready.png" );
+			vr::VRProperties()->SetStringProperty( m_ulPropertyContainer, vr::Prop_NamedIconPathDeviceReadyAlert_String, "{sample}/icons/headset_sample_status_ready_alert.png" );
+			vr::VRProperties()->SetStringProperty( m_ulPropertyContainer, vr::Prop_NamedIconPathDeviceNotReady_String, "{sample}/icons/headset_sample_status_error.png" );
+			vr::VRProperties()->SetStringProperty( m_ulPropertyContainer, vr::Prop_NamedIconPathDeviceStandby_String, "{sample}/icons/headset_sample_status_standby.png" );
+			vr::VRProperties()->SetStringProperty( m_ulPropertyContainer, vr::Prop_NamedIconPathDeviceAlertLow_String, "{sample}/icons/headset_sample_status_ready_low.png" );
+		}*/
 
 		return VRInitError_None;
 	}
@@ -456,7 +368,7 @@ class CSampleDeviceDriver : public vr::ITrackedDeviceServerDriver, public vr::IV
 		double theta;
 
 		rr = sqrt((fU - 0.5f)*(fU - 0.5f) + (fV - 0.5f)*(fV - 0.5f));
-		r2 = rr * (1 + m_fDistortionK1*(rr*rr) + m_fDistortionK2*(rr*rr*rr*rr));
+		r2 = rr * (1 + m_fDistortionK1 * (rr*rr) + m_fDistortionK2 * (rr*rr*rr*rr));
 		theta = atan2(fU - 0.5f, fV - 0.5f);
 		hX = sin(theta)*r2*m_fZoomWidth;
 		hY = cos(theta)*r2*m_fZoomHeight;
@@ -534,6 +446,7 @@ class CSampleDeviceDriver : public vr::ITrackedDeviceServerDriver, public vr::IV
 	float m_flSecondsFromVsyncToPhotons;
 	float m_flDisplayFrequency;
 	float m_flIPD;
+
 	float m_fDistortionK1;
 	float m_fDistortionK2;
 	float m_fZoomWidth;
@@ -549,12 +462,6 @@ class CSampleDeviceDriver : public vr::ITrackedDeviceServerDriver, public vr::IV
 class CServerDriver_Sample: public IServerTrackedDeviceProvider
 {
 public:
-	CServerDriver_Sample()
-		: m_pNullHmdLatest( NULL )
-		, m_bEnableNullDriver( false )
-	{
-	}
-
 	virtual EVRInitError Init( vr::IVRDriverContext *pDriverContext ) ;
 	virtual void Cleanup() ;
 	virtual const char * const *GetInterfaceVersions() { return vr::k_InterfaceVersions; }
@@ -564,9 +471,7 @@ class CServerDriver_Sample: public IServerTrackedDeviceProvider
 	virtual void LeaveStandby()  {}
 
 private:
-	CSampleDeviceDriver *m_pNullHmdLatest;
-	
-	bool m_bEnableNullDriver;
+	CSampleDeviceDriver *m_pNullHmdLatest = nullptr;
 };
 
 CServerDriver_Sample g_serverDriverNull;
@@ -577,8 +482,17 @@ EVRInitError CServerDriver_Sample::Init( vr::IVRDriverContext *pDriverContext )
 	VR_INIT_SERVER_DRIVER_CONTEXT( pDriverContext );
 	//InitDriverLog( vr::VRDriverLog() );
 
+	if (impl_create_mapping() == false) {
+		HMDConnected = false;
+	}
+	else {
+		HMDConnected = true;
+		pFTthread = new std::thread(FTRead);
+	}
+
 	m_pNullHmdLatest = new CSampleDeviceDriver();
 	vr::VRServerDriverHost()->TrackedDeviceAdded( m_pNullHmdLatest->GetSerialNumber().c_str(), vr::TrackedDeviceClass_HMD, m_pNullHmdLatest );
+
 	return VRInitError_None;
 }
 
@@ -592,6 +506,7 @@ void CServerDriver_Sample::Cleanup()
 			pFTthread = nullptr;
 		}
 	}
+	//CleanupDriverLog();
 	delete m_pNullHmdLatest;
 	m_pNullHmdLatest = NULL;
 }
@@ -614,10 +529,6 @@ HMD_DLL_EXPORT void *HmdDriverFactory( const char *pInterfaceName, int *pReturnC
 	{
 		return &g_serverDriverNull;
 	}
-	if( 0 == strcmp( IVRWatchdogProvider_Version, pInterfaceName ) )
-	{
-		return &g_watchdogDriverNull;
-	}
 
 	if( pReturnCode )
 		*pReturnCode = VRInitError_Init_InterfaceNotFound;

OpenVR/FreeTrack/headers/openvr_api.cs

@@ -22,7 +22,7 @@
     <ProjectGuid>{A47C788B-1BDA-4057-87A9-FC35ED711B44}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>driver_sample</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -69,19 +69,23 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(SolutionDir)\..\bin\drivers\sample\bin\win32\</OutDir>
+    <OutDir>$(SolutionDir)\bin\drivers\sample\bin\win32\</OutDir>
+    <TargetName>driver_opentrack</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(SolutionDir)\..\bin\drivers\sample\bin\win64\</OutDir>
+    <OutDir>$(SolutionDir)\bin\drivers\sample\bin\win64\</OutDir>
+    <TargetName>driver_opentrack</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(SolutionDir)\..\bin\drivers\sample\bin\win32\</OutDir>
+    <OutDir>$(SolutionDir)\bin\drivers\sample\bin\win32\</OutDir>
+    <TargetName>driver_opentrack</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(SolutionDir)\..\bin\drivers\sample\bin\win64\</OutDir>
+    <OutDir>$(SolutionDir)\bin\drivers\sample\bin\win64\</OutDir>
+    <TargetName>driver_opentrack</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>