Merge pull request #3 from Dschadu/beta-0.2.2

Changed to new OpenVR Version. Fixed Logging.
Dschadu · Dec 25, 2020 · b716811 · b716811
2 parents 36ad1f6 + e78ae80
commit b716811
Show file tree

Hide file tree

Showing 11 changed files with 85 additions and 141 deletions.
diff --git a/motionPose/MotionPoseController.cpp b/motionPose/MotionPoseController.cpp
@@ -1,16 +1,16 @@
 #include "MotionPoseController.h"
 #include "third-party/easylogging++/easylogging++.h"
 
-INITIALIZE_EASYLOGGINGPP
-
 namespace driver
 {
 	CMotionPoseControllerDriver::CMotionPoseControllerDriver()
 	{
+		LOG(TRACE) << "CMotionPoseControllerDriver()";
+
 		m_unObjectId = vr::k_unTrackedDeviceIndexInvalid;
 		m_ulPropertyContainer = vr::k_ulInvalidPropertyContainer;
 
-		m_sSerialNumber = "MotionPoseVirtualController 0.2.1";
+		m_sSerialNumber = "MotionPoseVirtualController 0.2.2";
 		m_sModelNumber = "MotionPoseVirtualController";
 
 		rigYawOffset = 0;
@@ -34,12 +34,12 @@ namespace driver
 
 	CMotionPoseControllerDriver::~CMotionPoseControllerDriver()
 	{
+		LOG(TRACE) << "~CMotionPoseControllerDriver()";
 	}
 
 	vr::EVRInitError CMotionPoseControllerDriver::Activate(vr::TrackedDeviceIndex_t unObjectId)
 	{
-		init_logging();
-		LOG(INFO) << "Activate motionPoseController\n";
+		LOG(INFO) << "Activate motionPoseController";
 
 		m_unObjectId = unObjectId;
 		m_ulPropertyContainer = vr::VRProperties()->TrackedDeviceToPropertyContainer(m_unObjectId);
@@ -56,21 +56,6 @@ namespace driver
 		return vr::VRInitError_None;
 	}
 
-	void CMotionPoseControllerDriver::init_logging()
-	{
-		el::Loggers::addFlag(el::LoggingFlag::DisableApplicationAbortOnFatalLog);
-		el::Configurations conf(logConfigFileName);
-		conf.parseFromText(logConfigDefault);
-		//conf.parseFromFile(logConfigFileName);
-		conf.setRemainingToDefault();
-		el::Loggers::reconfigureAllLoggers(conf);
-
-		LOG(INFO) << "|========================================================================================|";
-		LOG(INFO) << "motionPose dll loaded...";
-		LOG(TRACE) << "Trace messages enabled.";
-		LOG(DEBUG) << "Debug messages enabled.";
-	}
-
 	bool CMotionPoseControllerDriver::openMmf(HANDLE& MapFile, char*& mmfFile, LPCWSTR szName, int BufferSize, bool& Connected)
 	{
 		MapFile = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, szName);
@@ -92,6 +77,8 @@ namespace driver
 
 		Connected = true;
 
+		LOG(INFO) << "Successfully connected to " << szName;
+
 		return true;
 	}
 
@@ -159,14 +146,12 @@ namespace driver
 			_pose.shouldApplyHeadModel = false;
 			_pose.willDriftInYaw = false;
 
-			vr::HmdQuaternion_t yaw = vrmath::quaternionFromRotationY(rigYawOffset);
-
 			// Create connection to OVRMC
 			if (!_ovrmcConnected)
 			{
 				if (openMmf(MapFile_OVRMC, mmfFile_OVRMC, L"Local\\OVRMC_MMFv1", 4096, _ovrmcConnected))
 				{
-					Data_OVRMC = (MMFstruct_OVRMC_v1*)mmfFile_OVRMC;
+					Data_OVRMC = (MMFstruct_OVRMC_v1*)mmfFile_OVRMC;					
 				}			
 			}
 			else if (Data_OVRMC != nullptr)
@@ -210,6 +195,7 @@ namespace driver
 				_pose.poseIsValid = true;
 				_pose.result = vr::TrackingResult_Running_OK;
 			}
+
 			return _pose;
 		}
 		__except (GetExceptionCode() == EXCEPTION_IN_PAGE_ERROR ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH)
@@ -220,9 +206,11 @@ namespace driver
 
 	void CMotionPoseControllerDriver::RunFrame()
 	{
+		vr::DriverPose_t newPose;
+
 		try
 		{
-			GetPose();
+			newPose = GetPose();
 		}
 		catch (std::exception& e)
 		{			
@@ -245,11 +233,11 @@ namespace driver
 			_ovrmcConnected = false;
 
 			// Declare pose as invalid
-			_pose.poseIsValid = false;
-			_pose.result = vr::TrackingResult_Calibrating_InProgress;
+			newPose.poseIsValid = false;
+			newPose.result = vr::TrackingResult_Calibrating_InProgress;
 		}
 
-		vr::VRServerDriverHost()->TrackedDevicePoseUpdated(m_unObjectId, _pose, sizeof(vr::DriverPose_t));
+		vr::VRServerDriverHost()->TrackedDevicePoseUpdated(m_unObjectId, newPose, sizeof(vr::DriverPose_t));
 
 	}
 };
