HMD Assistant improvement: self enabled & disabled display voids and fixes

Author: r57zone

HMDAssistant/Unit1.pas

@@ -65,7 +65,7 @@   TMain = class(TForm)
   ConfigPath, EditorPath: string;
   HMDMonitor: integer;
   MaxResolution, MiddleResolution, LowResolution: string;
-  ActivateExtendedMode, SetMaxResolution, CloneModeAfterTurnOff, CloseSteamVRAfterTurnOff: boolean;
+  ActivateExtendedMode, SetMaxResolution, CloseSteamVRAfterTurnOff: boolean;
 
   IDS_RUN, IDS_STOP, IDS_CHANGE_RES, ID_ABOUT_TITLE, ID_LAST_UPDATE: string;
 
@@ -74,11 +74,47 @@ implementation
 {$R *.dfm}
 
 const
-SDC_TOPOLOGY_CLONE = $00000002;
-SDC_TOPOLOGY_EXTEND = $00000004;
-SDC_APPLY = $00000080;
+  SDC_TOPOLOGY_CLONE = $00000002;
+  SDC_TOPOLOGY_EXTEND = $00000004;
+  SDC_APPLY = $00000080;
+
+  EDD_GET_DEVICE_INTERFACE_NAME = 1;
+  ENUM_REGISTRY_SETTINGS = DWORD(-2);
+
 function SetDisplayConfig(numPathArrayElements: integer; pathArray: PDISPLAYCONFIG_PATH_INFO; numModeInfoArrayElements: integer; modeInfoArray: PDISPLAYCONFIG_MODE_INFO; flags: integer): longint; stdcall; external 'user32.dll'; // taken from https://github.com/CMCHTPC/WindowsAPI/blob/master/Units/Win32.WinUser.pas
 
+procedure DisplayEnable(dwIndex: integer);
+var
+  Display: TDisplayDevice;
+  DevMode: TDevMode;
+begin
+  Display.cb:=SizeOf(TDisplayDevice);
+  EnumDisplayDevices(nil, dwIndex, Display, EDD_GET_DEVICE_INTERFACE_NAME);
+  EnumDisplaySettings(PChar(@Display.DeviceName[0]), ENUM_REGISTRY_SETTINGS, DevMode);
+  DevMode.dmFields:=DM_BITSPERPEL or DM_PELSWIDTH or DM_PELSHEIGHT or DM_DISPLAYFREQUENCY or DM_DISPLAYFLAGS or DM_POSITION;
+  if (Display.StateFlags and DISPLAY_DEVICE_PRIMARY_DEVICE) <> DISPLAY_DEVICE_PRIMARY_DEVICE then begin
+    ChangeDisplaySettingsEx(PChar(@Display.DeviceName[0]), DevMode, 0, CDS_UPDATEREGISTRY or CDS_NORESET, nil);
+    ChangeDisplaySettingsEx(nil, PDevMode(nil)^, 0, 0, nil);
+  end;
+end;
+
+procedure DisplayDisable(dwIndex: integer);
+var
+  Display: TDisplayDevice;
+  DevMode: TDevMode;
+begin
+  Display.cb:=SizeOf(TDisplayDevice);
+  EnumDisplayDevices(nil, dwIndex, Display, EDD_GET_DEVICE_INTERFACE_NAME);
+  ZeroMemory(@DevMode, SizeOf(TDevMode));
+  DevMode.dmSize:=SizeOf(TDevMode);
+  DevMode.dmBitsPerPel:=32;
+  DevMode.dmFields:=DM_BITSPERPEL or DM_PELSWIDTH or DM_PELSHEIGHT or DM_DISPLAYFREQUENCY or DM_DISPLAYFLAGS or DM_POSITION;
+  if (Display.StateFlags and DISPLAY_DEVICE_PRIMARY_DEVICE) <> DISPLAY_DEVICE_PRIMARY_DEVICE then begin
+    ChangeDisplaySettingsEx(PChar(@Display.DeviceName[0]), DevMode, 0, CDS_UPDATEREGISTRY or CDS_NORESET, nil);
+    ChangeDisplaySettingsEx(nil, PDevMode(nil)^, 0, 0, nil);
+  end;
+end;
+
 procedure Tray(ActInd: integer);  //1 - Add, 2 - Update, 3 - Remove
 var
   NIM: TNotifyIconData;
