From f348b4e6abf9dd172750f659f63d16ddae44bd25 Mon Sep 17 00:00:00 2001 From: Andrew Eikum Date: Tue, 11 Aug 2020 13:24:59 -0500 Subject: [PATCH] vrclient: Generate v1.11.11 support --- vrclient_x64/gen_wrapper.py | 3 +- vrclient_x64/tests/capi_thunks_autogen.c | 96 ++--- vrclient_x64/tests/capi_thunks_autogen.h | 32 +- .../tests/capi_thunks_tests_autogen.c | 124 +++---- vrclient_x64/tests/main_autogen.c | 2 +- ...cppIVRApplications_IVRApplications_007.cpp | 2 +- ...VRChaperoneSetup_IVRChaperoneSetup_006.cpp | 2 +- .../cppIVRChaperone_IVRChaperone_003.cpp | 2 +- .../cppIVRClientCore_IVRClientCore_003.cpp | 2 +- .../cppIVRCompositor_IVRCompositor_026.cpp | 2 +- ...pIVRDriverManager_IVRDriverManager_001.cpp | 2 +- ...ExtendedDisplay_IVRExtendedDisplay_001.cpp | 2 +- .../cppIVRHeadsetView_IVRHeadsetView_001.cpp | 2 +- .../cppIVRIOBuffer_IVRIOBuffer_002.cpp | 2 +- .../vrclient_x64/cppIVRInput_IVRInput_010.cpp | 32 +- .../vrclient_x64/cppIVRInput_IVRInput_010.h | 10 +- ...pIVRNotifications_IVRNotifications_002.cpp | 2 +- .../cppIVROverlayView_IVROverlayView_003.cpp | 4 +- .../cppIVROverlay_IVROverlay_024.cpp | 8 +- .../cppIVROverlay_IVROverlay_024.h | 2 +- ...cppIVRRenderModels_IVRRenderModels_006.cpp | 20 +- .../cppIVRRenderModels_IVRRenderModels_006.h | 8 +- .../cppIVRResources_IVRResources_001.cpp | 2 +- .../cppIVRScreenshots_IVRScreenshots_001.cpp | 2 +- .../cppIVRSettings_IVRSettings_003.cpp | 2 +- .../cppIVRSystem_IVRSystem_021.cpp | 26 +- .../vrclient_x64/cppIVRSystem_IVRSystem_021.h | 8 +- ...pIVRTrackedCamera_IVRTrackedCamera_006.cpp | 20 +- ...cppIVRTrackedCamera_IVRTrackedCamera_006.h | 6 +- vrclient_x64/vrclient_x64/struct_converters.h | 31 ++ .../vrclient_x64/struct_converters_11111.cpp | 335 ++++++++++++++++++ vrclient_x64/vrclient_x64/winIVRInput.c | 10 +- vrclient_x64/vrclient_x64/winIVROverlay.c | 2 +- .../vrclient_x64/winIVRRenderModels.c | 8 +- vrclient_x64/vrclient_x64/winIVRSystem.c | 8 +- .../vrclient_x64/winIVRTrackedCamera.c | 6 +- vrclient_x64/vrclient_x64/win_constructors.h | 4 +- .../vrclient_x64/win_constructors_table.dat | 4 +- vrclient_x64/vrclient_x64/win_destructors.h | 4 +- 39 files changed, 603 insertions(+), 236 deletions(-) create mode 100644 vrclient_x64/vrclient_x64/struct_converters_11111.cpp diff --git a/vrclient_x64/gen_wrapper.py b/vrclient_x64/gen_wrapper.py index 27b08a6f..e3f0dee6 100755 --- a/vrclient_x64/gen_wrapper.py +++ b/vrclient_x64/gen_wrapper.py @@ -5,7 +5,7 @@ from __future__ import print_function -CLANG_PATH='/usr/lib/clang/9.0.1' +CLANG_PATH='/usr/lib/clang/10.0.1' import pprint import sys @@ -14,6 +14,7 @@ import os import re sdk_versions = [ + "v1.11.11", "v1.10.30", "v1.9.16", "v1.8.19", diff --git a/vrclient_x64/tests/capi_thunks_autogen.c b/vrclient_x64/tests/capi_thunks_autogen.c index 21654ede..a20755c1 100644 --- a/vrclient_x64/tests/capi_thunks_autogen.c +++ b/vrclient_x64/tests/capi_thunks_autogen.c @@ -2785,6 +2785,54 @@ bool __thiscall IVRIOBuffer_002_HasReaders(void *_this, IOBufferHandle_t ulBuffe return 0; } +EVRInitError __thiscall IVRClientCore_003_Init(void *_this, EVRApplicationType eApplicationType, const char * pStartupInfo) +{ + push_ptr_parameter(_this); + push_uint32_parameter(eApplicationType); + push_ptr_parameter(pStartupInfo); + return 0; +} + +void __thiscall IVRClientCore_003_Cleanup(void *_this) +{ + push_ptr_parameter(_this); +} + +EVRInitError __thiscall IVRClientCore_003_IsInterfaceVersionValid(void *_this, const char * pchInterfaceVersion) +{ + push_ptr_parameter(_this); + push_ptr_parameter(pchInterfaceVersion); + return 0; +} + +void * __thiscall IVRClientCore_003_GetGenericInterface(void *_this, const char * pchNameAndVersion, EVRInitError * peError) +{ + push_ptr_parameter(_this); + push_ptr_parameter(pchNameAndVersion); + push_ptr_parameter(peError); + return 0; +} + +bool __thiscall IVRClientCore_003_BIsHmdPresent(void *_this) +{ + push_ptr_parameter(_this); + return 0; +} + +const char * __thiscall IVRClientCore_003_GetEnglishStringForHmdError(void *_this, EVRInitError eError) +{ + push_ptr_parameter(_this); + push_uint32_parameter(eError); + return 0; +} + +const char * __thiscall IVRClientCore_003_GetIDForVRInitError(void *_this, EVRInitError eError) +{ + push_ptr_parameter(_this); + push_uint32_parameter(eError); + return 0; +} + uint32_t __thiscall IVRControlPanel_006_undoc1(void *_this) { push_ptr_parameter(_this); @@ -3010,54 +3058,6 @@ vrmb_typeb __thiscall IVRMailbox_001_undoc4(void *_this, vrmb_typea a, char * b, return 0; } -EVRInitError __thiscall IVRClientCore_003_Init(void *_this, EVRApplicationType eApplicationType, const char * pStartupInfo) -{ - push_ptr_parameter(_this); - push_uint32_parameter(eApplicationType); - push_ptr_parameter(pStartupInfo); - return 0; -} - -void __thiscall IVRClientCore_003_Cleanup(void *_this) -{ - push_ptr_parameter(_this); -} - -EVRInitError __thiscall IVRClientCore_003_IsInterfaceVersionValid(void *_this, const char * pchInterfaceVersion) -{ - push_ptr_parameter(_this); - push_ptr_parameter(pchInterfaceVersion); - return 0; -} - -void * __thiscall IVRClientCore_003_GetGenericInterface(void *_this, const char * pchNameAndVersion, EVRInitError * peError) -{ - push_ptr_parameter(_this); - push_ptr_parameter(pchNameAndVersion); - push_ptr_parameter(peError); - return 0; -} - -bool __thiscall IVRClientCore_003_BIsHmdPresent(void *_this) -{ - push_ptr_parameter(_this); - return 0; -} - -const char * __thiscall IVRClientCore_003_GetEnglishStringForHmdError(void *_this, EVRInitError eError) -{ - push_ptr_parameter(_this); - push_uint32_parameter(eError); - return 0; -} - -const char * __thiscall IVRClientCore_003_GetIDForVRInitError(void *_this, EVRInitError eError) -{ - push_ptr_parameter(_this); - push_uint32_parameter(eError); - return 0; -} - void __thiscall IVRCompositor_024_SetTrackingSpace(void *_this, ETrackingUniverseOrigin eOrigin) { push_ptr_parameter(_this); diff --git a/vrclient_x64/tests/capi_thunks_autogen.h b/vrclient_x64/tests/capi_thunks_autogen.h index 3bc0ed64..b9c0a9d7 100644 --- a/vrclient_x64/tests/capi_thunks_autogen.h +++ b/vrclient_x64/tests/capi_thunks_autogen.h @@ -741,6 +741,22 @@ PropertyContainerHandle_t __thiscall IVRIOBuffer_002_PropertyContainer(void *_th bool __thiscall IVRIOBuffer_002_HasReaders(void *_this, IOBufferHandle_t ulBuffer); +void test_capi_thunks_IVRClientCore_003(void); + +EVRInitError __thiscall IVRClientCore_003_Init(void *_this, EVRApplicationType eApplicationType, const char * pStartupInfo); + +void __thiscall IVRClientCore_003_Cleanup(void *_this); + +EVRInitError __thiscall IVRClientCore_003_IsInterfaceVersionValid(void *_this, const char * pchInterfaceVersion); + +void * __thiscall IVRClientCore_003_GetGenericInterface(void *_this, const char * pchNameAndVersion, EVRInitError * peError); + +bool __thiscall IVRClientCore_003_BIsHmdPresent(void *_this); + +const char * __thiscall IVRClientCore_003_GetEnglishStringForHmdError(void *_this, EVRInitError eError); + +const char * __thiscall IVRClientCore_003_GetIDForVRInitError(void *_this, EVRInitError eError); + void test_capi_thunks_IVRControlPanel_006(void); uint32_t __thiscall IVRControlPanel_006_undoc1(void *_this); @@ -809,22 +825,6 @@ vrmb_typeb __thiscall IVRMailbox_001_undoc3(void *_this, vrmb_typea a, const cha vrmb_typeb __thiscall IVRMailbox_001_undoc4(void *_this, vrmb_typea a, char * b, uint32_t c, uint32_t * d); -void test_capi_thunks_IVRClientCore_003(void); - -EVRInitError __thiscall IVRClientCore_003_Init(void *_this, EVRApplicationType eApplicationType, const char * pStartupInfo); - -void __thiscall IVRClientCore_003_Cleanup(void *_this); - -EVRInitError __thiscall IVRClientCore_003_IsInterfaceVersionValid(void *_this, const char * pchInterfaceVersion); - -void * __thiscall IVRClientCore_003_GetGenericInterface(void *_this, const char * pchNameAndVersion, EVRInitError * peError); - -bool __thiscall IVRClientCore_003_BIsHmdPresent(void *_this); - -const char * __thiscall IVRClientCore_003_GetEnglishStringForHmdError(void *_this, EVRInitError eError); - -const char * __thiscall IVRClientCore_003_GetIDForVRInitError(void *_this, EVRInitError eError); - void test_capi_thunks_IVRCompositor_024(void); void __thiscall IVRCompositor_024_SetTrackingSpace(void *_this, ETrackingUniverseOrigin eOrigin); diff --git a/vrclient_x64/tests/capi_thunks_tests_autogen.c b/vrclient_x64/tests/capi_thunks_tests_autogen.c index 08bf83ac..bbb095fc 100644 --- a/vrclient_x64/tests/capi_thunks_tests_autogen.c +++ b/vrclient_x64/tests/capi_thunks_tests_autogen.c @@ -3310,6 +3310,68 @@ void test_capi_thunks_IVRIOBuffer_002(void) VirtualFree(t, 0, MEM_RELEASE); } +void test_capi_thunks_IVRClientCore_003(void) +{ + struct thunk *t = alloc_thunks(1); + + init_thunk(t, this_ptr_value, IVRClientCore_003_Init, 2, FALSE, FALSE); + EVRInitError (__stdcall *capi_IVRClientCore_003_Init)(EVRApplicationType eApplicationType, const char * pStartupInfo) = (void *)t; + + clear_parameters(); + capi_IVRClientCore_003_Init(1, (void *)2); + check_ptr_parameter("IVRClientCore_003_Init", this_ptr_value); + check_uint32_parameter("IVRClientCore_003_Init", 1); + check_ptr_parameter("IVRClientCore_003_Init", (void *)2); + + init_thunk(t, this_ptr_value, IVRClientCore_003_Cleanup, 0, FALSE, FALSE); + void (__stdcall *capi_IVRClientCore_003_Cleanup)() = (void *)t; + + clear_parameters(); + capi_IVRClientCore_003_Cleanup(); + check_ptr_parameter("IVRClientCore_003_Cleanup", this_ptr_value); + + init_thunk(t, this_ptr_value, IVRClientCore_003_IsInterfaceVersionValid, 1, FALSE, FALSE); + EVRInitError (__stdcall *capi_IVRClientCore_003_IsInterfaceVersionValid)(const char * pchInterfaceVersion) = (void *)t; + + clear_parameters(); + capi_IVRClientCore_003_IsInterfaceVersionValid((void *)1); + check_ptr_parameter("IVRClientCore_003_IsInterfaceVersionValid", this_ptr_value); + check_ptr_parameter("IVRClientCore_003_IsInterfaceVersionValid", (void *)1); + + init_thunk(t, this_ptr_value, IVRClientCore_003_GetGenericInterface, 2, FALSE, FALSE); + void * (__stdcall *capi_IVRClientCore_003_GetGenericInterface)(const char * pchNameAndVersion, EVRInitError * peError) = (void *)t; + + clear_parameters(); + capi_IVRClientCore_003_GetGenericInterface((void *)1, (void *)2); + check_ptr_parameter("IVRClientCore_003_GetGenericInterface", this_ptr_value); + check_ptr_parameter("IVRClientCore_003_GetGenericInterface", (void *)1); + check_ptr_parameter("IVRClientCore_003_GetGenericInterface", (void *)2); + + init_thunk(t, this_ptr_value, IVRClientCore_003_BIsHmdPresent, 0, FALSE, FALSE); + bool (__stdcall *capi_IVRClientCore_003_BIsHmdPresent)() = (void *)t; + + clear_parameters(); + capi_IVRClientCore_003_BIsHmdPresent(); + check_ptr_parameter("IVRClientCore_003_BIsHmdPresent", this_ptr_value); + + init_thunk(t, this_ptr_value, IVRClientCore_003_GetEnglishStringForHmdError, 1, FALSE, FALSE); + const char * (__stdcall *capi_IVRClientCore_003_GetEnglishStringForHmdError)(EVRInitError eError) = (void *)t; + + clear_parameters(); + capi_IVRClientCore_003_GetEnglishStringForHmdError(1); + check_ptr_parameter("IVRClientCore_003_GetEnglishStringForHmdError", this_ptr_value); + check_uint32_parameter("IVRClientCore_003_GetEnglishStringForHmdError", 1); + + init_thunk(t, this_ptr_value, IVRClientCore_003_GetIDForVRInitError, 1, FALSE, FALSE); + const char * (__stdcall *capi_IVRClientCore_003_GetIDForVRInitError)(EVRInitError eError) = (void *)t; + + clear_parameters(); + capi_IVRClientCore_003_GetIDForVRInitError(1); + check_ptr_parameter("IVRClientCore_003_GetIDForVRInitError", this_ptr_value); + check_uint32_parameter("IVRClientCore_003_GetIDForVRInitError", 1); + VirtualFree(t, 0, MEM_RELEASE); +} + void test_capi_thunks_IVRControlPanel_006(void) { struct thunk *t = alloc_thunks(1); @@ -3588,68 +3650,6 @@ void test_capi_thunks_IVRMailbox_001(void) VirtualFree(t, 0, MEM_RELEASE); } -void test_capi_thunks_IVRClientCore_003(void) -{ - struct thunk *t = alloc_thunks(1); - - init_thunk(t, this_ptr_value, IVRClientCore_003_Init, 2, FALSE, FALSE); - EVRInitError (__stdcall *capi_IVRClientCore_003_Init)(EVRApplicationType eApplicationType, const char * pStartupInfo) = (void *)t; - - clear_parameters(); - capi_IVRClientCore_003_Init(1, (void *)2); - check_ptr_parameter("IVRClientCore_003_Init", this_ptr_value); - check_uint32_parameter("IVRClientCore_003_Init", 1); - check_ptr_parameter("IVRClientCore_003_Init", (void *)2); - - init_thunk(t, this_ptr_value, IVRClientCore_003_Cleanup, 0, FALSE, FALSE); - void (__stdcall *capi_IVRClientCore_003_Cleanup)() = (void *)t; - - clear_parameters(); - capi_IVRClientCore_003_Cleanup(); - check_ptr_parameter("IVRClientCore_003_Cleanup", this_ptr_value); - - init_thunk(t, this_ptr_value, IVRClientCore_003_IsInterfaceVersionValid, 1, FALSE, FALSE); - EVRInitError (__stdcall *capi_IVRClientCore_003_IsInterfaceVersionValid)(const char * pchInterfaceVersion) = (void *)t; - - clear_parameters(); - capi_IVRClientCore_003_IsInterfaceVersionValid((void *)1); - check_ptr_parameter("IVRClientCore_003_IsInterfaceVersionValid", this_ptr_value); - check_ptr_parameter("IVRClientCore_003_IsInterfaceVersionValid", (void *)1); - - init_thunk(t, this_ptr_value, IVRClientCore_003_GetGenericInterface, 2, FALSE, FALSE); - void * (__stdcall *capi_IVRClientCore_003_GetGenericInterface)(const char * pchNameAndVersion, EVRInitError * peError) = (void *)t; - - clear_parameters(); - capi_IVRClientCore_003_GetGenericInterface((void *)1, (void *)2); - check_ptr_parameter("IVRClientCore_003_GetGenericInterface", this_ptr_value); - check_ptr_parameter("IVRClientCore_003_GetGenericInterface", (void *)1); - check_ptr_parameter("IVRClientCore_003_GetGenericInterface", (void *)2); - - init_thunk(t, this_ptr_value, IVRClientCore_003_BIsHmdPresent, 0, FALSE, FALSE); - bool (__stdcall *capi_IVRClientCore_003_BIsHmdPresent)() = (void *)t; - - clear_parameters(); - capi_IVRClientCore_003_BIsHmdPresent(); - check_ptr_parameter("IVRClientCore_003_BIsHmdPresent", this_ptr_value); - - init_thunk(t, this_ptr_value, IVRClientCore_003_GetEnglishStringForHmdError, 1, FALSE, FALSE); - const char * (__stdcall *capi_IVRClientCore_003_GetEnglishStringForHmdError)(EVRInitError eError) = (void *)t; - - clear_parameters(); - capi_IVRClientCore_003_GetEnglishStringForHmdError(1); - check_ptr_parameter("IVRClientCore_003_GetEnglishStringForHmdError", this_ptr_value); - check_uint32_parameter("IVRClientCore_003_GetEnglishStringForHmdError", 1); - - init_thunk(t, this_ptr_value, IVRClientCore_003_GetIDForVRInitError, 1, FALSE, FALSE); - const char * (__stdcall *capi_IVRClientCore_003_GetIDForVRInitError)(EVRInitError eError) = (void *)t; - - clear_parameters(); - capi_IVRClientCore_003_GetIDForVRInitError(1); - check_ptr_parameter("IVRClientCore_003_GetIDForVRInitError", this_ptr_value); - check_uint32_parameter("IVRClientCore_003_GetIDForVRInitError", 1); - VirtualFree(t, 0, MEM_RELEASE); -} - void test_capi_thunks_IVRCompositor_024(void) { struct thunk *t = alloc_thunks(1); diff --git a/vrclient_x64/tests/main_autogen.c b/vrclient_x64/tests/main_autogen.c index 28a9e936..5c1b5176 100644 --- a/vrclient_x64/tests/main_autogen.c +++ b/vrclient_x64/tests/main_autogen.c @@ -23,9 +23,9 @@ int main(void) test_capi_thunks_IVRDriverManager_001(); test_capi_thunks_IVRInput_010(); test_capi_thunks_IVRIOBuffer_002(); + test_capi_thunks_IVRClientCore_003(); test_capi_thunks_IVRControlPanel_006(); test_capi_thunks_IVRMailbox_001(); - test_capi_thunks_IVRClientCore_003(); test_capi_thunks_IVRCompositor_024(); test_capi_thunks_IVROverlay_022(); test_capi_thunks_IVRInput_007(); diff --git a/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_007.cpp b/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_007.cpp index 2dc6b771..c1cc52eb 100644 --- a/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_007.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_007.cpp @@ -1,6 +1,6 @@ #include "vrclient_private.h" #include "vrclient_defs.h" -#include "openvr_v1.10.30/ivrclientcore.h" +#include "openvr_v1.11.11/ivrclientcore.h" using namespace vr; extern "C" { #include "struct_converters.h" diff --git a/vrclient_x64/vrclient_x64/cppIVRChaperoneSetup_IVRChaperoneSetup_006.cpp b/vrclient_x64/vrclient_x64/cppIVRChaperoneSetup_IVRChaperoneSetup_006.cpp index afff2c89..24f77bd2 100644 --- a/vrclient_x64/vrclient_x64/cppIVRChaperoneSetup_IVRChaperoneSetup_006.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRChaperoneSetup_IVRChaperoneSetup_006.cpp @@ -1,6 +1,6 @@ #include "vrclient_private.h" #include "vrclient_defs.h" -#include "openvr_v1.10.30/ivrclientcore.h" +#include "openvr_v1.11.11/ivrclientcore.h" using namespace vr; extern "C" { #include "struct_converters.h" diff --git a/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_003.cpp b/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_003.cpp index 80e8760b..52abfa20 100644 --- a/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_003.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_003.cpp @@ -1,6 +1,6 @@ #include "vrclient_private.h" #include "vrclient_defs.h" -#include "openvr_v1.10.30/ivrclientcore.h" +#include "openvr_v1.11.11/ivrclientcore.h" using namespace vr; extern "C" { #include "struct_converters.h" diff --git a/vrclient_x64/vrclient_x64/cppIVRClientCore_IVRClientCore_003.cpp b/vrclient_x64/vrclient_x64/cppIVRClientCore_IVRClientCore_003.cpp index 8f7ac265..27f69c6a 100644 --- a/vrclient_x64/vrclient_x64/cppIVRClientCore_IVRClientCore_003.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRClientCore_IVRClientCore_003.cpp @@ -1,6 +1,6 @@ #include "vrclient_private.h" #include "vrclient_defs.h" -#include "openvr_v1.10.30/ivrclientcore.h" +#include "openvr_v1.11.11/ivrclientcore.h" using namespace vr; extern "C" { #include "struct_converters.h" diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_026.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_026.cpp index e1e47ddb..e41cc115 100644 --- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_026.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_026.cpp @@ -1,6 +1,6 @@ #include "vrclient_private.h" #include "vrclient_defs.h" -#include "openvr_v1.10.30/ivrclientcore.h" +#include "openvr_v1.11.11/ivrclientcore.h" using namespace vr; extern "C" { #include "struct_converters.h" diff --git a/vrclient_x64/vrclient_x64/cppIVRDriverManager_IVRDriverManager_001.cpp b/vrclient_x64/vrclient_x64/cppIVRDriverManager_IVRDriverManager_001.cpp index 1b7cc85b..95d705b4 100644 --- a/vrclient_x64/vrclient_x64/cppIVRDriverManager_IVRDriverManager_001.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRDriverManager_IVRDriverManager_001.cpp @@ -1,6 +1,6 @@ #include "vrclient_private.h" #include "vrclient_defs.h" -#include "openvr_v1.10.30/ivrclientcore.h" +#include "openvr_v1.11.11/ivrclientcore.h" using namespace vr; extern "C" { #include "struct_converters.h" diff --git a/vrclient_x64/vrclient_x64/cppIVRExtendedDisplay_IVRExtendedDisplay_001.cpp b/vrclient_x64/vrclient_x64/cppIVRExtendedDisplay_IVRExtendedDisplay_001.cpp index 3b7b9c21..be30e70f 100644 --- a/vrclient_x64/vrclient_x64/cppIVRExtendedDisplay_IVRExtendedDisplay_001.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRExtendedDisplay_IVRExtendedDisplay_001.cpp @@ -1,6 +1,6 @@ #include "vrclient_private.h" #include "vrclient_defs.h" -#include "openvr_v1.10.30/ivrclientcore.h" +#include "openvr_v1.11.11/ivrclientcore.h" using namespace vr; extern "C" { #include "struct_converters.h" diff --git a/vrclient_x64/vrclient_x64/cppIVRHeadsetView_IVRHeadsetView_001.cpp b/vrclient_x64/vrclient_x64/cppIVRHeadsetView_IVRHeadsetView_001.cpp index 9fe049f7..c5ca1cb4 100644 --- a/vrclient_x64/vrclient_x64/cppIVRHeadsetView_IVRHeadsetView_001.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRHeadsetView_IVRHeadsetView_001.cpp @@ -1,6 +1,6 @@ #include "vrclient_private.h" #include "vrclient_defs.h" -#include "openvr_v1.10.30/ivrclientcore.h" +#include "openvr_v1.11.11/ivrclientcore.h" using namespace vr; extern "C" { #include "struct_converters.h" diff --git a/vrclient_x64/vrclient_x64/cppIVRIOBuffer_IVRIOBuffer_002.cpp b/vrclient_x64/vrclient_x64/cppIVRIOBuffer_IVRIOBuffer_002.cpp index 6a2208ce..8c884d67 100644 --- a/vrclient_x64/vrclient_x64/cppIVRIOBuffer_IVRIOBuffer_002.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRIOBuffer_IVRIOBuffer_002.cpp @@ -1,6 +1,6 @@ #include "vrclient_private.h" #include "vrclient_defs.h" -#include "openvr_v1.10.30/ivrclientcore.h" +#include "openvr_v1.11.11/ivrclientcore.h" using namespace vr; extern "C" { #include "struct_converters.h" diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_010.cpp b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_010.cpp index 804c430e..c8447de8 100644 --- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_010.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_010.cpp @@ -1,6 +1,6 @@ #include "vrclient_private.h" #include "vrclient_defs.h" -#include "openvr_v1.10.30/ivrclientcore.h" +#include "openvr_v1.11.11/ivrclientcore.h" using namespace vr; extern "C" { #include "struct_converters.h" @@ -34,63 +34,63 @@ vr::EVRInputError cppIVRInput_IVRInput_010_UpdateActionState(void *linux_side, V return ((IVRInput*)linux_side)->UpdateActionState((vr::VRActiveActionSet_t *)pSets, (uint32_t)unSizeOfVRSelectedActionSet_t, (uint32_t)unSetCount); } -vr::EVRInputError cppIVRInput_IVRInput_010_GetDigitalActionData(void *linux_side, VRActionHandle_t action, winInputDigitalActionData_t_11030 * pActionData, uint32_t unActionDataSize, VRInputValueHandle_t ulRestrictToDevice) +vr::EVRInputError cppIVRInput_IVRInput_010_GetDigitalActionData(void *linux_side, VRActionHandle_t action, winInputDigitalActionData_t_11111 * pActionData, uint32_t unActionDataSize, VRInputValueHandle_t ulRestrictToDevice) { InputDigitalActionData_t lin; vr::EVRInputError _ret; if(pActionData) - struct_InputDigitalActionData_t_11030_win_to_lin(pActionData, &lin); + struct_InputDigitalActionData_t_11111_win_to_lin(pActionData, &lin); _ret = ((IVRInput*)linux_side)->GetDigitalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) - struct_InputDigitalActionData_t_11030_lin_to_win(&lin, pActionData, unActionDataSize); + struct_InputDigitalActionData_t_11111_lin_to_win(&lin, pActionData, unActionDataSize); return _ret; } -vr::EVRInputError cppIVRInput_IVRInput_010_GetAnalogActionData(void *linux_side, VRActionHandle_t action, winInputAnalogActionData_t_11030 * pActionData, uint32_t unActionDataSize, VRInputValueHandle_t ulRestrictToDevice) +vr::EVRInputError cppIVRInput_IVRInput_010_GetAnalogActionData(void *linux_side, VRActionHandle_t action, winInputAnalogActionData_t_11111 * pActionData, uint32_t unActionDataSize, VRInputValueHandle_t ulRestrictToDevice) { InputAnalogActionData_t lin; vr::EVRInputError _ret; if(pActionData) - struct_InputAnalogActionData_t_11030_win_to_lin(pActionData, &lin); + struct_InputAnalogActionData_t_11111_win_to_lin(pActionData, &lin); _ret = ((IVRInput*)linux_side)->GetAnalogActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) - struct_InputAnalogActionData_t_11030_lin_to_win(&lin, pActionData, unActionDataSize); + struct_InputAnalogActionData_t_11111_lin_to_win(&lin, pActionData, unActionDataSize); return _ret; } -vr::EVRInputError cppIVRInput_IVRInput_010_GetPoseActionDataRelativeToNow(void *linux_side, VRActionHandle_t action, ETrackingUniverseOrigin eOrigin, float fPredictedSecondsFromNow, winInputPoseActionData_t_11030 * pActionData, uint32_t unActionDataSize, VRInputValueHandle_t ulRestrictToDevice) +vr::EVRInputError cppIVRInput_IVRInput_010_GetPoseActionDataRelativeToNow(void *linux_side, VRActionHandle_t action, ETrackingUniverseOrigin eOrigin, float fPredictedSecondsFromNow, winInputPoseActionData_t_11111 * pActionData, uint32_t unActionDataSize, VRInputValueHandle_t ulRestrictToDevice) { InputPoseActionData_t lin; vr::EVRInputError _ret; if(pActionData) - struct_InputPoseActionData_t_11030_win_to_lin(pActionData, &lin); + struct_InputPoseActionData_t_11111_win_to_lin(pActionData, &lin); _ret = ((IVRInput*)linux_side)->GetPoseActionDataRelativeToNow((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, (float)fPredictedSecondsFromNow, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) - struct_InputPoseActionData_t_11030_lin_to_win(&lin, pActionData, unActionDataSize); + struct_InputPoseActionData_t_11111_lin_to_win(&lin, pActionData, unActionDataSize); return _ret; } -vr::EVRInputError cppIVRInput_IVRInput_010_GetPoseActionDataForNextFrame(void *linux_side, VRActionHandle_t action, ETrackingUniverseOrigin eOrigin, winInputPoseActionData_t_11030 * pActionData, uint32_t unActionDataSize, VRInputValueHandle_t ulRestrictToDevice) +vr::EVRInputError cppIVRInput_IVRInput_010_GetPoseActionDataForNextFrame(void *linux_side, VRActionHandle_t action, ETrackingUniverseOrigin eOrigin, winInputPoseActionData_t_11111 * pActionData, uint32_t unActionDataSize, VRInputValueHandle_t ulRestrictToDevice) { InputPoseActionData_t lin; vr::EVRInputError _ret; if(pActionData) - struct_InputPoseActionData_t_11030_win_to_lin(pActionData, &lin); + struct_InputPoseActionData_t_11111_win_to_lin(pActionData, &lin); _ret = ((IVRInput*)linux_side)->GetPoseActionDataForNextFrame((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) - struct_InputPoseActionData_t_11030_lin_to_win(&lin, pActionData, unActionDataSize); + struct_InputPoseActionData_t_11111_lin_to_win(&lin, pActionData, unActionDataSize); return _ret; } -vr::EVRInputError cppIVRInput_IVRInput_010_GetSkeletalActionData(void *linux_side, VRActionHandle_t action, winInputSkeletalActionData_t_11030 * pActionData, uint32_t unActionDataSize) +vr::EVRInputError cppIVRInput_IVRInput_010_GetSkeletalActionData(void *linux_side, VRActionHandle_t action, winInputSkeletalActionData_t_11111 * pActionData, uint32_t unActionDataSize) { InputSkeletalActionData_t lin; vr::EVRInputError _ret; if(pActionData) - struct_InputSkeletalActionData_t_11030_win_to_lin(pActionData, &lin); + struct_InputSkeletalActionData_t_11111_win_to_lin(pActionData, &lin); _ret = ((IVRInput*)linux_side)->GetSkeletalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0); if(pActionData) - struct_InputSkeletalActionData_t_11030_lin_to_win(&lin, pActionData, unActionDataSize); + struct_InputSkeletalActionData_t_11111_lin_to_win(&lin, pActionData, unActionDataSize); return _ret; } diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_010.h b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_010.h index 81b10935..8281d056 100644 --- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_010.h +++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_010.h @@ -6,11 +6,11 @@ extern EVRInputError cppIVRInput_IVRInput_010_GetActionSetHandle(void *, const c extern EVRInputError cppIVRInput_IVRInput_010_GetActionHandle(void *, const char *, VRActionHandle_t *); extern EVRInputError cppIVRInput_IVRInput_010_GetInputSourceHandle(void *, const char *, VRInputValueHandle_t *); extern EVRInputError cppIVRInput_IVRInput_010_UpdateActionState(void *, VRActiveActionSet_t *, uint32_t, uint32_t); -extern EVRInputError cppIVRInput_IVRInput_010_GetDigitalActionData(void *, VRActionHandle_t, winInputDigitalActionData_t_11030 *, uint32_t, VRInputValueHandle_t); -extern EVRInputError cppIVRInput_IVRInput_010_GetAnalogActionData(void *, VRActionHandle_t, winInputAnalogActionData_t_11030 *, uint32_t, VRInputValueHandle_t); -extern EVRInputError cppIVRInput_IVRInput_010_GetPoseActionDataRelativeToNow(void *, VRActionHandle_t, ETrackingUniverseOrigin, float, winInputPoseActionData_t_11030 *, uint32_t, VRInputValueHandle_t); -extern EVRInputError cppIVRInput_IVRInput_010_GetPoseActionDataForNextFrame(void *, VRActionHandle_t, ETrackingUniverseOrigin, winInputPoseActionData_t_11030 *, uint32_t, VRInputValueHandle_t); -extern EVRInputError cppIVRInput_IVRInput_010_GetSkeletalActionData(void *, VRActionHandle_t, winInputSkeletalActionData_t_11030 *, uint32_t); +extern EVRInputError cppIVRInput_IVRInput_010_GetDigitalActionData(void *, VRActionHandle_t, winInputDigitalActionData_t_11111 *, uint32_t, VRInputValueHandle_t); +extern EVRInputError cppIVRInput_IVRInput_010_GetAnalogActionData(void *, VRActionHandle_t, winInputAnalogActionData_t_11111 *, uint32_t, VRInputValueHandle_t); +extern EVRInputError cppIVRInput_IVRInput_010_GetPoseActionDataRelativeToNow(void *, VRActionHandle_t, ETrackingUniverseOrigin, float, winInputPoseActionData_t_11111 *, uint32_t, VRInputValueHandle_t); +extern EVRInputError cppIVRInput_IVRInput_010_GetPoseActionDataForNextFrame(void *, VRActionHandle_t, ETrackingUniverseOrigin, winInputPoseActionData_t_11111 *, uint32_t, VRInputValueHandle_t); +extern EVRInputError cppIVRInput_IVRInput_010_GetSkeletalActionData(void *, VRActionHandle_t, winInputSkeletalActionData_t_11111 *, uint32_t); extern EVRInputError cppIVRInput_IVRInput_010_GetDominantHand(void *, ETrackedControllerRole *); extern EVRInputError cppIVRInput_IVRInput_010_SetDominantHand(void *, ETrackedControllerRole); extern EVRInputError cppIVRInput_IVRInput_010_GetBoneCount(void *, VRActionHandle_t, uint32_t *); diff --git a/vrclient_x64/vrclient_x64/cppIVRNotifications_IVRNotifications_002.cpp b/vrclient_x64/vrclient_x64/cppIVRNotifications_IVRNotifications_002.cpp index ba526ec8..9660961f 100644 --- a/vrclient_x64/vrclient_x64/cppIVRNotifications_IVRNotifications_002.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRNotifications_IVRNotifications_002.cpp @@ -1,6 +1,6 @@ #include "vrclient_private.h" #include "vrclient_defs.h" -#include "openvr_v1.10.30/ivrclientcore.h" +#include "openvr_v1.11.11/ivrclientcore.h" using namespace vr; extern "C" { #include "struct_converters.h" diff --git a/vrclient_x64/vrclient_x64/cppIVROverlayView_IVROverlayView_003.cpp b/vrclient_x64/vrclient_x64/cppIVROverlayView_IVROverlayView_003.cpp index 69e46e9a..fef55db0 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlayView_IVROverlayView_003.cpp +++ b/vrclient_x64/vrclient_x64/cppIVROverlayView_IVROverlayView_003.cpp @@ -1,6 +1,6 @@ #include "vrclient_private.h" #include "vrclient_defs.h" -#include "openvr_v1.10.30/ivrclientcore.h" +#include "openvr_v1.11.11/ivrclientcore.h" using namespace vr; extern "C" { #include "struct_converters.h" @@ -23,7 +23,7 @@ void cppIVROverlayView_IVROverlayView_003_PostOverlayEvent(void *linux_side, VRO { VREvent_t lin; if(pvrEvent) - struct_VREvent_t_11030_win_to_lin(pvrEvent, &lin); + struct_VREvent_t_11111_win_to_lin(pvrEvent, &lin); ((IVROverlayView*)linux_side)->PostOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pvrEvent ? &lin : nullptr); } diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_024.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_024.cpp index df1f2e30..9adfa2fd 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_024.cpp +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_024.cpp @@ -1,6 +1,6 @@ #include "vrclient_private.h" #include "vrclient_defs.h" -#include "openvr_v1.10.30/ivrclientcore.h" +#include "openvr_v1.11.11/ivrclientcore.h" using namespace vr; extern "C" { #include "struct_converters.h" @@ -229,15 +229,15 @@ vr::EVROverlayError cppIVROverlay_IVROverlay_024_GetTransformForOverlayCoordinat return ((IVROverlay*)linux_side)->GetTransformForOverlayCoordinates((vr::VROverlayHandle_t)ulOverlayHandle, (vr::ETrackingUniverseOrigin)eTrackingOrigin, (vr::HmdVector2_t)coordinatesInOverlay, (vr::HmdMatrix34_t *)pmatTransform); } -bool cppIVROverlay_IVROverlay_024_PollNextOverlayEvent(void *linux_side, VROverlayHandle_t ulOverlayHandle, winVREvent_t_11030 * pEvent, uint32_t uncbVREvent) +bool cppIVROverlay_IVROverlay_024_PollNextOverlayEvent(void *linux_side, VROverlayHandle_t ulOverlayHandle, winVREvent_t_11111 * pEvent, uint32_t uncbVREvent) { VREvent_t lin; bool _ret; if(pEvent) - struct_VREvent_t_11030_win_to_lin(pEvent, &lin); + struct_VREvent_t_11111_win_to_lin(pEvent, &lin); _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, uncbVREvent ? sizeof(lin) : 0); if(pEvent) - struct_VREvent_t_11030_lin_to_win(&lin, pEvent, uncbVREvent); + struct_VREvent_t_11111_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; } diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_024.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_024.h index 01a92c03..4471cf1a 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_024.h +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_024.h @@ -45,7 +45,7 @@ extern EVROverlayError cppIVROverlay_IVROverlay_024_ShowOverlay(void *, VROverla extern EVROverlayError cppIVROverlay_IVROverlay_024_HideOverlay(void *, VROverlayHandle_t); extern bool cppIVROverlay_IVROverlay_024_IsOverlayVisible(void *, VROverlayHandle_t); extern EVROverlayError cppIVROverlay_IVROverlay_024_GetTransformForOverlayCoordinates(void *, VROverlayHandle_t, ETrackingUniverseOrigin, HmdVector2_t, HmdMatrix34_t *); -extern bool cppIVROverlay_IVROverlay_024_PollNextOverlayEvent(void *, VROverlayHandle_t, winVREvent_t_11030 *, uint32_t); +extern bool cppIVROverlay_IVROverlay_024_PollNextOverlayEvent(void *, VROverlayHandle_t, winVREvent_t_11111 *, uint32_t); extern EVROverlayError cppIVROverlay_IVROverlay_024_GetOverlayInputMethod(void *, VROverlayHandle_t, VROverlayInputMethod *); extern EVROverlayError cppIVROverlay_IVROverlay_024_SetOverlayInputMethod(void *, VROverlayHandle_t, VROverlayInputMethod); extern EVROverlayError cppIVROverlay_IVROverlay_024_GetOverlayMouseScale(void *, VROverlayHandle_t, HmdVector2_t *); diff --git a/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_006.cpp b/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_006.cpp index a531055f..f1c240d5 100644 --- a/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_006.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_006.cpp @@ -1,6 +1,6 @@ #include "vrclient_private.h" #include "vrclient_defs.h" -#include "openvr_v1.10.30/ivrclientcore.h" +#include "openvr_v1.11.11/ivrclientcore.h" using namespace vr; extern "C" { #include "struct_converters.h" @@ -9,34 +9,34 @@ extern "C" { #ifdef __cplusplus extern "C" { #endif -vr::EVRRenderModelError cppIVRRenderModels_IVRRenderModels_006_LoadRenderModel_Async(void *linux_side, const char * pchRenderModelName, winRenderModel_t_11030 ** ppRenderModel) +vr::EVRRenderModelError cppIVRRenderModels_IVRRenderModels_006_LoadRenderModel_Async(void *linux_side, const char * pchRenderModelName, winRenderModel_t_11111 ** ppRenderModel) { RenderModel_t *lin; vr::EVRRenderModelError _ret; _ret = ((IVRRenderModels*)linux_side)->LoadRenderModel_Async((const char *)pchRenderModelName, ppRenderModel ? &lin : nullptr); if(_ret == 0) - *ppRenderModel = struct_RenderModel_t_11030_wrap(lin); + *ppRenderModel = struct_RenderModel_t_11111_wrap(lin); return _ret; } -void cppIVRRenderModels_IVRRenderModels_006_FreeRenderModel(void *linux_side, winRenderModel_t_11030 * pRenderModel) +void cppIVRRenderModels_IVRRenderModels_006_FreeRenderModel(void *linux_side, winRenderModel_t_11111 * pRenderModel) { - ((IVRRenderModels*)linux_side)->FreeRenderModel(struct_RenderModel_t_11030_unwrap(pRenderModel)); + ((IVRRenderModels*)linux_side)->FreeRenderModel(struct_RenderModel_t_11111_unwrap(pRenderModel)); } -vr::EVRRenderModelError cppIVRRenderModels_IVRRenderModels_006_LoadTexture_Async(void *linux_side, TextureID_t textureId, winRenderModel_TextureMap_t_11030 ** ppTexture) +vr::EVRRenderModelError cppIVRRenderModels_IVRRenderModels_006_LoadTexture_Async(void *linux_side, TextureID_t textureId, winRenderModel_TextureMap_t_11111 ** ppTexture) { RenderModel_TextureMap_t *lin; vr::EVRRenderModelError _ret; _ret = ((IVRRenderModels*)linux_side)->LoadTexture_Async((vr::TextureID_t)textureId, ppTexture ? &lin : nullptr); if(_ret == 0) - *ppTexture = struct_RenderModel_TextureMap_t_11030_wrap(lin); + *ppTexture = struct_RenderModel_TextureMap_t_11111_wrap(lin); return _ret; } -void cppIVRRenderModels_IVRRenderModels_006_FreeTexture(void *linux_side, winRenderModel_TextureMap_t_11030 * pTexture) +void cppIVRRenderModels_IVRRenderModels_006_FreeTexture(void *linux_side, winRenderModel_TextureMap_t_11111 * pTexture) { - ((IVRRenderModels*)linux_side)->FreeTexture(struct_RenderModel_TextureMap_t_11030_unwrap(pTexture)); + ((IVRRenderModels*)linux_side)->FreeTexture(struct_RenderModel_TextureMap_t_11111_unwrap(pTexture)); } vr::EVRRenderModelError cppIVRRenderModels_IVRRenderModels_006_LoadTextureD3D11_Async(void *linux_side, TextureID_t textureId, void * pD3D11Device, void ** ppD3D11Texture2D) @@ -94,7 +94,7 @@ bool cppIVRRenderModels_IVRRenderModels_006_GetComponentState(void *linux_side, VRControllerState001_t lin; bool _ret; if(pControllerState) - struct_VRControllerState001_t_11030_win_to_lin(pControllerState, &lin); + struct_VRControllerState001_t_11111_win_to_lin(pControllerState, &lin); _ret = ((IVRRenderModels*)linux_side)->GetComponentState((const char *)pchRenderModelName, (const char *)pchComponentName, pControllerState ? &lin : nullptr, (const vr::RenderModel_ControllerMode_State_t *)pState, (vr::RenderModel_ComponentState_t *)pComponentState); return _ret; } diff --git a/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_006.h b/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_006.h index 4319c731..45541ff2 100644 --- a/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_006.h +++ b/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_006.h @@ -1,10 +1,10 @@ #ifdef __cplusplus extern "C" { #endif -extern EVRRenderModelError cppIVRRenderModels_IVRRenderModels_006_LoadRenderModel_Async(void *, const char *, winRenderModel_t_11030 **); -extern void cppIVRRenderModels_IVRRenderModels_006_FreeRenderModel(void *, winRenderModel_t_11030 *); -extern EVRRenderModelError cppIVRRenderModels_IVRRenderModels_006_LoadTexture_Async(void *, TextureID_t, winRenderModel_TextureMap_t_11030 **); -extern void cppIVRRenderModels_IVRRenderModels_006_FreeTexture(void *, winRenderModel_TextureMap_t_11030 *); +extern EVRRenderModelError cppIVRRenderModels_IVRRenderModels_006_LoadRenderModel_Async(void *, const char *, winRenderModel_t_11111 **); +extern void cppIVRRenderModels_IVRRenderModels_006_FreeRenderModel(void *, winRenderModel_t_11111 *); +extern EVRRenderModelError cppIVRRenderModels_IVRRenderModels_006_LoadTexture_Async(void *, TextureID_t, winRenderModel_TextureMap_t_11111 **); +extern void cppIVRRenderModels_IVRRenderModels_006_FreeTexture(void *, winRenderModel_TextureMap_t_11111 *); extern EVRRenderModelError cppIVRRenderModels_IVRRenderModels_006_LoadTextureD3D11_Async(void *, TextureID_t, void *, void **); extern EVRRenderModelError cppIVRRenderModels_IVRRenderModels_006_LoadIntoTextureD3D11_Async(void *, TextureID_t, void *); extern void cppIVRRenderModels_IVRRenderModels_006_FreeTextureD3D11(void *, void *); diff --git a/vrclient_x64/vrclient_x64/cppIVRResources_IVRResources_001.cpp b/vrclient_x64/vrclient_x64/cppIVRResources_IVRResources_001.cpp index 9fca6f86..ebfcd8d9 100644 --- a/vrclient_x64/vrclient_x64/cppIVRResources_IVRResources_001.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRResources_IVRResources_001.cpp @@ -1,6 +1,6 @@ #include "vrclient_private.h" #include "vrclient_defs.h" -#include "openvr_v1.10.30/ivrclientcore.h" +#include "openvr_v1.11.11/ivrclientcore.h" using namespace vr; extern "C" { #include "struct_converters.h" diff --git a/vrclient_x64/vrclient_x64/cppIVRScreenshots_IVRScreenshots_001.cpp b/vrclient_x64/vrclient_x64/cppIVRScreenshots_IVRScreenshots_001.cpp index 0876b3b8..8cc86ddf 100644 --- a/vrclient_x64/vrclient_x64/cppIVRScreenshots_IVRScreenshots_001.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRScreenshots_IVRScreenshots_001.cpp @@ -1,6 +1,6 @@ #include "vrclient_private.h" #include "vrclient_defs.h" -#include "openvr_v1.10.30/ivrclientcore.h" +#include "openvr_v1.11.11/ivrclientcore.h" using namespace vr; extern "C" { #include "struct_converters.h" diff --git a/vrclient_x64/vrclient_x64/cppIVRSettings_IVRSettings_003.cpp b/vrclient_x64/vrclient_x64/cppIVRSettings_IVRSettings_003.cpp index 84c85ceb..47081fec 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSettings_IVRSettings_003.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRSettings_IVRSettings_003.cpp @@ -1,6 +1,6 @@ #include "vrclient_private.h" #include "vrclient_defs.h" -#include "openvr_v1.10.30/ivrclientcore.h" +#include "openvr_v1.11.11/ivrclientcore.h" using namespace vr; extern "C" { #include "struct_converters.h" diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_021.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_021.cpp index 5a5c75f4..82988da3 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_021.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_021.cpp @@ -1,6 +1,6 @@ #include "vrclient_private.h" #include "vrclient_defs.h" -#include "openvr_v1.10.30/ivrclientcore.h" +#include "openvr_v1.11.11/ivrclientcore.h" using namespace vr; extern "C" { #include "struct_converters.h" @@ -159,27 +159,27 @@ const char * cppIVRSystem_IVRSystem_021_GetPropErrorNameFromEnum(void *linux_sid return ((IVRSystem*)linux_side)->GetPropErrorNameFromEnum((vr::ETrackedPropertyError)error); } -bool cppIVRSystem_IVRSystem_021_PollNextEvent(void *linux_side, winVREvent_t_11030 * pEvent, uint32_t uncbVREvent) +bool cppIVRSystem_IVRSystem_021_PollNextEvent(void *linux_side, winVREvent_t_11111 * pEvent, uint32_t uncbVREvent) { VREvent_t lin; bool _ret; if(pEvent) - struct_VREvent_t_11030_win_to_lin(pEvent, &lin); + struct_VREvent_t_11111_win_to_lin(pEvent, &lin); _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, uncbVREvent ? sizeof(lin) : 0); if(pEvent) - struct_VREvent_t_11030_lin_to_win(&lin, pEvent, uncbVREvent); + struct_VREvent_t_11111_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; } -bool cppIVRSystem_IVRSystem_021_PollNextEventWithPose(void *linux_side, ETrackingUniverseOrigin eOrigin, winVREvent_t_11030 * pEvent, uint32_t uncbVREvent, TrackedDevicePose_t * pTrackedDevicePose) +bool cppIVRSystem_IVRSystem_021_PollNextEventWithPose(void *linux_side, ETrackingUniverseOrigin eOrigin, winVREvent_t_11111 * pEvent, uint32_t uncbVREvent, TrackedDevicePose_t * pTrackedDevicePose) { VREvent_t lin; bool _ret; if(pEvent) - struct_VREvent_t_11030_win_to_lin(pEvent, &lin); + struct_VREvent_t_11111_win_to_lin(pEvent, &lin); _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, uncbVREvent ? sizeof(lin) : 0, (vr::TrackedDevicePose_t *)pTrackedDevicePose); if(pEvent) - struct_VREvent_t_11030_lin_to_win(&lin, pEvent, uncbVREvent); + struct_VREvent_t_11111_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; } @@ -193,27 +193,27 @@ vr::HiddenAreaMesh_t cppIVRSystem_IVRSystem_021_GetHiddenAreaMesh(void *linux_si return ((IVRSystem*)linux_side)->GetHiddenAreaMesh((vr::EVREye)eEye, (vr::EHiddenAreaMeshType)type); } -bool cppIVRSystem_IVRSystem_021_GetControllerState(void *linux_side, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_11030 * pControllerState, uint32_t unControllerStateSize) +bool cppIVRSystem_IVRSystem_021_GetControllerState(void *linux_side, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_11111 * pControllerState, uint32_t unControllerStateSize) { VRControllerState001_t lin; bool _ret; if(pControllerState) - struct_VRControllerState001_t_11030_win_to_lin(pControllerState, &lin); + struct_VRControllerState001_t_11111_win_to_lin(pControllerState, &lin); _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, unControllerStateSize ? sizeof(lin) : 0); if(pControllerState) - struct_VRControllerState001_t_11030_lin_to_win(&lin, pControllerState, unControllerStateSize); + struct_VRControllerState001_t_11111_lin_to_win(&lin, pControllerState, unControllerStateSize); return _ret; } -bool cppIVRSystem_IVRSystem_021_GetControllerStateWithPose(void *linux_side, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_11030 * pControllerState, uint32_t unControllerStateSize, TrackedDevicePose_t * pTrackedDevicePose) +bool cppIVRSystem_IVRSystem_021_GetControllerStateWithPose(void *linux_side, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_11111 * pControllerState, uint32_t unControllerStateSize, TrackedDevicePose_t * pTrackedDevicePose) { VRControllerState001_t lin; bool _ret; if(pControllerState) - struct_VRControllerState001_t_11030_win_to_lin(pControllerState, &lin); + struct_VRControllerState001_t_11111_win_to_lin(pControllerState, &lin); _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, unControllerStateSize ? sizeof(lin) : 0, (vr::TrackedDevicePose_t *)pTrackedDevicePose); if(pControllerState) - struct_VRControllerState001_t_11030_lin_to_win(&lin, pControllerState, unControllerStateSize); + struct_VRControllerState001_t_11111_lin_to_win(&lin, pControllerState, unControllerStateSize); return _ret; } diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_021.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_021.h index 85c0d690..1ce5cb20 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_021.h +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_021.h @@ -31,12 +31,12 @@ extern HmdMatrix34_t cppIVRSystem_IVRSystem_021_GetMatrix34TrackedDeviceProperty extern uint32_t cppIVRSystem_IVRSystem_021_GetArrayTrackedDeviceProperty(void *, TrackedDeviceIndex_t, ETrackedDeviceProperty, PropertyTypeTag_t, void *, uint32_t, ETrackedPropertyError *); extern uint32_t cppIVRSystem_IVRSystem_021_GetStringTrackedDeviceProperty(void *, TrackedDeviceIndex_t, ETrackedDeviceProperty, char *, uint32_t, ETrackedPropertyError *); extern const char * cppIVRSystem_IVRSystem_021_GetPropErrorNameFromEnum(void *, ETrackedPropertyError); -extern bool cppIVRSystem_IVRSystem_021_PollNextEvent(void *, winVREvent_t_11030 *, uint32_t); -extern bool cppIVRSystem_IVRSystem_021_PollNextEventWithPose(void *, ETrackingUniverseOrigin, winVREvent_t_11030 *, uint32_t, TrackedDevicePose_t *); +extern bool cppIVRSystem_IVRSystem_021_PollNextEvent(void *, winVREvent_t_11111 *, uint32_t); +extern bool cppIVRSystem_IVRSystem_021_PollNextEventWithPose(void *, ETrackingUniverseOrigin, winVREvent_t_11111 *, uint32_t, TrackedDevicePose_t *); extern const char * cppIVRSystem_IVRSystem_021_GetEventTypeNameFromEnum(void *, EVREventType); extern HiddenAreaMesh_t cppIVRSystem_IVRSystem_021_GetHiddenAreaMesh(void *, EVREye, EHiddenAreaMeshType); -extern bool cppIVRSystem_IVRSystem_021_GetControllerState(void *, TrackedDeviceIndex_t, winVRControllerState001_t_11030 *, uint32_t); -extern bool cppIVRSystem_IVRSystem_021_GetControllerStateWithPose(void *, ETrackingUniverseOrigin, TrackedDeviceIndex_t, winVRControllerState001_t_11030 *, uint32_t, TrackedDevicePose_t *); +extern bool cppIVRSystem_IVRSystem_021_GetControllerState(void *, TrackedDeviceIndex_t, winVRControllerState001_t_11111 *, uint32_t); +extern bool cppIVRSystem_IVRSystem_021_GetControllerStateWithPose(void *, ETrackingUniverseOrigin, TrackedDeviceIndex_t, winVRControllerState001_t_11111 *, uint32_t, TrackedDevicePose_t *); extern void cppIVRSystem_IVRSystem_021_TriggerHapticPulse(void *, TrackedDeviceIndex_t, uint32_t, unsigned short); extern const char * cppIVRSystem_IVRSystem_021_GetButtonIdNameFromEnum(void *, EVRButtonId); extern const char * cppIVRSystem_IVRSystem_021_GetControllerAxisTypeNameFromEnum(void *, EVRControllerAxisType); diff --git a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_006.cpp b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_006.cpp index cd9ced95..0d217700 100644 --- a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_006.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_006.cpp @@ -1,6 +1,6 @@ #include "vrclient_private.h" #include "vrclient_defs.h" -#include "openvr_v1.10.30/ivrclientcore.h" +#include "openvr_v1.11.11/ivrclientcore.h" using namespace vr; extern "C" { #include "struct_converters.h" @@ -44,15 +44,15 @@ vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_006_ReleaseVideoS return ((IVRTrackedCamera*)linux_side)->ReleaseVideoStreamingService((vr::TrackedCameraHandle_t)hTrackedCamera); } -vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStreamFrameBuffer(void *linux_side, TrackedCameraHandle_t hTrackedCamera, EVRTrackedCameraFrameType eFrameType, void * pFrameBuffer, uint32_t nFrameBufferSize, winCameraVideoStreamFrameHeader_t_11030 * pFrameHeader, uint32_t nFrameHeaderSize) +vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStreamFrameBuffer(void *linux_side, TrackedCameraHandle_t hTrackedCamera, EVRTrackedCameraFrameType eFrameType, void * pFrameBuffer, uint32_t nFrameBufferSize, winCameraVideoStreamFrameHeader_t_11111 * pFrameHeader, uint32_t nFrameHeaderSize) { CameraVideoStreamFrameHeader_t lin; vr::EVRTrackedCameraError _ret; if(pFrameHeader) - struct_CameraVideoStreamFrameHeader_t_11030_win_to_lin(pFrameHeader, &lin); + struct_CameraVideoStreamFrameHeader_t_11111_win_to_lin(pFrameHeader, &lin); _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamFrameBuffer((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pFrameBuffer, (uint32_t)nFrameBufferSize, pFrameHeader ? &lin : nullptr, nFrameHeaderSize ? sizeof(lin) : 0); if(pFrameHeader) - struct_CameraVideoStreamFrameHeader_t_11030_lin_to_win(&lin, pFrameHeader, nFrameHeaderSize); + struct_CameraVideoStreamFrameHeader_t_11111_lin_to_win(&lin, pFrameHeader, nFrameHeaderSize); return _ret; } @@ -61,27 +61,27 @@ vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStrea return ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureSize((vr::TrackedDeviceIndex_t)nDeviceIndex, (vr::EVRTrackedCameraFrameType)eFrameType, (vr::VRTextureBounds_t *)pTextureBounds, (uint32_t *)pnWidth, (uint32_t *)pnHeight); } -vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStreamTextureD3D11(void *linux_side, TrackedCameraHandle_t hTrackedCamera, EVRTrackedCameraFrameType eFrameType, void * pD3D11DeviceOrResource, void ** ppD3D11ShaderResourceView, winCameraVideoStreamFrameHeader_t_11030 * pFrameHeader, uint32_t nFrameHeaderSize) +vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStreamTextureD3D11(void *linux_side, TrackedCameraHandle_t hTrackedCamera, EVRTrackedCameraFrameType eFrameType, void * pD3D11DeviceOrResource, void ** ppD3D11ShaderResourceView, winCameraVideoStreamFrameHeader_t_11111 * pFrameHeader, uint32_t nFrameHeaderSize) { CameraVideoStreamFrameHeader_t lin; vr::EVRTrackedCameraError _ret; if(pFrameHeader) - struct_CameraVideoStreamFrameHeader_t_11030_win_to_lin(pFrameHeader, &lin); + struct_CameraVideoStreamFrameHeader_t_11111_win_to_lin(pFrameHeader, &lin); _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureD3D11((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pD3D11DeviceOrResource, (void **)ppD3D11ShaderResourceView, pFrameHeader ? &lin : nullptr, nFrameHeaderSize ? sizeof(lin) : 0); if(pFrameHeader) - struct_CameraVideoStreamFrameHeader_t_11030_lin_to_win(&lin, pFrameHeader, nFrameHeaderSize); + struct_CameraVideoStreamFrameHeader_t_11111_lin_to_win(&lin, pFrameHeader, nFrameHeaderSize); return _ret; } -vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStreamTextureGL(void *linux_side, TrackedCameraHandle_t hTrackedCamera, EVRTrackedCameraFrameType eFrameType, glUInt_t * pglTextureId, winCameraVideoStreamFrameHeader_t_11030 * pFrameHeader, uint32_t nFrameHeaderSize) +vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStreamTextureGL(void *linux_side, TrackedCameraHandle_t hTrackedCamera, EVRTrackedCameraFrameType eFrameType, glUInt_t * pglTextureId, winCameraVideoStreamFrameHeader_t_11111 * pFrameHeader, uint32_t nFrameHeaderSize) { CameraVideoStreamFrameHeader_t lin; vr::EVRTrackedCameraError _ret; if(pFrameHeader) - struct_CameraVideoStreamFrameHeader_t_11030_win_to_lin(pFrameHeader, &lin); + struct_CameraVideoStreamFrameHeader_t_11111_win_to_lin(pFrameHeader, &lin); _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureGL((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (vr::glUInt_t *)pglTextureId, pFrameHeader ? &lin : nullptr, nFrameHeaderSize ? sizeof(lin) : 0); if(pFrameHeader) - struct_CameraVideoStreamFrameHeader_t_11030_lin_to_win(&lin, pFrameHeader, nFrameHeaderSize); + struct_CameraVideoStreamFrameHeader_t_11111_lin_to_win(&lin, pFrameHeader, nFrameHeaderSize); return _ret; } diff --git a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_006.h b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_006.h index fdbc9c33..25c993e5 100644 --- a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_006.h +++ b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_006.h @@ -8,10 +8,10 @@ extern EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_006_GetCameraI extern EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_006_GetCameraProjection(void *, TrackedDeviceIndex_t, uint32_t, EVRTrackedCameraFrameType, float, float, HmdMatrix44_t *); extern EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_006_AcquireVideoStreamingService(void *, TrackedDeviceIndex_t, TrackedCameraHandle_t *); extern EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_006_ReleaseVideoStreamingService(void *, TrackedCameraHandle_t); -extern EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStreamFrameBuffer(void *, TrackedCameraHandle_t, EVRTrackedCameraFrameType, void *, uint32_t, winCameraVideoStreamFrameHeader_t_11030 *, uint32_t); +extern EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStreamFrameBuffer(void *, TrackedCameraHandle_t, EVRTrackedCameraFrameType, void *, uint32_t, winCameraVideoStreamFrameHeader_t_11111 *, uint32_t); extern EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStreamTextureSize(void *, TrackedDeviceIndex_t, EVRTrackedCameraFrameType, VRTextureBounds_t *, uint32_t *, uint32_t *); -extern EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStreamTextureD3D11(void *, TrackedCameraHandle_t, EVRTrackedCameraFrameType, void *, void **, winCameraVideoStreamFrameHeader_t_11030 *, uint32_t); -extern EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStreamTextureGL(void *, TrackedCameraHandle_t, EVRTrackedCameraFrameType, glUInt_t *, winCameraVideoStreamFrameHeader_t_11030 *, uint32_t); +extern EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStreamTextureD3D11(void *, TrackedCameraHandle_t, EVRTrackedCameraFrameType, void *, void **, winCameraVideoStreamFrameHeader_t_11111 *, uint32_t); +extern EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStreamTextureGL(void *, TrackedCameraHandle_t, EVRTrackedCameraFrameType, glUInt_t *, winCameraVideoStreamFrameHeader_t_11111 *, uint32_t); extern EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_006_ReleaseVideoStreamTextureGL(void *, TrackedCameraHandle_t, glUInt_t); extern void cppIVRTrackedCamera_IVRTrackedCamera_006_SetCameraTrackingSpace(void *, ETrackingUniverseOrigin); extern ETrackingUniverseOrigin cppIVRTrackedCamera_IVRTrackedCamera_006_GetCameraTrackingSpace(void *); diff --git a/vrclient_x64/vrclient_x64/struct_converters.h b/vrclient_x64/vrclient_x64/struct_converters.h index 05cc09c2..66287e9d 100644 --- a/vrclient_x64/vrclient_x64/struct_converters.h +++ b/vrclient_x64/vrclient_x64/struct_converters.h @@ -1,3 +1,34 @@ +typedef struct winVREvent_t_11111 winVREvent_t_11111; +extern void struct_VREvent_t_11111_lin_to_win(void *l, void *w, uint32_t sz); +extern void struct_VREvent_t_11111_win_to_lin(void *w, void *l); +typedef struct winVRControllerState001_t_11111 winVRControllerState001_t_11111; +extern void struct_VRControllerState001_t_11111_lin_to_win(void *l, void *w, uint32_t sz); +extern void struct_VRControllerState001_t_11111_win_to_lin(void *w, void *l); +typedef struct winCameraVideoStreamFrameHeader_t_11111 winCameraVideoStreamFrameHeader_t_11111; +extern void struct_CameraVideoStreamFrameHeader_t_11111_lin_to_win(void *l, void *w, uint32_t sz); +extern void struct_CameraVideoStreamFrameHeader_t_11111_win_to_lin(void *w, void *l); +typedef struct winRenderModel_TextureMap_t_11111 winRenderModel_TextureMap_t_11111; +extern void struct_RenderModel_TextureMap_t_11111_lin_to_win(void *l, void *w); +extern void struct_RenderModel_TextureMap_t_11111_win_to_lin(void *w, void *l); +extern struct winRenderModel_TextureMap_t_11111 *struct_RenderModel_TextureMap_t_11111_wrap(void *l); +extern RenderModel_TextureMap_t *struct_RenderModel_TextureMap_t_11111_unwrap(winRenderModel_TextureMap_t_11111 *w); +typedef struct winRenderModel_t_11111 winRenderModel_t_11111; +extern void struct_RenderModel_t_11111_lin_to_win(void *l, void *w); +extern void struct_RenderModel_t_11111_win_to_lin(void *w, void *l); +extern struct winRenderModel_t_11111 *struct_RenderModel_t_11111_wrap(void *l); +extern RenderModel_t *struct_RenderModel_t_11111_unwrap(winRenderModel_t_11111 *w); +typedef struct winInputAnalogActionData_t_11111 winInputAnalogActionData_t_11111; +extern void struct_InputAnalogActionData_t_11111_lin_to_win(void *l, void *w, uint32_t sz); +extern void struct_InputAnalogActionData_t_11111_win_to_lin(void *w, void *l); +typedef struct winInputDigitalActionData_t_11111 winInputDigitalActionData_t_11111; +extern void struct_InputDigitalActionData_t_11111_lin_to_win(void *l, void *w, uint32_t sz); +extern void struct_InputDigitalActionData_t_11111_win_to_lin(void *w, void *l); +typedef struct winInputPoseActionData_t_11111 winInputPoseActionData_t_11111; +extern void struct_InputPoseActionData_t_11111_lin_to_win(void *l, void *w, uint32_t sz); +extern void struct_InputPoseActionData_t_11111_win_to_lin(void *w, void *l); +typedef struct winInputSkeletalActionData_t_11111 winInputSkeletalActionData_t_11111; +extern void struct_InputSkeletalActionData_t_11111_lin_to_win(void *l, void *w, uint32_t sz); +extern void struct_InputSkeletalActionData_t_11111_win_to_lin(void *w, void *l); typedef struct winVREvent_t_11030 winVREvent_t_11030; extern void struct_VREvent_t_11030_lin_to_win(void *l, void *w, uint32_t sz); extern void struct_VREvent_t_11030_win_to_lin(void *w, void *l); diff --git a/vrclient_x64/vrclient_x64/struct_converters_11111.cpp b/vrclient_x64/vrclient_x64/struct_converters_11111.cpp new file mode 100644 index 00000000..c828dd41 --- /dev/null +++ b/vrclient_x64/vrclient_x64/struct_converters_11111.cpp @@ -0,0 +1,335 @@ +#include +#include +#include "vrclient_private.h" +#include "vrclient_defs.h" +#include "openvr_v1.11.11/openvr.h" +using namespace vr; +extern "C" { +#include "struct_converters.h" +#pragma pack(push, 8) +struct winVREvent_t_11111 { + uint32_t eventType; + vr::TrackedDeviceIndex_t trackedDeviceIndex; + float eventAgeSeconds; + vr::VREvent_Data_t data __attribute__((aligned(8))); +} __attribute__ ((ms_struct)); +#pragma pack(pop) + +void struct_VREvent_t_11111_lin_to_win(void *l, void *w, uint32_t sz) +{ + struct winVREvent_t_11111 *win = (struct winVREvent_t_11111 *)w; + VREvent_t *lin = (VREvent_t *)l; + win->eventType = lin->eventType; + win->trackedDeviceIndex = lin->trackedDeviceIndex; + win->eventAgeSeconds = lin->eventAgeSeconds; + memcpy(&win->data, &lin->data, sz - (((char*)&win->data) - ((char*)win))); +} + +void struct_VREvent_t_11111_win_to_lin(void *w, void *l) +{ + struct winVREvent_t_11111 *win = (struct winVREvent_t_11111 *)w; + VREvent_t *lin = (VREvent_t *)l; + lin->eventType = win->eventType; + lin->trackedDeviceIndex = win->trackedDeviceIndex; + lin->eventAgeSeconds = win->eventAgeSeconds; + lin->data = win->data; +} + +#pragma pack(push, 8) +struct winVRControllerState001_t_11111 { + uint32_t unPacketNum; + uint64_t ulButtonPressed; + uint64_t ulButtonTouched; + vr::VRControllerAxis_t rAxis[5]; +} __attribute__ ((ms_struct)); +#pragma pack(pop) + +void struct_VRControllerState001_t_11111_lin_to_win(void *l, void *w, uint32_t sz) +{ + struct winVRControllerState001_t_11111 *win = (struct winVRControllerState001_t_11111 *)w; + VRControllerState001_t *lin = (VRControllerState001_t *)l; + win->unPacketNum = lin->unPacketNum; + win->ulButtonPressed = lin->ulButtonPressed; + win->ulButtonTouched = lin->ulButtonTouched; + memcpy(win->rAxis, lin->rAxis, sizeof(win->rAxis)); +} + +void struct_VRControllerState001_t_11111_win_to_lin(void *w, void *l) +{ + struct winVRControllerState001_t_11111 *win = (struct winVRControllerState001_t_11111 *)w; + VRControllerState001_t *lin = (VRControllerState001_t *)l; + lin->unPacketNum = win->unPacketNum; + lin->ulButtonPressed = win->ulButtonPressed; + lin->ulButtonTouched = win->ulButtonTouched; + memcpy(lin->rAxis, win->rAxis, sizeof(lin->rAxis)); +} + +#pragma pack(push, 8) +struct winCameraVideoStreamFrameHeader_t_11111 { + vr::EVRTrackedCameraFrameType eFrameType; + uint32_t nWidth; + uint32_t nHeight; + uint32_t nBytesPerPixel; + uint32_t nFrameSequence; + vr::TrackedDevicePose_t trackedDevicePose __attribute__((aligned(4))); + uint64_t ulFrameExposureTime; +} __attribute__ ((ms_struct)); +#pragma pack(pop) + +void struct_CameraVideoStreamFrameHeader_t_11111_lin_to_win(void *l, void *w, uint32_t sz) +{ + struct winCameraVideoStreamFrameHeader_t_11111 *win = (struct winCameraVideoStreamFrameHeader_t_11111 *)w; + CameraVideoStreamFrameHeader_t *lin = (CameraVideoStreamFrameHeader_t *)l; + win->eFrameType = lin->eFrameType; + win->nWidth = lin->nWidth; + win->nHeight = lin->nHeight; + win->nBytesPerPixel = lin->nBytesPerPixel; + win->nFrameSequence = lin->nFrameSequence; + win->trackedDevicePose = lin->trackedDevicePose; + win->ulFrameExposureTime = lin->ulFrameExposureTime; +} + +void struct_CameraVideoStreamFrameHeader_t_11111_win_to_lin(void *w, void *l) +{ + struct winCameraVideoStreamFrameHeader_t_11111 *win = (struct winCameraVideoStreamFrameHeader_t_11111 *)w; + CameraVideoStreamFrameHeader_t *lin = (CameraVideoStreamFrameHeader_t *)l; + lin->eFrameType = win->eFrameType; + lin->nWidth = win->nWidth; + lin->nHeight = win->nHeight; + lin->nBytesPerPixel = win->nBytesPerPixel; + lin->nFrameSequence = win->nFrameSequence; + lin->trackedDevicePose = win->trackedDevicePose; + lin->ulFrameExposureTime = win->ulFrameExposureTime; +} + +#pragma pack(push, 8) +struct winRenderModel_TextureMap_t_11111 { + uint16_t unWidth; + uint16_t unHeight; + const uint8_t * rubTextureMapData; + vr::EVRRenderModelTextureFormat format; + + RenderModel_TextureMap_t *linux_side; +} __attribute__ ((ms_struct)); +#pragma pack(pop) + +void struct_RenderModel_TextureMap_t_11111_lin_to_win(void *l, void *w) +{ + struct winRenderModel_TextureMap_t_11111 *win = (struct winRenderModel_TextureMap_t_11111 *)w; + RenderModel_TextureMap_t *lin = (RenderModel_TextureMap_t *)l; + win->unWidth = lin->unWidth; + win->unHeight = lin->unHeight; + win->rubTextureMapData = lin->rubTextureMapData; + win->format = lin->format; +} + +void struct_RenderModel_TextureMap_t_11111_win_to_lin(void *w, void *l) +{ + struct winRenderModel_TextureMap_t_11111 *win = (struct winRenderModel_TextureMap_t_11111 *)w; + RenderModel_TextureMap_t *lin = (RenderModel_TextureMap_t *)l; + lin->unWidth = win->unWidth; + lin->unHeight = win->unHeight; + lin->rubTextureMapData = win->rubTextureMapData; + lin->format = win->format; +} + +struct winRenderModel_TextureMap_t_11111 *struct_RenderModel_TextureMap_t_11111_wrap(void *l) +{ + struct winRenderModel_TextureMap_t_11111 *win = (struct winRenderModel_TextureMap_t_11111 *)malloc(sizeof(*win)); + RenderModel_TextureMap_t *lin = (RenderModel_TextureMap_t *)l; + win->unWidth = lin->unWidth; + win->unHeight = lin->unHeight; + win->rubTextureMapData = lin->rubTextureMapData; + win->format = lin->format; + win->linux_side = lin; + return win; +} + +struct RenderModel_TextureMap_t *struct_RenderModel_TextureMap_t_11111_unwrap(winRenderModel_TextureMap_t_11111 *w) +{ + RenderModel_TextureMap_t *ret = w->linux_side; + free(w); + return ret; +} + +#pragma pack(push, 8) +struct winRenderModel_t_11111 { + const vr::RenderModel_Vertex_t * rVertexData; + uint32_t unVertexCount; + const uint16_t * rIndexData; + uint32_t unTriangleCount; + vr::TextureID_t diffuseTextureId; + + RenderModel_t *linux_side; +} __attribute__ ((ms_struct)); +#pragma pack(pop) + +void struct_RenderModel_t_11111_lin_to_win(void *l, void *w) +{ + struct winRenderModel_t_11111 *win = (struct winRenderModel_t_11111 *)w; + RenderModel_t *lin = (RenderModel_t *)l; + win->rVertexData = lin->rVertexData; + win->unVertexCount = lin->unVertexCount; + win->rIndexData = lin->rIndexData; + win->unTriangleCount = lin->unTriangleCount; + win->diffuseTextureId = lin->diffuseTextureId; +} + +void struct_RenderModel_t_11111_win_to_lin(void *w, void *l) +{ + struct winRenderModel_t_11111 *win = (struct winRenderModel_t_11111 *)w; + RenderModel_t *lin = (RenderModel_t *)l; + lin->rVertexData = win->rVertexData; + lin->unVertexCount = win->unVertexCount; + lin->rIndexData = win->rIndexData; + lin->unTriangleCount = win->unTriangleCount; + lin->diffuseTextureId = win->diffuseTextureId; +} + +struct winRenderModel_t_11111 *struct_RenderModel_t_11111_wrap(void *l) +{ + struct winRenderModel_t_11111 *win = (struct winRenderModel_t_11111 *)malloc(sizeof(*win)); + RenderModel_t *lin = (RenderModel_t *)l; + win->rVertexData = lin->rVertexData; + win->unVertexCount = lin->unVertexCount; + win->rIndexData = lin->rIndexData; + win->unTriangleCount = lin->unTriangleCount; + win->diffuseTextureId = lin->diffuseTextureId; + win->linux_side = lin; + return win; +} + +struct RenderModel_t *struct_RenderModel_t_11111_unwrap(winRenderModel_t_11111 *w) +{ + RenderModel_t *ret = w->linux_side; + free(w); + return ret; +} + +#pragma pack(push, 8) +struct winInputAnalogActionData_t_11111 { + bool bActive; + vr::VRInputValueHandle_t activeOrigin; + float x; + float y; + float z; + float deltaX; + float deltaY; + float deltaZ; + float fUpdateTime; +} __attribute__ ((ms_struct)); +#pragma pack(pop) + +void struct_InputAnalogActionData_t_11111_lin_to_win(void *l, void *w, uint32_t sz) +{ + struct winInputAnalogActionData_t_11111 *win = (struct winInputAnalogActionData_t_11111 *)w; + InputAnalogActionData_t *lin = (InputAnalogActionData_t *)l; + win->bActive = lin->bActive; + win->activeOrigin = lin->activeOrigin; + win->x = lin->x; + win->y = lin->y; + win->z = lin->z; + win->deltaX = lin->deltaX; + win->deltaY = lin->deltaY; + win->deltaZ = lin->deltaZ; + win->fUpdateTime = lin->fUpdateTime; +} + +void struct_InputAnalogActionData_t_11111_win_to_lin(void *w, void *l) +{ + struct winInputAnalogActionData_t_11111 *win = (struct winInputAnalogActionData_t_11111 *)w; + InputAnalogActionData_t *lin = (InputAnalogActionData_t *)l; + lin->bActive = win->bActive; + lin->activeOrigin = win->activeOrigin; + lin->x = win->x; + lin->y = win->y; + lin->z = win->z; + lin->deltaX = win->deltaX; + lin->deltaY = win->deltaY; + lin->deltaZ = win->deltaZ; + lin->fUpdateTime = win->fUpdateTime; +} + +#pragma pack(push, 8) +struct winInputDigitalActionData_t_11111 { + bool bActive; + vr::VRInputValueHandle_t activeOrigin; + bool bState; + bool bChanged; + float fUpdateTime; +} __attribute__ ((ms_struct)); +#pragma pack(pop) + +void struct_InputDigitalActionData_t_11111_lin_to_win(void *l, void *w, uint32_t sz) +{ + struct winInputDigitalActionData_t_11111 *win = (struct winInputDigitalActionData_t_11111 *)w; + InputDigitalActionData_t *lin = (InputDigitalActionData_t *)l; + win->bActive = lin->bActive; + win->activeOrigin = lin->activeOrigin; + win->bState = lin->bState; + win->bChanged = lin->bChanged; + win->fUpdateTime = lin->fUpdateTime; +} + +void struct_InputDigitalActionData_t_11111_win_to_lin(void *w, void *l) +{ + struct winInputDigitalActionData_t_11111 *win = (struct winInputDigitalActionData_t_11111 *)w; + InputDigitalActionData_t *lin = (InputDigitalActionData_t *)l; + lin->bActive = win->bActive; + lin->activeOrigin = win->activeOrigin; + lin->bState = win->bState; + lin->bChanged = win->bChanged; + lin->fUpdateTime = win->fUpdateTime; +} + +#pragma pack(push, 8) +struct winInputPoseActionData_t_11111 { + bool bActive; + vr::VRInputValueHandle_t activeOrigin; + vr::TrackedDevicePose_t pose __attribute__((aligned(4))); +} __attribute__ ((ms_struct)); +#pragma pack(pop) + +void struct_InputPoseActionData_t_11111_lin_to_win(void *l, void *w, uint32_t sz) +{ + struct winInputPoseActionData_t_11111 *win = (struct winInputPoseActionData_t_11111 *)w; + InputPoseActionData_t *lin = (InputPoseActionData_t *)l; + win->bActive = lin->bActive; + win->activeOrigin = lin->activeOrigin; + win->pose = lin->pose; +} + +void struct_InputPoseActionData_t_11111_win_to_lin(void *w, void *l) +{ + struct winInputPoseActionData_t_11111 *win = (struct winInputPoseActionData_t_11111 *)w; + InputPoseActionData_t *lin = (InputPoseActionData_t *)l; + lin->bActive = win->bActive; + lin->activeOrigin = win->activeOrigin; + lin->pose = win->pose; +} + +#pragma pack(push, 8) +struct winInputSkeletalActionData_t_11111 { + bool bActive; + vr::VRInputValueHandle_t activeOrigin; +} __attribute__ ((ms_struct)); +#pragma pack(pop) + +void struct_InputSkeletalActionData_t_11111_lin_to_win(void *l, void *w, uint32_t sz) +{ + struct winInputSkeletalActionData_t_11111 *win = (struct winInputSkeletalActionData_t_11111 *)w; + InputSkeletalActionData_t *lin = (InputSkeletalActionData_t *)l; + win->bActive = lin->bActive; + win->activeOrigin = lin->activeOrigin; +} + +void struct_InputSkeletalActionData_t_11111_win_to_lin(void *w, void *l) +{ + struct winInputSkeletalActionData_t_11111 *win = (struct winInputSkeletalActionData_t_11111 *)w; + InputSkeletalActionData_t *lin = (InputSkeletalActionData_t *)l; + lin->bActive = win->bActive; + lin->activeOrigin = win->activeOrigin; +} + + +} diff --git a/vrclient_x64/vrclient_x64/winIVRInput.c b/vrclient_x64/vrclient_x64/winIVRInput.c index 170cfd47..87306c9a 100644 --- a/vrclient_x64/vrclient_x64/winIVRInput.c +++ b/vrclient_x64/vrclient_x64/winIVRInput.c @@ -63,35 +63,35 @@ EVRInputError __thiscall winIVRInput_IVRInput_010_UpdateActionState(winIVRInput_ } DEFINE_THISCALL_WRAPPER(winIVRInput_IVRInput_010_GetDigitalActionData, 28) -EVRInputError __thiscall winIVRInput_IVRInput_010_GetDigitalActionData(winIVRInput_IVRInput_010 *_this, VRActionHandle_t action, winInputDigitalActionData_t_11030 * pActionData, uint32_t unActionDataSize, VRInputValueHandle_t ulRestrictToDevice) +EVRInputError __thiscall winIVRInput_IVRInput_010_GetDigitalActionData(winIVRInput_IVRInput_010 *_this, VRActionHandle_t action, winInputDigitalActionData_t_11111 * pActionData, uint32_t unActionDataSize, VRInputValueHandle_t ulRestrictToDevice) { TRACE("%p\n", _this); return cppIVRInput_IVRInput_010_GetDigitalActionData(_this->linux_side, action, pActionData, unActionDataSize, ulRestrictToDevice); } DEFINE_THISCALL_WRAPPER(winIVRInput_IVRInput_010_GetAnalogActionData, 28) -EVRInputError __thiscall winIVRInput_IVRInput_010_GetAnalogActionData(winIVRInput_IVRInput_010 *_this, VRActionHandle_t action, winInputAnalogActionData_t_11030 * pActionData, uint32_t unActionDataSize, VRInputValueHandle_t ulRestrictToDevice) +EVRInputError __thiscall winIVRInput_IVRInput_010_GetAnalogActionData(winIVRInput_IVRInput_010 *_this, VRActionHandle_t action, winInputAnalogActionData_t_11111 * pActionData, uint32_t unActionDataSize, VRInputValueHandle_t ulRestrictToDevice) { TRACE("%p\n", _this); return cppIVRInput_IVRInput_010_GetAnalogActionData(_this->linux_side, action, pActionData, unActionDataSize, ulRestrictToDevice); } DEFINE_THISCALL_WRAPPER(winIVRInput_IVRInput_010_GetPoseActionDataRelativeToNow, 36) -EVRInputError __thiscall winIVRInput_IVRInput_010_GetPoseActionDataRelativeToNow(winIVRInput_IVRInput_010 *_this, VRActionHandle_t action, ETrackingUniverseOrigin eOrigin, float fPredictedSecondsFromNow, winInputPoseActionData_t_11030 * pActionData, uint32_t unActionDataSize, VRInputValueHandle_t ulRestrictToDevice) +EVRInputError __thiscall winIVRInput_IVRInput_010_GetPoseActionDataRelativeToNow(winIVRInput_IVRInput_010 *_this, VRActionHandle_t action, ETrackingUniverseOrigin eOrigin, float fPredictedSecondsFromNow, winInputPoseActionData_t_11111 * pActionData, uint32_t unActionDataSize, VRInputValueHandle_t ulRestrictToDevice) { TRACE("%p\n", _this); return cppIVRInput_IVRInput_010_GetPoseActionDataRelativeToNow(_this->linux_side, action, eOrigin, fPredictedSecondsFromNow, pActionData, unActionDataSize, ulRestrictToDevice); } DEFINE_THISCALL_WRAPPER(winIVRInput_IVRInput_010_GetPoseActionDataForNextFrame, 32) -EVRInputError __thiscall winIVRInput_IVRInput_010_GetPoseActionDataForNextFrame(winIVRInput_IVRInput_010 *_this, VRActionHandle_t action, ETrackingUniverseOrigin eOrigin, winInputPoseActionData_t_11030 * pActionData, uint32_t unActionDataSize, VRInputValueHandle_t ulRestrictToDevice) +EVRInputError __thiscall winIVRInput_IVRInput_010_GetPoseActionDataForNextFrame(winIVRInput_IVRInput_010 *_this, VRActionHandle_t action, ETrackingUniverseOrigin eOrigin, winInputPoseActionData_t_11111 * pActionData, uint32_t unActionDataSize, VRInputValueHandle_t ulRestrictToDevice) { TRACE("%p\n", _this); return cppIVRInput_IVRInput_010_GetPoseActionDataForNextFrame(_this->linux_side, action, eOrigin, pActionData, unActionDataSize, ulRestrictToDevice); } DEFINE_THISCALL_WRAPPER(winIVRInput_IVRInput_010_GetSkeletalActionData, 20) -EVRInputError __thiscall winIVRInput_IVRInput_010_GetSkeletalActionData(winIVRInput_IVRInput_010 *_this, VRActionHandle_t action, winInputSkeletalActionData_t_11030 * pActionData, uint32_t unActionDataSize) +EVRInputError __thiscall winIVRInput_IVRInput_010_GetSkeletalActionData(winIVRInput_IVRInput_010 *_this, VRActionHandle_t action, winInputSkeletalActionData_t_11111 * pActionData, uint32_t unActionDataSize) { TRACE("%p\n", _this); return cppIVRInput_IVRInput_010_GetSkeletalActionData(_this->linux_side, action, pActionData, unActionDataSize); diff --git a/vrclient_x64/vrclient_x64/winIVROverlay.c b/vrclient_x64/vrclient_x64/winIVROverlay.c index 3d946c61..6550d62a 100644 --- a/vrclient_x64/vrclient_x64/winIVROverlay.c +++ b/vrclient_x64/vrclient_x64/winIVROverlay.c @@ -334,7 +334,7 @@ EVROverlayError __thiscall winIVROverlay_IVROverlay_024_GetTransformForOverlayCo } DEFINE_THISCALL_WRAPPER(winIVROverlay_IVROverlay_024_PollNextOverlayEvent, 20) -bool __thiscall winIVROverlay_IVROverlay_024_PollNextOverlayEvent(winIVROverlay_IVROverlay_024 *_this, VROverlayHandle_t ulOverlayHandle, winVREvent_t_11030 * pEvent, uint32_t uncbVREvent) +bool __thiscall winIVROverlay_IVROverlay_024_PollNextOverlayEvent(winIVROverlay_IVROverlay_024 *_this, VROverlayHandle_t ulOverlayHandle, winVREvent_t_11111 * pEvent, uint32_t uncbVREvent) { TRACE("%p\n", _this); return cppIVROverlay_IVROverlay_024_PollNextOverlayEvent(_this->linux_side, ulOverlayHandle, pEvent, uncbVREvent); diff --git a/vrclient_x64/vrclient_x64/winIVRRenderModels.c b/vrclient_x64/vrclient_x64/winIVRRenderModels.c index 54bba15c..f15ce154 100644 --- a/vrclient_x64/vrclient_x64/winIVRRenderModels.c +++ b/vrclient_x64/vrclient_x64/winIVRRenderModels.c @@ -26,28 +26,28 @@ typedef struct __winIVRRenderModels_IVRRenderModels_006 { } winIVRRenderModels_IVRRenderModels_006; DEFINE_THISCALL_WRAPPER(winIVRRenderModels_IVRRenderModels_006_LoadRenderModel_Async, 12) -EVRRenderModelError __thiscall winIVRRenderModels_IVRRenderModels_006_LoadRenderModel_Async(winIVRRenderModels_IVRRenderModels_006 *_this, const char * pchRenderModelName, winRenderModel_t_11030 ** ppRenderModel) +EVRRenderModelError __thiscall winIVRRenderModels_IVRRenderModels_006_LoadRenderModel_Async(winIVRRenderModels_IVRRenderModels_006 *_this, const char * pchRenderModelName, winRenderModel_t_11111 ** ppRenderModel) { TRACE("%p\n", _this); return cppIVRRenderModels_IVRRenderModels_006_LoadRenderModel_Async(_this->linux_side, pchRenderModelName, ppRenderModel); } DEFINE_THISCALL_WRAPPER(winIVRRenderModels_IVRRenderModels_006_FreeRenderModel, 8) -void __thiscall winIVRRenderModels_IVRRenderModels_006_FreeRenderModel(winIVRRenderModels_IVRRenderModels_006 *_this, winRenderModel_t_11030 * pRenderModel) +void __thiscall winIVRRenderModels_IVRRenderModels_006_FreeRenderModel(winIVRRenderModels_IVRRenderModels_006 *_this, winRenderModel_t_11111 * pRenderModel) { TRACE("%p\n", _this); cppIVRRenderModels_IVRRenderModels_006_FreeRenderModel(_this->linux_side, pRenderModel); } DEFINE_THISCALL_WRAPPER(winIVRRenderModels_IVRRenderModels_006_LoadTexture_Async, 12) -EVRRenderModelError __thiscall winIVRRenderModels_IVRRenderModels_006_LoadTexture_Async(winIVRRenderModels_IVRRenderModels_006 *_this, TextureID_t textureId, winRenderModel_TextureMap_t_11030 ** ppTexture) +EVRRenderModelError __thiscall winIVRRenderModels_IVRRenderModels_006_LoadTexture_Async(winIVRRenderModels_IVRRenderModels_006 *_this, TextureID_t textureId, winRenderModel_TextureMap_t_11111 ** ppTexture) { TRACE("%p\n", _this); return cppIVRRenderModels_IVRRenderModels_006_LoadTexture_Async(_this->linux_side, textureId, ppTexture); } DEFINE_THISCALL_WRAPPER(winIVRRenderModels_IVRRenderModels_006_FreeTexture, 8) -void __thiscall winIVRRenderModels_IVRRenderModels_006_FreeTexture(winIVRRenderModels_IVRRenderModels_006 *_this, winRenderModel_TextureMap_t_11030 * pTexture) +void __thiscall winIVRRenderModels_IVRRenderModels_006_FreeTexture(winIVRRenderModels_IVRRenderModels_006 *_this, winRenderModel_TextureMap_t_11111 * pTexture) { TRACE("%p\n", _this); cppIVRRenderModels_IVRRenderModels_006_FreeTexture(_this->linux_side, pTexture); diff --git a/vrclient_x64/vrclient_x64/winIVRSystem.c b/vrclient_x64/vrclient_x64/winIVRSystem.c index c168bc6a..be371e49 100644 --- a/vrclient_x64/vrclient_x64/winIVRSystem.c +++ b/vrclient_x64/vrclient_x64/winIVRSystem.c @@ -241,14 +241,14 @@ const char * __thiscall winIVRSystem_IVRSystem_021_GetPropErrorNameFromEnum(winI } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_021_PollNextEvent, 12) -bool __thiscall winIVRSystem_IVRSystem_021_PollNextEvent(winIVRSystem_IVRSystem_021 *_this, winVREvent_t_11030 * pEvent, uint32_t uncbVREvent) +bool __thiscall winIVRSystem_IVRSystem_021_PollNextEvent(winIVRSystem_IVRSystem_021 *_this, winVREvent_t_11111 * pEvent, uint32_t uncbVREvent) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_021_PollNextEvent(_this->linux_side, pEvent, uncbVREvent); } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_021_PollNextEventWithPose, 20) -bool __thiscall winIVRSystem_IVRSystem_021_PollNextEventWithPose(winIVRSystem_IVRSystem_021 *_this, ETrackingUniverseOrigin eOrigin, winVREvent_t_11030 * pEvent, uint32_t uncbVREvent, TrackedDevicePose_t * pTrackedDevicePose) +bool __thiscall winIVRSystem_IVRSystem_021_PollNextEventWithPose(winIVRSystem_IVRSystem_021 *_this, ETrackingUniverseOrigin eOrigin, winVREvent_t_11111 * pEvent, uint32_t uncbVREvent, TrackedDevicePose_t * pTrackedDevicePose) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_021_PollNextEventWithPose(_this->linux_side, eOrigin, pEvent, uncbVREvent, pTrackedDevicePose); @@ -270,14 +270,14 @@ HiddenAreaMesh_t *__thiscall winIVRSystem_IVRSystem_021_GetHiddenAreaMesh(winIVR } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_021_GetControllerState, 16) -bool __thiscall winIVRSystem_IVRSystem_021_GetControllerState(winIVRSystem_IVRSystem_021 *_this, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_11030 * pControllerState, uint32_t unControllerStateSize) +bool __thiscall winIVRSystem_IVRSystem_021_GetControllerState(winIVRSystem_IVRSystem_021 *_this, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_11111 * pControllerState, uint32_t unControllerStateSize) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_021_GetControllerState(_this->linux_side, unControllerDeviceIndex, pControllerState, unControllerStateSize); } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_021_GetControllerStateWithPose, 24) -bool __thiscall winIVRSystem_IVRSystem_021_GetControllerStateWithPose(winIVRSystem_IVRSystem_021 *_this, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_11030 * pControllerState, uint32_t unControllerStateSize, TrackedDevicePose_t * pTrackedDevicePose) +bool __thiscall winIVRSystem_IVRSystem_021_GetControllerStateWithPose(winIVRSystem_IVRSystem_021 *_this, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_11111 * pControllerState, uint32_t unControllerStateSize, TrackedDevicePose_t * pTrackedDevicePose) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_021_GetControllerStateWithPose(_this->linux_side, eOrigin, unControllerDeviceIndex, pControllerState, unControllerStateSize, pTrackedDevicePose); diff --git a/vrclient_x64/vrclient_x64/winIVRTrackedCamera.c b/vrclient_x64/vrclient_x64/winIVRTrackedCamera.c index 0df66595..8dfd4eca 100644 --- a/vrclient_x64/vrclient_x64/winIVRTrackedCamera.c +++ b/vrclient_x64/vrclient_x64/winIVRTrackedCamera.c @@ -75,7 +75,7 @@ EVRTrackedCameraError __thiscall winIVRTrackedCamera_IVRTrackedCamera_006_Releas } DEFINE_THISCALL_WRAPPER(winIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStreamFrameBuffer, 32) -EVRTrackedCameraError __thiscall winIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStreamFrameBuffer(winIVRTrackedCamera_IVRTrackedCamera_006 *_this, TrackedCameraHandle_t hTrackedCamera, EVRTrackedCameraFrameType eFrameType, void * pFrameBuffer, uint32_t nFrameBufferSize, winCameraVideoStreamFrameHeader_t_11030 * pFrameHeader, uint32_t nFrameHeaderSize) +EVRTrackedCameraError __thiscall winIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStreamFrameBuffer(winIVRTrackedCamera_IVRTrackedCamera_006 *_this, TrackedCameraHandle_t hTrackedCamera, EVRTrackedCameraFrameType eFrameType, void * pFrameBuffer, uint32_t nFrameBufferSize, winCameraVideoStreamFrameHeader_t_11111 * pFrameHeader, uint32_t nFrameHeaderSize) { TRACE("%p\n", _this); return cppIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStreamFrameBuffer(_this->linux_side, hTrackedCamera, eFrameType, pFrameBuffer, nFrameBufferSize, pFrameHeader, nFrameHeaderSize); @@ -89,14 +89,14 @@ EVRTrackedCameraError __thiscall winIVRTrackedCamera_IVRTrackedCamera_006_GetVid } DEFINE_THISCALL_WRAPPER(winIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStreamTextureD3D11, 32) -EVRTrackedCameraError __thiscall winIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStreamTextureD3D11(winIVRTrackedCamera_IVRTrackedCamera_006 *_this, TrackedCameraHandle_t hTrackedCamera, EVRTrackedCameraFrameType eFrameType, void * pD3D11DeviceOrResource, void ** ppD3D11ShaderResourceView, winCameraVideoStreamFrameHeader_t_11030 * pFrameHeader, uint32_t nFrameHeaderSize) +EVRTrackedCameraError __thiscall winIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStreamTextureD3D11(winIVRTrackedCamera_IVRTrackedCamera_006 *_this, TrackedCameraHandle_t hTrackedCamera, EVRTrackedCameraFrameType eFrameType, void * pD3D11DeviceOrResource, void ** ppD3D11ShaderResourceView, winCameraVideoStreamFrameHeader_t_11111 * pFrameHeader, uint32_t nFrameHeaderSize) { TRACE("%p\n", _this); return cppIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStreamTextureD3D11(_this->linux_side, hTrackedCamera, eFrameType, pD3D11DeviceOrResource, ppD3D11ShaderResourceView, pFrameHeader, nFrameHeaderSize); } DEFINE_THISCALL_WRAPPER(winIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStreamTextureGL, 28) -EVRTrackedCameraError __thiscall winIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStreamTextureGL(winIVRTrackedCamera_IVRTrackedCamera_006 *_this, TrackedCameraHandle_t hTrackedCamera, EVRTrackedCameraFrameType eFrameType, glUInt_t * pglTextureId, winCameraVideoStreamFrameHeader_t_11030 * pFrameHeader, uint32_t nFrameHeaderSize) +EVRTrackedCameraError __thiscall winIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStreamTextureGL(winIVRTrackedCamera_IVRTrackedCamera_006 *_this, TrackedCameraHandle_t hTrackedCamera, EVRTrackedCameraFrameType eFrameType, glUInt_t * pglTextureId, winCameraVideoStreamFrameHeader_t_11111 * pFrameHeader, uint32_t nFrameHeaderSize) { TRACE("%p\n", _this); return cppIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStreamTextureGL(_this->linux_side, hTrackedCamera, eFrameType, pglTextureId, pFrameHeader, nFrameHeaderSize); diff --git a/vrclient_x64/vrclient_x64/win_constructors.h b/vrclient_x64/vrclient_x64/win_constructors.h index d9a3d79f..c9e3368d 100644 --- a/vrclient_x64/vrclient_x64/win_constructors.h +++ b/vrclient_x64/vrclient_x64/win_constructors.h @@ -34,12 +34,12 @@ extern void *create_winIVRInput_IVRInput_010(void *); extern void *create_winIVRInput_IVRInput_010_FnTable(void *); extern void *create_winIVRIOBuffer_IVRIOBuffer_002(void *); extern void *create_winIVRIOBuffer_IVRIOBuffer_002_FnTable(void *); +extern void *create_winIVRClientCore_IVRClientCore_003(void *); +extern void *create_winIVRClientCore_IVRClientCore_003_FnTable(void *); extern void *create_winIVRControlPanel_IVRControlPanel_006(void *); extern void *create_winIVRControlPanel_IVRControlPanel_006_FnTable(void *); extern void *create_winIVRMailbox_IVRMailbox_001(void *); extern void *create_winIVRMailbox_IVRMailbox_001_FnTable(void *); -extern void *create_winIVRClientCore_IVRClientCore_003(void *); -extern void *create_winIVRClientCore_IVRClientCore_003_FnTable(void *); extern void *create_winIVRCompositor_IVRCompositor_024(void *); extern void *create_winIVRCompositor_IVRCompositor_024_FnTable(void *); extern void *create_winIVROverlay_IVROverlay_022(void *); diff --git a/vrclient_x64/vrclient_x64/win_constructors_table.dat b/vrclient_x64/vrclient_x64/win_constructors_table.dat index dcdc7042..87d1f652 100644 --- a/vrclient_x64/vrclient_x64/win_constructors_table.dat +++ b/vrclient_x64/vrclient_x64/win_constructors_table.dat @@ -34,12 +34,12 @@ {"FnTable:IVRInput_010", &create_winIVRInput_IVRInput_010_FnTable, &destroy_winIVRInput_IVRInput_010_FnTable}, {"IVRIOBuffer_002", &create_winIVRIOBuffer_IVRIOBuffer_002, &destroy_winIVRIOBuffer_IVRIOBuffer_002}, {"FnTable:IVRIOBuffer_002", &create_winIVRIOBuffer_IVRIOBuffer_002_FnTable, &destroy_winIVRIOBuffer_IVRIOBuffer_002_FnTable}, + {"IVRClientCore_003", &create_winIVRClientCore_IVRClientCore_003, &destroy_winIVRClientCore_IVRClientCore_003}, + {"FnTable:IVRClientCore_003", &create_winIVRClientCore_IVRClientCore_003_FnTable, &destroy_winIVRClientCore_IVRClientCore_003_FnTable}, {"IVRControlPanel_006", &create_winIVRControlPanel_IVRControlPanel_006, &destroy_winIVRControlPanel_IVRControlPanel_006}, {"FnTable:IVRControlPanel_006", &create_winIVRControlPanel_IVRControlPanel_006_FnTable, &destroy_winIVRControlPanel_IVRControlPanel_006_FnTable}, {"IVRMailbox_001", &create_winIVRMailbox_IVRMailbox_001, &destroy_winIVRMailbox_IVRMailbox_001}, {"FnTable:IVRMailbox_001", &create_winIVRMailbox_IVRMailbox_001_FnTable, &destroy_winIVRMailbox_IVRMailbox_001_FnTable}, - {"IVRClientCore_003", &create_winIVRClientCore_IVRClientCore_003, &destroy_winIVRClientCore_IVRClientCore_003}, - {"FnTable:IVRClientCore_003", &create_winIVRClientCore_IVRClientCore_003_FnTable, &destroy_winIVRClientCore_IVRClientCore_003_FnTable}, {"IVRCompositor_024", &create_winIVRCompositor_IVRCompositor_024, &destroy_winIVRCompositor_IVRCompositor_024}, {"FnTable:IVRCompositor_024", &create_winIVRCompositor_IVRCompositor_024_FnTable, &destroy_winIVRCompositor_IVRCompositor_024_FnTable}, {"IVROverlay_022", &create_winIVROverlay_IVROverlay_022, &destroy_winIVROverlay_IVROverlay_022}, diff --git a/vrclient_x64/vrclient_x64/win_destructors.h b/vrclient_x64/vrclient_x64/win_destructors.h index 8aed697e..b724a22d 100644 --- a/vrclient_x64/vrclient_x64/win_destructors.h +++ b/vrclient_x64/vrclient_x64/win_destructors.h @@ -34,12 +34,12 @@ extern void destroy_winIVRInput_IVRInput_010(void *); extern void destroy_winIVRInput_IVRInput_010_FnTable(void *); extern void destroy_winIVRIOBuffer_IVRIOBuffer_002(void *); extern void destroy_winIVRIOBuffer_IVRIOBuffer_002_FnTable(void *); +extern void destroy_winIVRClientCore_IVRClientCore_003(void *); +extern void destroy_winIVRClientCore_IVRClientCore_003_FnTable(void *); extern void destroy_winIVRControlPanel_IVRControlPanel_006(void *); extern void destroy_winIVRControlPanel_IVRControlPanel_006_FnTable(void *); extern void destroy_winIVRMailbox_IVRMailbox_001(void *); extern void destroy_winIVRMailbox_IVRMailbox_001_FnTable(void *); -extern void destroy_winIVRClientCore_IVRClientCore_003(void *); -extern void destroy_winIVRClientCore_IVRClientCore_003_FnTable(void *); extern void destroy_winIVRCompositor_IVRCompositor_024(void *); extern void destroy_winIVRCompositor_IVRCompositor_024_FnTable(void *); extern void destroy_winIVROverlay_IVROverlay_022(void *);