Update samples

Author: r57zone

C++/GetData/GetData/GetData.cpp

@@ -82,7 +82,7 @@ int main()
 	//Read parameters from registry
 	CRegKey key;
 	TCHAR libPath[MAX_PATH];
-	DWORD ScreenIndex, ScreenControl, UserWidth, UserHeight, Scale, RenderWidth, RenderHeight;
+	DWORD ScreenIndex, ScreenControl, RenderWidth, RenderHeight;
 
 	LONG status = key.Open(HKEY_CURRENT_USER, _T("Software\\TrueOpenVR"));
 	if (status == ERROR_SUCCESS)
@@ -104,9 +104,6 @@ int main()
 		key.QueryDWORDValue(_T("ScreenIndex"), ScreenIndex);
 		key.QueryDWORDValue(_T("ScreenControl"), ScreenControl);
 		ScreenIndex -= 1;
-		key.QueryDWORDValue(_T("UserWidth"), UserWidth);
-		key.QueryDWORDValue(_T("UserHeight"), UserHeight);
-		key.QueryDWORDValue(_T("Scale"), Scale);
 		key.QueryDWORDValue(_T("RenderWidth"), RenderWidth);
 		key.QueryDWORDValue(_T("RenderHeight"), RenderHeight);
 	}
@@ -185,14 +182,16 @@ int main()
 
 	DWORD Result;
 