diff --git a/motionPose/MotionPoseController.h b/motionPose/MotionPoseController.h
@@ -61,21 +61,6 @@ namespace driver
 		MMFstruct_OVRMC_v1* Data_OVRMC = nullptr;
 		bool _ovrmcConnected = false;
 
-		// easylogging++ settings
-		const char* logConfigFileName = "logging.conf";
-
-		const char* logConfigDefault =
-			"* GLOBAL:\n"
-			"	FORMAT = \"[%level] %datetime{%Y-%M-%d %H:%m:%s}: %msg\"\n"
-			"	FILENAME = \"driver_motionpose.log\"\n"
-			"	ENABLED = true\n"
-			"	TO_FILE = true\n"
-			"	TO_STANDARD_OUTPUT = true\n"
-			"	MAX_LOG_FILE_SIZE = 2097152 ## 2MB\n"
-			"* TRACE:\n"
-			"	ENABLED = false\n"
-			"* DEBUG:\n"
-			"	ENABLED = true\n";
 
 	public:
 		CMotionPoseControllerDriver();
@@ -93,8 +78,6 @@ namespace driver
 
 		virtual vr::EVRInitError Activate(vr::TrackedDeviceIndex_t unObjectId);
 
-		void init_logging();
-
 		bool openMmf(HANDLE& MapFile, char*& mmfFile, LPCWSTR szName, int BufferSize, bool& Connected);
 
 		virtual void Deactivate();