@@ -139,7 +175,6 @@ procedure TMain.FormCreate(Sender: TObject);
   LowResBtn.Caption:=LowResolution;
   SetMaxResolution:=Ini.ReadBool('Main', 'SetMaxResolution', false);
   ActivateExtendedMode:=Ini.ReadBool('Main', 'ActivateExtendedMode', false);
-  CloneModeAfterTurnOff:=Ini.ReadBool('Main', 'CloneModeAfterTurnOff', false);
   CloseSteamVRAfterTurnOff:=Ini.ReadBool('Main', 'CloseSteamVRAfterTurnOff', true);
   Ini.Free;
   WM_TASKBARCREATED:=RegisterWindowMessage('TaskbarCreated');
@@ -207,17 +242,17 @@ procedure TMain.RunStopBtnClick(Sender: TObject);
   if EnabledIcon = false then begin
     EnabledIcon:=true;
     RunStopBtn.Caption:=IDS_STOP;
-    ShellExecute(Handle, 'open', PChar(ExtractFilePath(ParamStr(0)) + 'MultiMonitorTool.exe'), PChar('/enable \\.\DISPLAY' + IntToStr(HMDMonitor)), nil, SW_HIDE);
+    //ShellExecute(Handle, 'open', PChar(ExtractFilePath(ParamStr(0)) + 'MultiMonitorTool.exe'), PChar('/enable \\.\DISPLAY' + IntToStr(HMDMonitor)), nil, SW_HIDE);
+    DisplayEnable(HMDMonitor - 1);
     if ActivateExtendedMode then
       ExtendedBtn.Click;
     if SetMaxResolution then
       ShellExecute(Handle, 'open', PChar(ExtractFilePath(ParamStr(0)) + 'MultiMonitorTool.exe'), PChar('/setmax  \\.\DISPLAY' + IntToStr(HMDMonitor)), nil, SW_HIDE);
   end else begin
     EnabledIcon:=false;
     RunStopBtn.Caption:=IDS_RUN;
-    if CloneModeAfterTurnOff then
-      CloneBtn.Click;
-    ShellExecute(Handle, 'open', PChar(ExtractFilePath(ParamStr(0)) + 'MultiMonitorTool.exe'), PChar('/disable \\.\DISPLAY' + IntToStr(HMDMonitor)), nil, SW_HIDE);
+    DisplayDisable(HMDMonitor - 1);
+    //ShellExecute(Handle, 'open', PChar(ExtractFilePath(ParamStr(0)) + 'MultiMonitorTool.exe'), PChar('/disable \\.\DISPLAY' + IntToStr(HMDMonitor)), nil, SW_HIDE);
     if CloseSteamVRAfterTurnOff then begin
       WinExec('taskkill /f /im vrserver.exe', SW_HIDE);
       WinExec('taskkill /f /im vrcompositor.exe', SW_HIDE);
@@ -293,8 +328,8 @@ procedure TMain.ExtendedBtnClick(Sender: TObject);
 
 procedure TMain.AboutBtnClick(Sender: TObject);
 begin