+	Sleep(100);
+
 	//Get data
 	while (true) {
 		system("cls");
 
 		printf("Window parameters\r\nWidth=%d, Height=%d, Left=%d, ", DevMode.dmPelsWidth, DevMode.dmPelsHeight, DevMode.dmPosition);
-		printf("UserWidth=%d, UserHeight=%d,\r\nScale=%d, ", UserWidth, UserHeight, Scale);
-		printf("RenderWidth=%d, RenderHeight=%d, ", RenderWidth, RenderHeight);
-		printf("Refresh rate=%d\r\n\r\n", DevMode.dmDisplayFrequency);
+		printf("Refresh rate=%d\r\n", DevMode.dmDisplayFrequency);
+		printf("RenderWidth=%d, RenderHeight=%d\r\n\r\n", RenderWidth, RenderHeight);
+		
 
 		Result = GetHMDData(&myHMD);
 		if (Result) { 
@@ -239,7 +238,7 @@ int main()
 		printf("\r\nHotkeys\r\n\HMD centring\t\tCTRL + ALT + R\r\nController 1 centring\tCTRL + ALT + 1\r\nController 2 centring\tCTRL + ALT + 2\r\nController feedback\tCTRL + ALT + 3\r\nExit\t\t\tESC\r\n");
 
 
-		if ((GetAsyncKeyState(VK_ESCAPE) & 0x8000) != 0) break;
+		if ((GetAsyncKeyState(VK_ESCAPE) & 0x8000) != 0 || (GetAsyncKeyState(VK_RETURN) & 0x8000)) break;
 
 		//Centring
 		if ((GetAsyncKeyState(VK_CONTROL) & 0x8000) != 0 && (GetAsyncKeyState(VK_MENU) & 0x8000) != 0 && (GetAsyncKeyState(82) & 0x8000) != 0) //HMD - CTRL + ALT + R 

Delphi/Get data/Unit1.dfm

@@ -4,7 +4,7 @@ object Main: TMain
   BorderIcons = [biSystemMenu]
   BorderStyle = bsSingle
   Caption = 'TrueOpenVR Get Data'
-  ClientHeight = 345
+  ClientHeight = 322
   ClientWidth = 583
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
@@ -20,15 +20,15 @@ object Main: TMain
   TextHeight = 13
   object AboutLbl: TLabel
     Left = 400
-    Top = 312
+    Top = 288
     Width = 30
     Height = 13
     Alignment = taCenter
     Caption = 'TOVR'
   end
   object GetBtn: TButton
     Left = 8
-    Top = 312
+    Top = 288
     Width = 75
     Height = 25
     Caption = 'Get'
@@ -39,7 +39,7 @@ object Main: TMain
     Left = 8
     Top = 8
     Width = 185
-    Height = 289
+    Height = 265
     Caption = 'HMD'
     TabOrder = 4
     object ScrIndLbl: TLabel
@@ -49,23 +49,16 @@ object Main: TMain
       Height = 13
       Caption = 'Screen index = 0'
     end
-    object ScaleLbl: TLabel
+    object IPDLbl: TLabel
       Left = 8
       Top = 216
-      Width = 61
-      Height = 13
-      Caption = 'Scale = false'
-    end
-    object UserResLbl: TLabel
-      Left = 8
-      Top = 240
-      Width = 105
+      Width = 36
       Height = 13
-      Caption = 'User resolution = 0 x 0'
+      Caption = 'IPD = 0'
     end
     object RndResLbl: TLabel
       Left = 8
-      Top = 264
+      Top = 240
       Width = 118
       Height = 13
       Caption = 'Render resolution = 0 x 0'
@@ -133,7 +126,7 @@ object Main: TMain
     Left = 200
     Top = 8
     Width = 185
-    Height = 289
+    Height = 265
     Caption = 'Controller 1'
     TabOrder = 5
     object CtrlXLbl: TLabel
@@ -209,7 +202,7 @@ object Main: TMain
   end
   object CloseBtn: TButton
     Left = 248
-    Top = 312
+    Top = 288
     Width = 75
     Height = 25
     Caption = 'Close'
@@ -220,7 +213,7 @@ object Main: TMain
     Left = 392
     Top = 7
     Width = 185
-    Height = 290
+    Height = 266
     Caption = 'Controller 2'
     TabOrder = 6
     object Ctrl2XLbl: TLabel
@@ -296,7 +289,7 @@ object Main: TMain
   end
   object CentringBtn: TButton
     Left = 88
-    Top = 312
+    Top = 288
     Width = 75
     Height = 25
     Caption = 'Centring'
@@ -305,7 +298,7 @@ object Main: TMain
   end
   object FeedbackBtn: TButton
     Left = 168
-    Top = 312
+    Top = 288
     Width = 75
     Height = 25
     Caption = 'Feedback'

Delphi/Get data/Unit1.pas

@@ -22,8 +22,7 @@   TMain = class(TForm)
     hmdPitchLbl: TLabel;
     hmdRollLbl: TLabel;
     ScrIndLbl: TLabel;
-    ScaleLbl: TLabel;
-    UserResLbl: TLabel;
+    IPDLbl: TLabel;
     CtrlXLbl: TLabel;
     CtrlYLbl: TLabel;
     CtrlZLbl: TLabel;
@@ -69,7 +68,7 @@   _HMDData = record
     X: double;
     Y: double;
     Z: double;
-    Yaw: double;
+    Yaw: real;
     Pitch: double;
     Roll: double;
 end;
@@ -166,18 +165,9 @@ procedure TMain.GetRegValues;
     ScrIndLbl.Caption:='Screen index = ' + IntToStr(ScreenIndex);
     ScreenIndex:=ScreenIndex - 1;
     ScreenControl:=Reg.ReadBool('ScreenControl');
-
-    if Reg.ReadBool('Scale') = false then
-      ScaleLbl.Caption:='Scale = false'
-    else
-      ScaleLbl.Caption:='Scale = true';
-    UserResLbl.Caption:='User resolution = ' + IntToStr(Reg.ReadInteger('UserWidth')) + ' x ' + IntToStr(Reg.ReadInteger('UserHeight'));
+    IPDLbl.Caption:='IPD = ' + FloatToStr(Reg.ReadFloat('IPD'));
     RndResLbl.Caption:='Render resolution = ' + IntToStr(Reg.ReadInteger('RenderWidth')) + ' x ' + IntToStr(Reg.ReadInteger('RenderHeight'));
   except
-    ScrIndLbl.Caption:='Screen index = 1';
-    ScaleLbl.Caption:='Scale = true';
-    UserResLbl.Caption:='User resolution = 1280 x 720';
-    RndResLbl.Caption:='Render resolution = 1280 x 720';
   end;
 
   Reg.CloseKey;