diff --git a/motionPose/ServerDriver.cpp b/motionPose/ServerDriver.cpp
@@ -6,7 +6,6 @@
 vr::EVRInitError CServerDriver_MotionPose::Init(vr::IVRDriverContext* pDriverContext)
 {
 	VR_INIT_SERVER_DRIVER_CONTEXT(pDriverContext);
-	InitDriverLog(vr::VRDriverLog());
 
 	m_pController = new driver::CMotionPoseControllerDriver();
 	vr::VRServerDriverHost()->TrackedDeviceAdded(m_pController->GetSerialNumber().c_str(), vr::TrackedDeviceClass_Controller, m_pController);
@@ -16,7 +15,6 @@ vr::EVRInitError CServerDriver_MotionPose::Init(vr::IVRDriverContext* pDriverCon
 
 void CServerDriver_MotionPose::Cleanup()
 {
-	CleanupDriverLog();
 	delete m_pController;
 	m_pController = NULL;
 }

diff --git a/motionPose/ServerDriver.h b/motionPose/ServerDriver.h
@@ -3,7 +3,6 @@
 #include "openvr_driver.h"
 //#include "WatchdogProvider.h"
 #include "openvr_math.h"
-#include "driverlog.h"
 #include "MotionPoseController.h"
 
 class CServerDriver_MotionPose : public vr::IServerTrackedDeviceProvider

diff --git a/motionPose/dllmain.cpp b/motionPose/dllmain.cpp
@@ -0,0 +1,47 @@
+#include "logging.h"
+
+const char* logConfigFileName = "logging.conf";
+
+const char* logConfigDefault =
+"* GLOBAL:\n"
+"	FORMAT = \"[%level] %datetime{%Y-%M-%d %H:%m:%s}: %msg\"\n"
+"	FILENAME = \"driver_motionpose.log\"\n"
+"	ENABLED = true\n"
+"	TO_FILE = true\n"
+"	TO_STANDARD_OUTPUT = true\n"
+"	MAX_LOG_FILE_SIZE = 2097152 ## 2MB\n"
+"* TRACE:\n"
+"	ENABLED = true\n"
+"* DEBUG:\n"
+"	ENABLED = true\n";
+
+INITIALIZE_EASYLOGGINGPP
+
+void init_logging()
+{
+	el::Loggers::addFlag(el::LoggingFlag::DisableApplicationAbortOnFatalLog);
+	el::Configurations conf(logConfigFileName);
+	conf.parseFromText(logConfigDefault);
+	//conf.parseFromFile(logConfigFileName);
+	conf.setRemainingToDefault();
+	el::Loggers::reconfigureAllLoggers(conf);	
+}
+
+BOOL APIENTRY DllMain(HMODULE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+{
+	switch (fdwReason)
+	{
+	case DLL_PROCESS_ATTACH:
+		init_logging();
+		LOG(INFO) << "|========================================================================================|";
+		LOG(INFO) << "motionPose dll loaded...";
+		LOG(TRACE) << "Trace messages enabled.";
+		LOG(DEBUG) << "Debug messages enabled.";
+		break;
+	case DLL_THREAD_ATTACH:
+	case DLL_THREAD_DETACH:
+	case DLL_PROCESS_DETACH:
+		break;
+	};
+	return TRUE;
+}
diff --git a/motionPose/driverlog.cpp b/motionPose/driverlog.cpp
diff --git a/motionPose/driverlog.h b/motionPose/driverlog.h
diff --git a/motionPose/logging.h b/motionPose/logging.h
@@ -0,0 +1,14 @@
+#pragma once
+
+// easylogging includes
+#ifdef NDEBUG
+#undef NDEBUG
+#define ELPP_THREAD_SAFE
+#define ELPP_NO_DEFAULT_LOG_FILE
+#include <easylogging++.h>
+#define NDEBUG
+#else
+#define ELPP_THREAD_SAFE
+#define ELPP_NO_DEFAULT_LOG_FILE
+#include <easylogging++.h>
+#endif
diff --git a/motionPose/motionPose.vcxproj b/motionPose/motionPose.vcxproj
@@ -19,15 +19,15 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="dllmain.cpp" />
     <ClCompile Include="driver_motionPose.cpp" />
-    <ClCompile Include="driverlog.cpp" />
     <ClCompile Include="MotionPoseController.cpp" />
     <ClCompile Include="ServerDriver.cpp" />
     <ClCompile Include="WatchdogProvider.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="driver_motionPose.h" />
-    <ClInclude Include="driverlog.h" />
+    <ClInclude Include="logging.h" />
     <ClInclude Include="MotionPoseController.h" />
     <ClInclude Include="ServerDriver.h" />
     <ClInclude Include="openvr_math.h" />

diff --git a/motionPose/motionPose.vcxproj.filters b/motionPose/motionPose.vcxproj.filters
@@ -15,9 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="driverlog.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="WatchdogProvider.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -30,11 +27,11 @@
     <ClCompile Include="MotionPoseController.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="dllmain.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="driverlog.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
     <ClInclude Include="openvr_math.h">
       <Filter>Source Files</Filter>
     </ClInclude>
@@ -50,5 +47,8 @@
     <ClInclude Include="MotionPoseController.h">
       <Filter>Source Files</Filter>
     </ClInclude>
+    <ClInclude Include="logging.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/motionPose/openvr b/motionPose/openvr
+1 −1		README.md
+ −		bin/linux32/libopenvr_api.so
+ −		bin/linux32/libopenvr_api.so.dbg
+ −		bin/linux64/libopenvr_api.so
+ −		bin/linux64/libopenvr_api.so.dbg
+ −		bin/linuxarm64/libopenvr_api.so
+ −		bin/linuxarm64/libopenvr_api.so.dbg
+ −		bin/linuxarm64/libopenvr_api_unity.so
+ −		bin/linuxarm64/libopenvr_api_unity.so.dbg
+0 −20		bin/osx32/libopenvr_api.dylib.dSYM/Contents/Info.plist
+0 −1		bin/osx64/OpenVR.framework/Headers
+0 −1		bin/osx64/OpenVR.framework/OpenVR
+0 −1		bin/osx64/OpenVR.framework/Resources
+0 −3,777		bin/osx64/OpenVR.framework/Versions/A/Headers/openvr.h
+0 −5,052		bin/osx64/OpenVR.framework/Versions/A/Headers/openvr_api.cs
+0 −3,923		bin/osx64/OpenVR.framework/Versions/A/Headers/openvr_api.json
+0 −1,942		bin/osx64/OpenVR.framework/Versions/A/Headers/openvr_capi.h
+0 −2,695		bin/osx64/OpenVR.framework/Versions/A/Headers/openvr_driver.h
+ −		bin/osx64/OpenVR.framework/Versions/A/OpenVR
+0 −18		bin/osx64/OpenVR.framework/Versions/A/Resources/Info.plist
+0 −1		bin/osx64/OpenVR.framework/Versions/Current
+ −		bin/win32/openvr_api.dll
+ −		bin/win32/openvr_api.dll.sig
+ −		bin/win32/openvr_api.pdb
+ −		bin/win64/openvr_api.dll
+ −		bin/win64/openvr_api.dll.sig
+ −		bin/win64/openvr_api.pdb
+26 −20		headers/openvr.h
+40 −15		headers/openvr_api.cs
+24 −11		headers/openvr_api.json
+25 −7		headers/openvr_capi.h
+49 −24		headers/openvr_driver.h
+ −		lib/linux32/libopenvr_api.so
+ −		lib/linux64/libopenvr_api.so
+ −		lib/linuxarm64/libopenvr_api.so
+ −		lib/linuxarm64/libopenvr_api_unity.so
+ −		samples/bin/linux32/libopenvr_api.so
+ −		samples/bin/linux64/libopenvr_api.so
+ −		samples/bin/linuxarm64/libopenvr_api.so
+ −		samples/bin/osx32/libopenvr_api.dylib
+ −		samples/bin/win32/openvr_api.dll
+ −		samples/bin/win64/openvr_api.dll
+23 −3		src/vrcommon/sharedlibtools_public.cpp
+3 −1		src/vrcommon/sharedlibtools_public.h
+6 −0		src/vrcommon/strtools_public.cpp