-  Application.MessageBox(PChar(Main.Caption + ' 1.2' + #13#10 +
-  ID_LAST_UPDATE + ' 19.10.2022' + #13#10 +
+  Application.MessageBox(PChar(Main.Caption + ' 1.3' + #13#10 +
+  ID_LAST_UPDATE + ' 01.11.2022' + #13#10 +
   'https://r57zone.github.io' + #13#10 +
   '[email protected]'), PChar(ID_ABOUT_TITLE), MB_ICONINFORMATION);
 end;

OpenVR/samples/driver_arduinohmd/driver_arduinohmd.cpp

@@ -380,6 +380,15 @@ class CDeviceDriver : public vr::ITrackedDeviceServerDriver, public vr::IVRDispl
 
 		m_crouchOffset = vr::VRSettings()->GetFloat(k_pch_arduinoHMD_Section, k_pch_arduinoHMD_CrouchOffset_Float);
 
+		vr::VRSettings()->GetString(k_pch_arduinoHMD_Section, "HMDUpKey", buf, sizeof(buf));
+		m_hmdUpKey = KeyNameToKeyCode(buf);
+
+		vr::VRSettings()->GetString(k_pch_arduinoHMD_Section, "HMDDownKey", buf, sizeof(buf));
+		m_hmdDownKey = KeyNameToKeyCode(buf);
+
+		vr::VRSettings()->GetString(k_pch_arduinoHMD_Section, "HMDResetKey", buf, sizeof(buf));
+		m_hmdResetKey = KeyNameToKeyCode(buf);
+
 		//DriverLog( "driver_arduinohmd: Serial Number: %s\n", m_sSerialNumber.c_str() );
 		//DriverLog( "driver_arduinohmd: Model Number: %s\n", m_sModelNumber.c_str() );
 		//DriverLog( "driver_arduinohmd: Window: %d %d %d %d\n", m_nWindowX, m_nWindowY, m_nWindowWidth, m_nWindowHeight );
@@ -608,8 +617,8 @@ class CDeviceDriver : public vr::ITrackedDeviceServerDriver, public vr::IVRDispl
 			if ((GetAsyncKeyState(VK_NUMPAD4) & 0x8000) != 0) fPos[0] -= StepPos;
 			if ((GetAsyncKeyState(VK_NUMPAD6) & 0x8000) != 0) fPos[0] += StepPos;
 
-			if ((GetAsyncKeyState(VK_PRIOR) & 0x8000) != 0) fPos[1] += StepPos;
-			if ((GetAsyncKeyState(VK_NEXT) & 0x8000) != 0) fPos[1] -= StepPos;
+			if ((GetAsyncKeyState(m_hmdDownKey) & 0x8000) != 0) fPos[1] += StepPos;
+			if ((GetAsyncKeyState(m_hmdUpKey) & 0x8000) != 0) fPos[1] -= StepPos;
 
 			// Yaw fixing
 			if ((GetAsyncKeyState(VK_NUMPAD1) & 0x8000) != 0 && yprOffset[0] < 180) yprOffset[0] += StepRot;
@@ -619,7 +628,7 @@ class CDeviceDriver : public vr::ITrackedDeviceServerDriver, public vr::IVRDispl
 			if ((GetAsyncKeyState(VK_NUMPAD7) & 0x8000) != 0 && yprOffset[2] < 180) yprOffset[2] += StepRot;
 			if ((GetAsyncKeyState(VK_NUMPAD9) & 0x8000) != 0 && yprOffset[2] > -180) yprOffset[2] -= StepRot;
 
-			if ((GetAsyncKeyState(VK_SUBTRACT) & 0x8000) != 0)
+			if ((GetAsyncKeyState(m_hmdResetKey) & 0x8000) != 0)
 			{
 				fPos[0] = 0;
 				fPos[1] = 0;
@@ -637,11 +646,10 @@ class CDeviceDriver : public vr::ITrackedDeviceServerDriver, public vr::IVRDispl
 
 			//Set head position tracking
 			pose.vecPosition[0] = fPos[0]; // X
+			pose.vecPosition[1] = fPos[1]; // Z
 
 			if ((GetAsyncKeyState(m_crouchPressKey) & 0x8000) != 0)
-				pose.vecPosition[1] = fPos[1] - m_crouchOffset; // Z
-			else
-				pose.vecPosition[1] = fPos[1]; // Z
+				pose.vecPosition[1] -= m_crouchOffset;
 
 			pose.vecPosition[2] = fPos[2]; // Y
 		}
@@ -693,6 +701,9 @@ class CDeviceDriver : public vr::ITrackedDeviceServerDriver, public vr::IVRDispl
 	int32_t m_crouchPressKey;
 	float m_crouchOffset;
 	int32_t m_centeringKey;
+	int32_t m_hmdUpKey;
+	int32_t m_hmdDownKey;
+	int32_t m_hmdResetKey;
 };
 
 //-----------------------------------------------------------------------------

README.md

@@ -37,7 +37,7 @@ Name | Description
 COMPort | The number of the Arduino COM port can be found in the Devices Manager. Use ports from `1` to `9`, change it in the device properties if necessary.
 CenteringKey | The code of the picture centering key, you can change the key in the configuration file by typing [the desired name code](https://github.com/r57zone/DualShock4-emulator/blob/master/BINDINGS.md)).
 CrouchPressKey | The code of the crouch key, you can change the key in the configuration file by typing [the desired name code](https://github.com/r57zone/DualShock4-emulator/blob/master/BINDINGS.md)). It is necessary for communication with other drivers, for example, using Razer Hydra controllers and using [this driver](https://github.com/r57zone/Razer-Hydra-SteamVR-driver) you can crouch.
-CrouchOffset | The height of the crouch at the touch of a button.
+CrouchOffset | The height of the crouch at the press of a button.
 DistanceBetweenEyes | The distance between stereo images, the larger the closer.
 DistortionK1, DistortionK2 | Lens distortion factors.
 ScreenOffsetX | Horizontal image shift.