diff --git a/vrclient_x64/gen_wrapper.py b/vrclient_x64/gen_wrapper.py index 97540bd7..1475f65b 100755 --- a/vrclient_x64/gen_wrapper.py +++ b/vrclient_x64/gen_wrapper.py @@ -81,9 +81,6 @@ files = [ "IVRSettings", "IVRSystem", "IVRTrackedCamera", - ], [ #user-allocated structs - "VRControllerState001_t", - "VREvent_t", ], [ #vrclient-allocated structs "RenderModel_t", "RenderModel_TextureMap_t", @@ -92,7 +89,6 @@ files = [ ("ivrclientcore.h", [ #classes "IVRClientCore", - ], [ #user-allocated structs ], [ #vrclient-allocated structs ] ), @@ -376,10 +372,7 @@ def handle_method(cfile, classname, winclassname, cppname, method, cpp, cpp_h, e while real_type.kind == clang.cindex.TypeKind.POINTER: real_type = real_type.get_pointee() if param.type.kind == clang.cindex.TypeKind.POINTER: - if strip_ns(param.type.get_pointee().get_canonical().spelling) in user_structs: - do_lin_to_win = (strip_ns(param.type.get_pointee().get_canonical().spelling), param.spelling) - typename = "win" + do_lin_to_win[0] + "_" + display_sdkver(sdkver) + " *" - elif strip_ns(param.type.get_pointee().get_canonical().spelling) in system_structs: + if strip_ns(param.type.get_pointee().get_canonical().spelling) in system_structs: do_unwrap = (strip_ns(param.type.get_pointee().get_canonical().spelling), param.spelling) typename = "win" + do_unwrap[0] + "_" + display_sdkver(sdkver) + " *" elif param.type.get_pointee().get_canonical().kind == clang.cindex.TypeKind.POINTER and \ @@ -392,7 +385,6 @@ def handle_method(cfile, classname, winclassname, cppname, method, cpp, cpp_h, e if not real_type.is_const_qualified(): do_lin_to_win = (strip_const(strip_ns(real_type.spelling)), param.spelling) #preserve pointers - print("typename: \"" + typename + "\" real_type.spelling: \"" + real_type.spelling + "\"") typename = typename.replace(strip_ns(real_type.spelling), "win%s_%s" % (strip_ns(real_type.spelling), display_sdkver(sdkver))) if param.spelling == "": @@ -833,9 +825,6 @@ def handle_struct(sdkver, struct): which.add(LIN_TO_WIN) which.add(WIN_TO_LIN) - if strip_ns(vrchild.displayname) in user_structs: - which.add(LIN_TO_WIN) - if strip_ns(vrchild.displayname) in system_structs: which.add(WRAPPERS) @@ -1247,7 +1236,7 @@ for sdkver in sdk_versions: iface, version = result.group(1, 2) iface_versions[iface] = version - for fname, classes, user_structs, system_structs in files: + for fname, classes, system_structs in files: # Parse as 32-bit C++ input_name = "openvr_%s/%s" % (sdkver, fname) sys.stdout.write("about to parse %s\n" % input_name) diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_001.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_001.cpp index 608ff5cb..a164e83c 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_001.cpp +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_001.cpp @@ -139,14 +139,9 @@ bool cppIVROverlay_IVROverlay_001_IsOverlayVisible(void *linux_side, VROverlayHa return ((IVROverlay*)linux_side)->IsOverlayVisible((vr::VROverlayHandle_t)ulOverlayHandle); } -bool cppIVROverlay_IVROverlay_001_PollNextOverlayEvent(void *linux_side, VROverlayHandle_t ulOverlayHandle, winVREvent_t_092 * pEvent) +bool cppIVROverlay_IVROverlay_001_PollNextOverlayEvent(void *linux_side, VROverlayHandle_t ulOverlayHandle, VREvent_t * pEvent) { - VREvent_t lin; - bool _ret; - _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr); - if(pEvent) - struct_VREvent_t_092_lin_to_win(&lin, pEvent); - return _ret; + return ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, (vr::VREvent_t *)pEvent); } vr::VROverlayError cppIVROverlay_IVROverlay_001_GetOverlayInputMethod(void *linux_side, VROverlayHandle_t ulOverlayHandle, VROverlayInputMethod * peInputMethod) diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_001.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_001.h index 255ac71e..bd72d946 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_001.h +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_001.h @@ -27,7 +27,7 @@ extern VROverlayError cppIVROverlay_IVROverlay_001_SetOverlayVisibility(void *, extern VROverlayError cppIVROverlay_IVROverlay_001_ShowOverlay(void *, VROverlayHandle_t); extern VROverlayError cppIVROverlay_IVROverlay_001_HideOverlay(void *, VROverlayHandle_t); extern bool cppIVROverlay_IVROverlay_001_IsOverlayVisible(void *, VROverlayHandle_t); -extern bool cppIVROverlay_IVROverlay_001_PollNextOverlayEvent(void *, VROverlayHandle_t, winVREvent_t_092 *); +extern bool cppIVROverlay_IVROverlay_001_PollNextOverlayEvent(void *, VROverlayHandle_t, VREvent_t *); extern VROverlayError cppIVROverlay_IVROverlay_001_GetOverlayInputMethod(void *, VROverlayHandle_t, VROverlayInputMethod *); extern VROverlayError cppIVROverlay_IVROverlay_001_SetOverlayInputMethod(void *, VROverlayHandle_t, VROverlayInputMethod); extern VROverlayError cppIVROverlay_IVROverlay_001_GetOverlayMouseScale(void *, VROverlayHandle_t, HmdVector2_t *); diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_002.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_002.cpp index 8bb7803a..5e5f3498 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_002.cpp +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_002.cpp @@ -139,14 +139,9 @@ bool cppIVROverlay_IVROverlay_002_IsOverlayVisible(void *linux_side, VROverlayHa return ((IVROverlay*)linux_side)->IsOverlayVisible((vr::VROverlayHandle_t)ulOverlayHandle); } -bool cppIVROverlay_IVROverlay_002_PollNextOverlayEvent(void *linux_side, VROverlayHandle_t ulOverlayHandle, winVREvent_t_094 * pEvent) +bool cppIVROverlay_IVROverlay_002_PollNextOverlayEvent(void *linux_side, VROverlayHandle_t ulOverlayHandle, VREvent_t * pEvent) { - VREvent_t lin; - bool _ret; - _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr); - if(pEvent) - struct_VREvent_t_094_lin_to_win(&lin, pEvent); - return _ret; + return ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, (vr::VREvent_t *)pEvent); } vr::VROverlayError cppIVROverlay_IVROverlay_002_GetOverlayInputMethod(void *linux_side, VROverlayHandle_t ulOverlayHandle, VROverlayInputMethod * peInputMethod) diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_002.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_002.h index 3dec2b3c..f69ddec5 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_002.h +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_002.h @@ -27,7 +27,7 @@ extern VROverlayError cppIVROverlay_IVROverlay_002_GetOverlayTransformTrackedDev extern VROverlayError cppIVROverlay_IVROverlay_002_ShowOverlay(void *, VROverlayHandle_t); extern VROverlayError cppIVROverlay_IVROverlay_002_HideOverlay(void *, VROverlayHandle_t); extern bool cppIVROverlay_IVROverlay_002_IsOverlayVisible(void *, VROverlayHandle_t); -extern bool cppIVROverlay_IVROverlay_002_PollNextOverlayEvent(void *, VROverlayHandle_t, winVREvent_t_094 *); +extern bool cppIVROverlay_IVROverlay_002_PollNextOverlayEvent(void *, VROverlayHandle_t, VREvent_t *); extern VROverlayError cppIVROverlay_IVROverlay_002_GetOverlayInputMethod(void *, VROverlayHandle_t, VROverlayInputMethod *); extern VROverlayError cppIVROverlay_IVROverlay_002_SetOverlayInputMethod(void *, VROverlayHandle_t, VROverlayInputMethod); extern VROverlayError cppIVROverlay_IVROverlay_002_GetOverlayMouseScale(void *, VROverlayHandle_t, HmdVector2_t *); diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_003.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_003.cpp index cfebc324..53b99e74 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_003.cpp +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_003.cpp @@ -154,14 +154,9 @@ bool cppIVROverlay_IVROverlay_003_IsOverlayVisible(void *linux_side, VROverlayHa return ((IVROverlay*)linux_side)->IsOverlayVisible((vr::VROverlayHandle_t)ulOverlayHandle); } -bool cppIVROverlay_IVROverlay_003_PollNextOverlayEvent(void *linux_side, VROverlayHandle_t ulOverlayHandle, winVREvent_t_097 * pEvent) +bool cppIVROverlay_IVROverlay_003_PollNextOverlayEvent(void *linux_side, VROverlayHandle_t ulOverlayHandle, VREvent_t * pEvent) { - VREvent_t lin; - bool _ret; - _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr); - if(pEvent) - struct_VREvent_t_097_lin_to_win(&lin, pEvent); - return _ret; + return ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, (vr::VREvent_t *)pEvent); } vr::VROverlayError cppIVROverlay_IVROverlay_003_GetOverlayInputMethod(void *linux_side, VROverlayHandle_t ulOverlayHandle, VROverlayInputMethod * peInputMethod) diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_003.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_003.h index 0258f401..10e419fe 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_003.h +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_003.h @@ -30,7 +30,7 @@ extern VROverlayError cppIVROverlay_IVROverlay_003_GetOverlayTransformTrackedDev extern VROverlayError cppIVROverlay_IVROverlay_003_ShowOverlay(void *, VROverlayHandle_t); extern VROverlayError cppIVROverlay_IVROverlay_003_HideOverlay(void *, VROverlayHandle_t); extern bool cppIVROverlay_IVROverlay_003_IsOverlayVisible(void *, VROverlayHandle_t); -extern bool cppIVROverlay_IVROverlay_003_PollNextOverlayEvent(void *, VROverlayHandle_t, winVREvent_t_097 *); +extern bool cppIVROverlay_IVROverlay_003_PollNextOverlayEvent(void *, VROverlayHandle_t, VREvent_t *); extern VROverlayError cppIVROverlay_IVROverlay_003_GetOverlayInputMethod(void *, VROverlayHandle_t, VROverlayInputMethod *); extern VROverlayError cppIVROverlay_IVROverlay_003_SetOverlayInputMethod(void *, VROverlayHandle_t, VROverlayInputMethod); extern VROverlayError cppIVROverlay_IVROverlay_003_GetOverlayMouseScale(void *, VROverlayHandle_t, HmdVector2_t *); diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_004.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_004.cpp index 8f3975fc..8abc7a87 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_004.cpp +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_004.cpp @@ -164,14 +164,9 @@ bool cppIVROverlay_IVROverlay_004_IsOverlayVisible(void *linux_side, VROverlayHa return ((IVROverlay*)linux_side)->IsOverlayVisible((vr::VROverlayHandle_t)ulOverlayHandle); } -bool cppIVROverlay_IVROverlay_004_PollNextOverlayEvent(void *linux_side, VROverlayHandle_t ulOverlayHandle, winVREvent_t_098 * pEvent) +bool cppIVROverlay_IVROverlay_004_PollNextOverlayEvent(void *linux_side, VROverlayHandle_t ulOverlayHandle, VREvent_t * pEvent) { - VREvent_t lin; - bool _ret; - _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr); - if(pEvent) - struct_VREvent_t_098_lin_to_win(&lin, pEvent); - return _ret; + return ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, (vr::VREvent_t *)pEvent); } vr::VROverlayError cppIVROverlay_IVROverlay_004_GetOverlayInputMethod(void *linux_side, VROverlayHandle_t ulOverlayHandle, VROverlayInputMethod * peInputMethod) diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_004.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_004.h index 8a0f4104..e02d6ff3 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_004.h +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_004.h @@ -32,7 +32,7 @@ extern VROverlayError cppIVROverlay_IVROverlay_004_GetOverlayTransformTrackedDev extern VROverlayError cppIVROverlay_IVROverlay_004_ShowOverlay(void *, VROverlayHandle_t); extern VROverlayError cppIVROverlay_IVROverlay_004_HideOverlay(void *, VROverlayHandle_t); extern bool cppIVROverlay_IVROverlay_004_IsOverlayVisible(void *, VROverlayHandle_t); -extern bool cppIVROverlay_IVROverlay_004_PollNextOverlayEvent(void *, VROverlayHandle_t, winVREvent_t_098 *); +extern bool cppIVROverlay_IVROverlay_004_PollNextOverlayEvent(void *, VROverlayHandle_t, VREvent_t *); extern VROverlayError cppIVROverlay_IVROverlay_004_GetOverlayInputMethod(void *, VROverlayHandle_t, VROverlayInputMethod *); extern VROverlayError cppIVROverlay_IVROverlay_004_SetOverlayInputMethod(void *, VROverlayHandle_t, VROverlayInputMethod); extern VROverlayError cppIVROverlay_IVROverlay_004_GetOverlayMouseScale(void *, VROverlayHandle_t, HmdVector2_t *); diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_005.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_005.cpp index ac108b32..73fd786c 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_005.cpp +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_005.cpp @@ -164,14 +164,9 @@ bool cppIVROverlay_IVROverlay_005_IsOverlayVisible(void *linux_side, VROverlayHa return ((IVROverlay*)linux_side)->IsOverlayVisible((vr::VROverlayHandle_t)ulOverlayHandle); } -bool cppIVROverlay_IVROverlay_005_PollNextOverlayEvent(void *linux_side, VROverlayHandle_t ulOverlayHandle, winVREvent_t_0910 * pEvent) +bool cppIVROverlay_IVROverlay_005_PollNextOverlayEvent(void *linux_side, VROverlayHandle_t ulOverlayHandle, VREvent_t * pEvent) { - VREvent_t lin; - bool _ret; - _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr); - if(pEvent) - struct_VREvent_t_0910_lin_to_win(&lin, pEvent); - return _ret; + return ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, (vr::VREvent_t *)pEvent); } vr::VROverlayError cppIVROverlay_IVROverlay_005_GetOverlayInputMethod(void *linux_side, VROverlayHandle_t ulOverlayHandle, VROverlayInputMethod * peInputMethod) diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_005.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_005.h index 39b893d4..515699aa 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_005.h +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_005.h @@ -32,7 +32,7 @@ extern VROverlayError cppIVROverlay_IVROverlay_005_GetOverlayTransformTrackedDev extern VROverlayError cppIVROverlay_IVROverlay_005_ShowOverlay(void *, VROverlayHandle_t); extern VROverlayError cppIVROverlay_IVROverlay_005_HideOverlay(void *, VROverlayHandle_t); extern bool cppIVROverlay_IVROverlay_005_IsOverlayVisible(void *, VROverlayHandle_t); -extern bool cppIVROverlay_IVROverlay_005_PollNextOverlayEvent(void *, VROverlayHandle_t, winVREvent_t_0910 *); +extern bool cppIVROverlay_IVROverlay_005_PollNextOverlayEvent(void *, VROverlayHandle_t, VREvent_t *); extern VROverlayError cppIVROverlay_IVROverlay_005_GetOverlayInputMethod(void *, VROverlayHandle_t, VROverlayInputMethod *); extern VROverlayError cppIVROverlay_IVROverlay_005_SetOverlayInputMethod(void *, VROverlayHandle_t, VROverlayInputMethod); extern VROverlayError cppIVROverlay_IVROverlay_005_GetOverlayMouseScale(void *, VROverlayHandle_t, HmdVector2_t *); diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_007.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_007.cpp index 60cb2f3f..1aa3d226 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_007.cpp +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_007.cpp @@ -164,14 +164,9 @@ bool cppIVROverlay_IVROverlay_007_IsOverlayVisible(void *linux_side, VROverlayHa return ((IVROverlay*)linux_side)->IsOverlayVisible((vr::VROverlayHandle_t)ulOverlayHandle); } -bool cppIVROverlay_IVROverlay_007_PollNextOverlayEvent(void *linux_side, VROverlayHandle_t ulOverlayHandle, winVREvent_t_0912 * pEvent) +bool cppIVROverlay_IVROverlay_007_PollNextOverlayEvent(void *linux_side, VROverlayHandle_t ulOverlayHandle, VREvent_t * pEvent) { - VREvent_t lin; - bool _ret; - _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr); - if(pEvent) - struct_VREvent_t_0912_lin_to_win(&lin, pEvent); - return _ret; + return ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, (vr::VREvent_t *)pEvent); } vr::EVROverlayError cppIVROverlay_IVROverlay_007_GetOverlayInputMethod(void *linux_side, VROverlayHandle_t ulOverlayHandle, VROverlayInputMethod * peInputMethod) diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_007.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_007.h index 60de2b29..77341760 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_007.h +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_007.h @@ -32,7 +32,7 @@ extern EVROverlayError cppIVROverlay_IVROverlay_007_GetOverlayTransformTrackedDe extern EVROverlayError cppIVROverlay_IVROverlay_007_ShowOverlay(void *, VROverlayHandle_t); extern EVROverlayError cppIVROverlay_IVROverlay_007_HideOverlay(void *, VROverlayHandle_t); extern bool cppIVROverlay_IVROverlay_007_IsOverlayVisible(void *, VROverlayHandle_t); -extern bool cppIVROverlay_IVROverlay_007_PollNextOverlayEvent(void *, VROverlayHandle_t, winVREvent_t_0912 *); +extern bool cppIVROverlay_IVROverlay_007_PollNextOverlayEvent(void *, VROverlayHandle_t, VREvent_t *); extern EVROverlayError cppIVROverlay_IVROverlay_007_GetOverlayInputMethod(void *, VROverlayHandle_t, VROverlayInputMethod *); extern EVROverlayError cppIVROverlay_IVROverlay_007_SetOverlayInputMethod(void *, VROverlayHandle_t, VROverlayInputMethod); extern EVROverlayError cppIVROverlay_IVROverlay_007_GetOverlayMouseScale(void *, VROverlayHandle_t, HmdVector2_t *); diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_008.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_008.cpp index cc71b943..af2682f5 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_008.cpp +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_008.cpp @@ -169,14 +169,9 @@ vr::EVROverlayError cppIVROverlay_IVROverlay_008_GetTransformForOverlayCoordinat return ((IVROverlay*)linux_side)->GetTransformForOverlayCoordinates((vr::VROverlayHandle_t)ulOverlayHandle, (vr::ETrackingUniverseOrigin)eTrackingOrigin, (vr::HmdVector2_t)coordinatesInOverlay, (vr::HmdMatrix34_t *)pmatTransform); } -bool cppIVROverlay_IVROverlay_008_PollNextOverlayEvent(void *linux_side, VROverlayHandle_t ulOverlayHandle, winVREvent_t_0914 * pEvent) +bool cppIVROverlay_IVROverlay_008_PollNextOverlayEvent(void *linux_side, VROverlayHandle_t ulOverlayHandle, VREvent_t * pEvent) { - VREvent_t lin; - bool _ret; - _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr); - if(pEvent) - struct_VREvent_t_0914_lin_to_win(&lin, pEvent); - return _ret; + return ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, (vr::VREvent_t *)pEvent); } vr::EVROverlayError cppIVROverlay_IVROverlay_008_GetOverlayInputMethod(void *linux_side, VROverlayHandle_t ulOverlayHandle, VROverlayInputMethod * peInputMethod) diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_008.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_008.h index fb0821b7..762b82ad 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_008.h +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_008.h @@ -33,7 +33,7 @@ extern EVROverlayError cppIVROverlay_IVROverlay_008_ShowOverlay(void *, VROverla extern EVROverlayError cppIVROverlay_IVROverlay_008_HideOverlay(void *, VROverlayHandle_t); extern bool cppIVROverlay_IVROverlay_008_IsOverlayVisible(void *, VROverlayHandle_t); extern EVROverlayError cppIVROverlay_IVROverlay_008_GetTransformForOverlayCoordinates(void *, VROverlayHandle_t, ETrackingUniverseOrigin, HmdVector2_t, HmdMatrix34_t *); -extern bool cppIVROverlay_IVROverlay_008_PollNextOverlayEvent(void *, VROverlayHandle_t, winVREvent_t_0914 *); +extern bool cppIVROverlay_IVROverlay_008_PollNextOverlayEvent(void *, VROverlayHandle_t, VREvent_t *); extern EVROverlayError cppIVROverlay_IVROverlay_008_GetOverlayInputMethod(void *, VROverlayHandle_t, VROverlayInputMethod *); extern EVROverlayError cppIVROverlay_IVROverlay_008_SetOverlayInputMethod(void *, VROverlayHandle_t, VROverlayInputMethod); extern EVROverlayError cppIVROverlay_IVROverlay_008_GetOverlayMouseScale(void *, VROverlayHandle_t, HmdVector2_t *); diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_010.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_010.cpp index b29d13a9..7d35335a 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_010.cpp +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_010.cpp @@ -183,6 +183,8 @@ bool cppIVROverlay_IVROverlay_010_PollNextOverlayEvent(void *linux_side, VROverl { VREvent_t lin; bool _ret; + if(pEvent) + struct_VREvent_t_0918_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_0918_lin_to_win(&lin, pEvent); diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_011.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_011.cpp index d69da0ed..0b627d15 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_011.cpp +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_011.cpp @@ -193,6 +193,8 @@ bool cppIVROverlay_IVROverlay_011_PollNextOverlayEvent(void *linux_side, VROverl { VREvent_t lin; bool _ret; + if(pEvent) + struct_VREvent_t_0920_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_0920_lin_to_win(&lin, pEvent); diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_012.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_012.cpp index 67209dd7..9b60e3d7 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_012.cpp +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_012.cpp @@ -193,6 +193,8 @@ bool cppIVROverlay_IVROverlay_012_PollNextOverlayEvent(void *linux_side, VROverl { VREvent_t lin; bool _ret; + if(pEvent) + struct_VREvent_t_101_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_101_lin_to_win(&lin, pEvent); diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_013.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_013.cpp index dd0ab5fb..837d02a4 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_013.cpp +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_013.cpp @@ -213,6 +213,8 @@ bool cppIVROverlay_IVROverlay_013_PollNextOverlayEvent(void *linux_side, VROverl { VREvent_t lin; bool _ret; + if(pEvent) + struct_VREvent_t_104_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_104_lin_to_win(&lin, pEvent); diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_014.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_014.cpp index 9f5f7ab0..19b07514 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_014.cpp +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_014.cpp @@ -213,6 +213,8 @@ bool cppIVROverlay_IVROverlay_014_PollNextOverlayEvent(void *linux_side, VROverl { VREvent_t lin; bool _ret; + if(pEvent) + struct_VREvent_t_106_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_106_lin_to_win(&lin, pEvent); diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_016.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_016.cpp index 556251f6..eff884a9 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_016.cpp +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_016.cpp @@ -238,6 +238,8 @@ bool cppIVROverlay_IVROverlay_016_PollNextOverlayEvent(void *linux_side, VROverl { VREvent_t lin; bool _ret; + if(pEvent) + struct_VREvent_t_1010_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_1010_lin_to_win(&lin, pEvent); diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_017.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_017.cpp index c11ba3a5..11613550 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_017.cpp +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_017.cpp @@ -238,6 +238,8 @@ bool cppIVROverlay_IVROverlay_017_PollNextOverlayEvent(void *linux_side, VROverl { VREvent_t lin; bool _ret; + if(pEvent) + struct_VREvent_t_1011_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_1011_lin_to_win(&lin, pEvent); diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_018.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_018.cpp index afe574e1..085a0f2d 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_018.cpp +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_018.cpp @@ -238,6 +238,8 @@ bool cppIVROverlay_IVROverlay_018_PollNextOverlayEvent(void *linux_side, VROverl { VREvent_t lin; bool _ret; + if(pEvent) + struct_VREvent_t_1017_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_1017_lin_to_win(&lin, pEvent); diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_019.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_019.cpp index 9017f186..f776e508 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_019.cpp +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_019.cpp @@ -238,6 +238,8 @@ bool cppIVROverlay_IVROverlay_019_PollNextOverlayEvent(void *linux_side, VROverl { VREvent_t lin; bool _ret; + if(pEvent) + struct_VREvent_t_1610_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_1610_lin_to_win(&lin, pEvent); diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_003.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_003.cpp index bd67c200..f299ffce 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_003.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_003.cpp @@ -134,24 +134,14 @@ const char * cppIVRSystem_IVRSystem_003_GetPropErrorNameFromEnum(void *linux_sid return ((IVRSystem*)linux_side)->GetPropErrorNameFromEnum((vr::TrackedPropertyError)error); } -bool cppIVRSystem_IVRSystem_003_PollNextEvent(void *linux_side, winVREvent_t_091 * pEvent) +bool cppIVRSystem_IVRSystem_003_PollNextEvent(void *linux_side, VREvent_t * pEvent) { - VREvent_t lin; - bool _ret; - _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr); - if(pEvent) - struct_VREvent_t_091_lin_to_win(&lin, pEvent); - return _ret; + return ((IVRSystem*)linux_side)->PollNextEvent((vr::VREvent_t *)pEvent); } -bool cppIVRSystem_IVRSystem_003_PollNextEventWithPose(void *linux_side, TrackingUniverseOrigin eOrigin, winVREvent_t_091 * pEvent, TrackedDevicePose_t * pTrackedDevicePose) +bool cppIVRSystem_IVRSystem_003_PollNextEventWithPose(void *linux_side, TrackingUniverseOrigin eOrigin, VREvent_t * pEvent, TrackedDevicePose_t * pTrackedDevicePose) { - VREvent_t lin; - bool _ret; - _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::TrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, (vr::TrackedDevicePose_t *)pTrackedDevicePose); - if(pEvent) - struct_VREvent_t_091_lin_to_win(&lin, pEvent); - return _ret; + return ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::TrackingUniverseOrigin)eOrigin, (vr::VREvent_t *)pEvent, (vr::TrackedDevicePose_t *)pTrackedDevicePose); } const char * cppIVRSystem_IVRSystem_003_GetEventTypeNameFromEnum(void *linux_side, EVREventType eType) @@ -164,23 +154,27 @@ vr::HiddenAreaMesh_t cppIVRSystem_IVRSystem_003_GetHiddenAreaMesh(void *linux_si return ((IVRSystem*)linux_side)->GetHiddenAreaMesh((vr::Hmd_Eye)eEye); } -bool cppIVRSystem_IVRSystem_003_GetControllerState(void *linux_side, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_091 * pControllerState) +bool cppIVRSystem_IVRSystem_003_GetControllerState(void *linux_side, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_091 * pControllerState) { - VRControllerState001_t lin; + VRControllerState_t lin; bool _ret; + if(pControllerState) + struct_VRControllerState_t_091_win_to_lin(pControllerState, &lin); _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr); if(pControllerState) - struct_VRControllerState001_t_091_lin_to_win(&lin, pControllerState); + struct_VRControllerState_t_091_lin_to_win(&lin, pControllerState); return _ret; } -bool cppIVRSystem_IVRSystem_003_GetControllerStateWithPose(void *linux_side, TrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_091 * pControllerState, TrackedDevicePose_t * pTrackedDevicePose) +bool cppIVRSystem_IVRSystem_003_GetControllerStateWithPose(void *linux_side, TrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_091 * pControllerState, TrackedDevicePose_t * pTrackedDevicePose) { - VRControllerState001_t lin; + VRControllerState_t lin; bool _ret; + if(pControllerState) + struct_VRControllerState_t_091_win_to_lin(pControllerState, &lin); _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::TrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (vr::TrackedDevicePose_t *)pTrackedDevicePose); if(pControllerState) - struct_VRControllerState001_t_091_lin_to_win(&lin, pControllerState); + struct_VRControllerState_t_091_lin_to_win(&lin, pControllerState); return _ret; } diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_003.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_003.h index dd7ef8f9..4592e73d 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_003.h +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_003.h @@ -26,12 +26,12 @@ extern uint64_t cppIVRSystem_IVRSystem_003_GetUint64TrackedDeviceProperty(void * extern HmdMatrix34_t cppIVRSystem_IVRSystem_003_GetMatrix34TrackedDeviceProperty(void *, TrackedDeviceIndex_t, TrackedDeviceProperty, TrackedPropertyError *); extern uint32_t cppIVRSystem_IVRSystem_003_GetStringTrackedDeviceProperty(void *, TrackedDeviceIndex_t, TrackedDeviceProperty, char *, uint32_t, TrackedPropertyError *); extern const char * cppIVRSystem_IVRSystem_003_GetPropErrorNameFromEnum(void *, TrackedPropertyError); -extern bool cppIVRSystem_IVRSystem_003_PollNextEvent(void *, winVREvent_t_091 *); -extern bool cppIVRSystem_IVRSystem_003_PollNextEventWithPose(void *, TrackingUniverseOrigin, winVREvent_t_091 *, TrackedDevicePose_t *); +extern bool cppIVRSystem_IVRSystem_003_PollNextEvent(void *, VREvent_t *); +extern bool cppIVRSystem_IVRSystem_003_PollNextEventWithPose(void *, TrackingUniverseOrigin, VREvent_t *, TrackedDevicePose_t *); extern const char * cppIVRSystem_IVRSystem_003_GetEventTypeNameFromEnum(void *, EVREventType); extern HiddenAreaMesh_t cppIVRSystem_IVRSystem_003_GetHiddenAreaMesh(void *, Hmd_Eye); -extern bool cppIVRSystem_IVRSystem_003_GetControllerState(void *, TrackedDeviceIndex_t, winVRControllerState001_t_091 *); -extern bool cppIVRSystem_IVRSystem_003_GetControllerStateWithPose(void *, TrackingUniverseOrigin, TrackedDeviceIndex_t, winVRControllerState001_t_091 *, TrackedDevicePose_t *); +extern bool cppIVRSystem_IVRSystem_003_GetControllerState(void *, TrackedDeviceIndex_t, winVRControllerState_t_091 *); +extern bool cppIVRSystem_IVRSystem_003_GetControllerStateWithPose(void *, TrackingUniverseOrigin, TrackedDeviceIndex_t, winVRControllerState_t_091 *, TrackedDevicePose_t *); extern void cppIVRSystem_IVRSystem_003_TriggerHapticPulse(void *, TrackedDeviceIndex_t, uint32_t, unsigned short); extern const char * cppIVRSystem_IVRSystem_003_GetButtonIdNameFromEnum(void *, EVRButtonId); extern const char * cppIVRSystem_IVRSystem_003_GetControllerAxisTypeNameFromEnum(void *, EVRControllerAxisType); diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_004.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_004.cpp index df29c552..84959432 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_004.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_004.cpp @@ -124,24 +124,14 @@ const char * cppIVRSystem_IVRSystem_004_GetPropErrorNameFromEnum(void *linux_sid return ((IVRSystem*)linux_side)->GetPropErrorNameFromEnum((vr::TrackedPropertyError)error); } -bool cppIVRSystem_IVRSystem_004_PollNextEvent(void *linux_side, winVREvent_t_092 * pEvent) +bool cppIVRSystem_IVRSystem_004_PollNextEvent(void *linux_side, VREvent_t * pEvent) { - VREvent_t lin; - bool _ret; - _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr); - if(pEvent) - struct_VREvent_t_092_lin_to_win(&lin, pEvent); - return _ret; + return ((IVRSystem*)linux_side)->PollNextEvent((vr::VREvent_t *)pEvent); } -bool cppIVRSystem_IVRSystem_004_PollNextEventWithPose(void *linux_side, TrackingUniverseOrigin eOrigin, winVREvent_t_092 * pEvent, TrackedDevicePose_t * pTrackedDevicePose) +bool cppIVRSystem_IVRSystem_004_PollNextEventWithPose(void *linux_side, TrackingUniverseOrigin eOrigin, VREvent_t * pEvent, TrackedDevicePose_t * pTrackedDevicePose) { - VREvent_t lin; - bool _ret; - _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::TrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, (vr::TrackedDevicePose_t *)pTrackedDevicePose); - if(pEvent) - struct_VREvent_t_092_lin_to_win(&lin, pEvent); - return _ret; + return ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::TrackingUniverseOrigin)eOrigin, (vr::VREvent_t *)pEvent, (vr::TrackedDevicePose_t *)pTrackedDevicePose); } const char * cppIVRSystem_IVRSystem_004_GetEventTypeNameFromEnum(void *linux_side, EVREventType eType) @@ -154,23 +144,27 @@ vr::HiddenAreaMesh_t cppIVRSystem_IVRSystem_004_GetHiddenAreaMesh(void *linux_si return ((IVRSystem*)linux_side)->GetHiddenAreaMesh((vr::Hmd_Eye)eEye); } -bool cppIVRSystem_IVRSystem_004_GetControllerState(void *linux_side, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_092 * pControllerState) +bool cppIVRSystem_IVRSystem_004_GetControllerState(void *linux_side, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_092 * pControllerState) { - VRControllerState001_t lin; + VRControllerState_t lin; bool _ret; + if(pControllerState) + struct_VRControllerState_t_092_win_to_lin(pControllerState, &lin); _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr); if(pControllerState) - struct_VRControllerState001_t_092_lin_to_win(&lin, pControllerState); + struct_VRControllerState_t_092_lin_to_win(&lin, pControllerState); return _ret; } -bool cppIVRSystem_IVRSystem_004_GetControllerStateWithPose(void *linux_side, TrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_092 * pControllerState, TrackedDevicePose_t * pTrackedDevicePose) +bool cppIVRSystem_IVRSystem_004_GetControllerStateWithPose(void *linux_side, TrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_092 * pControllerState, TrackedDevicePose_t * pTrackedDevicePose) { - VRControllerState001_t lin; + VRControllerState_t lin; bool _ret; + if(pControllerState) + struct_VRControllerState_t_092_win_to_lin(pControllerState, &lin); _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::TrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (vr::TrackedDevicePose_t *)pTrackedDevicePose); if(pControllerState) - struct_VRControllerState001_t_092_lin_to_win(&lin, pControllerState); + struct_VRControllerState_t_092_lin_to_win(&lin, pControllerState); return _ret; } diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_004.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_004.h index a249b4a9..cb1eaae7 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_004.h +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_004.h @@ -24,12 +24,12 @@ extern uint64_t cppIVRSystem_IVRSystem_004_GetUint64TrackedDeviceProperty(void * extern HmdMatrix34_t cppIVRSystem_IVRSystem_004_GetMatrix34TrackedDeviceProperty(void *, TrackedDeviceIndex_t, TrackedDeviceProperty, TrackedPropertyError *); extern uint32_t cppIVRSystem_IVRSystem_004_GetStringTrackedDeviceProperty(void *, TrackedDeviceIndex_t, TrackedDeviceProperty, char *, uint32_t, TrackedPropertyError *); extern const char * cppIVRSystem_IVRSystem_004_GetPropErrorNameFromEnum(void *, TrackedPropertyError); -extern bool cppIVRSystem_IVRSystem_004_PollNextEvent(void *, winVREvent_t_092 *); -extern bool cppIVRSystem_IVRSystem_004_PollNextEventWithPose(void *, TrackingUniverseOrigin, winVREvent_t_092 *, TrackedDevicePose_t *); +extern bool cppIVRSystem_IVRSystem_004_PollNextEvent(void *, VREvent_t *); +extern bool cppIVRSystem_IVRSystem_004_PollNextEventWithPose(void *, TrackingUniverseOrigin, VREvent_t *, TrackedDevicePose_t *); extern const char * cppIVRSystem_IVRSystem_004_GetEventTypeNameFromEnum(void *, EVREventType); extern HiddenAreaMesh_t cppIVRSystem_IVRSystem_004_GetHiddenAreaMesh(void *, Hmd_Eye); -extern bool cppIVRSystem_IVRSystem_004_GetControllerState(void *, TrackedDeviceIndex_t, winVRControllerState001_t_092 *); -extern bool cppIVRSystem_IVRSystem_004_GetControllerStateWithPose(void *, TrackingUniverseOrigin, TrackedDeviceIndex_t, winVRControllerState001_t_092 *, TrackedDevicePose_t *); +extern bool cppIVRSystem_IVRSystem_004_GetControllerState(void *, TrackedDeviceIndex_t, winVRControllerState_t_092 *); +extern bool cppIVRSystem_IVRSystem_004_GetControllerStateWithPose(void *, TrackingUniverseOrigin, TrackedDeviceIndex_t, winVRControllerState_t_092 *, TrackedDevicePose_t *); extern void cppIVRSystem_IVRSystem_004_TriggerHapticPulse(void *, TrackedDeviceIndex_t, uint32_t, unsigned short); extern const char * cppIVRSystem_IVRSystem_004_GetButtonIdNameFromEnum(void *, EVRButtonId); extern const char * cppIVRSystem_IVRSystem_004_GetControllerAxisTypeNameFromEnum(void *, EVRControllerAxisType); diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_005.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_005.cpp index b66f8f6e..66098261 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_005.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_005.cpp @@ -129,24 +129,14 @@ const char * cppIVRSystem_IVRSystem_005_GetPropErrorNameFromEnum(void *linux_sid return ((IVRSystem*)linux_side)->GetPropErrorNameFromEnum((vr::TrackedPropertyError)error); } -bool cppIVRSystem_IVRSystem_005_PollNextEvent(void *linux_side, winVREvent_t_098 * pEvent) +bool cppIVRSystem_IVRSystem_005_PollNextEvent(void *linux_side, VREvent_t * pEvent) { - VREvent_t lin; - bool _ret; - _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr); - if(pEvent) - struct_VREvent_t_098_lin_to_win(&lin, pEvent); - return _ret; + return ((IVRSystem*)linux_side)->PollNextEvent((vr::VREvent_t *)pEvent); } -bool cppIVRSystem_IVRSystem_005_PollNextEventWithPose(void *linux_side, TrackingUniverseOrigin eOrigin, winVREvent_t_098 * pEvent, TrackedDevicePose_t * pTrackedDevicePose) +bool cppIVRSystem_IVRSystem_005_PollNextEventWithPose(void *linux_side, TrackingUniverseOrigin eOrigin, VREvent_t * pEvent, TrackedDevicePose_t * pTrackedDevicePose) { - VREvent_t lin; - bool _ret; - _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::TrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, (vr::TrackedDevicePose_t *)pTrackedDevicePose); - if(pEvent) - struct_VREvent_t_098_lin_to_win(&lin, pEvent); - return _ret; + return ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::TrackingUniverseOrigin)eOrigin, (vr::VREvent_t *)pEvent, (vr::TrackedDevicePose_t *)pTrackedDevicePose); } const char * cppIVRSystem_IVRSystem_005_GetEventTypeNameFromEnum(void *linux_side, EVREventType eType) @@ -159,23 +149,27 @@ vr::HiddenAreaMesh_t cppIVRSystem_IVRSystem_005_GetHiddenAreaMesh(void *linux_si return ((IVRSystem*)linux_side)->GetHiddenAreaMesh((vr::Hmd_Eye)eEye); } -bool cppIVRSystem_IVRSystem_005_GetControllerState(void *linux_side, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_098 * pControllerState) +bool cppIVRSystem_IVRSystem_005_GetControllerState(void *linux_side, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_098 * pControllerState) { - VRControllerState001_t lin; + VRControllerState_t lin; bool _ret; + if(pControllerState) + struct_VRControllerState_t_098_win_to_lin(pControllerState, &lin); _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr); if(pControllerState) - struct_VRControllerState001_t_098_lin_to_win(&lin, pControllerState); + struct_VRControllerState_t_098_lin_to_win(&lin, pControllerState); return _ret; } -bool cppIVRSystem_IVRSystem_005_GetControllerStateWithPose(void *linux_side, TrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_098 * pControllerState, TrackedDevicePose_t * pTrackedDevicePose) +bool cppIVRSystem_IVRSystem_005_GetControllerStateWithPose(void *linux_side, TrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_098 * pControllerState, TrackedDevicePose_t * pTrackedDevicePose) { - VRControllerState001_t lin; + VRControllerState_t lin; bool _ret; + if(pControllerState) + struct_VRControllerState_t_098_win_to_lin(pControllerState, &lin); _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::TrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (vr::TrackedDevicePose_t *)pTrackedDevicePose); if(pControllerState) - struct_VRControllerState001_t_098_lin_to_win(&lin, pControllerState); + struct_VRControllerState_t_098_lin_to_win(&lin, pControllerState); return _ret; } diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_005.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_005.h index 4f68c17b..a85ef7ff 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_005.h +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_005.h @@ -25,12 +25,12 @@ extern uint64_t cppIVRSystem_IVRSystem_005_GetUint64TrackedDeviceProperty(void * extern HmdMatrix34_t cppIVRSystem_IVRSystem_005_GetMatrix34TrackedDeviceProperty(void *, TrackedDeviceIndex_t, TrackedDeviceProperty, TrackedPropertyError *); extern uint32_t cppIVRSystem_IVRSystem_005_GetStringTrackedDeviceProperty(void *, TrackedDeviceIndex_t, TrackedDeviceProperty, char *, uint32_t, TrackedPropertyError *); extern const char * cppIVRSystem_IVRSystem_005_GetPropErrorNameFromEnum(void *, TrackedPropertyError); -extern bool cppIVRSystem_IVRSystem_005_PollNextEvent(void *, winVREvent_t_098 *); -extern bool cppIVRSystem_IVRSystem_005_PollNextEventWithPose(void *, TrackingUniverseOrigin, winVREvent_t_098 *, TrackedDevicePose_t *); +extern bool cppIVRSystem_IVRSystem_005_PollNextEvent(void *, VREvent_t *); +extern bool cppIVRSystem_IVRSystem_005_PollNextEventWithPose(void *, TrackingUniverseOrigin, VREvent_t *, TrackedDevicePose_t *); extern const char * cppIVRSystem_IVRSystem_005_GetEventTypeNameFromEnum(void *, EVREventType); extern HiddenAreaMesh_t cppIVRSystem_IVRSystem_005_GetHiddenAreaMesh(void *, Hmd_Eye); -extern bool cppIVRSystem_IVRSystem_005_GetControllerState(void *, TrackedDeviceIndex_t, winVRControllerState001_t_098 *); -extern bool cppIVRSystem_IVRSystem_005_GetControllerStateWithPose(void *, TrackingUniverseOrigin, TrackedDeviceIndex_t, winVRControllerState001_t_098 *, TrackedDevicePose_t *); +extern bool cppIVRSystem_IVRSystem_005_GetControllerState(void *, TrackedDeviceIndex_t, winVRControllerState_t_098 *); +extern bool cppIVRSystem_IVRSystem_005_GetControllerStateWithPose(void *, TrackingUniverseOrigin, TrackedDeviceIndex_t, winVRControllerState_t_098 *, TrackedDevicePose_t *); extern void cppIVRSystem_IVRSystem_005_TriggerHapticPulse(void *, TrackedDeviceIndex_t, uint32_t, unsigned short); extern const char * cppIVRSystem_IVRSystem_005_GetButtonIdNameFromEnum(void *, EVRButtonId); extern const char * cppIVRSystem_IVRSystem_005_GetControllerAxisTypeNameFromEnum(void *, EVRControllerAxisType); diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_006.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_006.cpp index 24f271db..f4f22f80 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_006.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_006.cpp @@ -139,24 +139,14 @@ const char * cppIVRSystem_IVRSystem_006_GetPropErrorNameFromEnum(void *linux_sid return ((IVRSystem*)linux_side)->GetPropErrorNameFromEnum((vr::TrackedPropertyError)error); } -bool cppIVRSystem_IVRSystem_006_PollNextEvent(void *linux_side, winVREvent_t_0910 * pEvent) +bool cppIVRSystem_IVRSystem_006_PollNextEvent(void *linux_side, VREvent_t * pEvent) { - VREvent_t lin; - bool _ret; - _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr); - if(pEvent) - struct_VREvent_t_0910_lin_to_win(&lin, pEvent); - return _ret; + return ((IVRSystem*)linux_side)->PollNextEvent((vr::VREvent_t *)pEvent); } -bool cppIVRSystem_IVRSystem_006_PollNextEventWithPose(void *linux_side, TrackingUniverseOrigin eOrigin, winVREvent_t_0910 * pEvent, TrackedDevicePose_t * pTrackedDevicePose) +bool cppIVRSystem_IVRSystem_006_PollNextEventWithPose(void *linux_side, TrackingUniverseOrigin eOrigin, VREvent_t * pEvent, TrackedDevicePose_t * pTrackedDevicePose) { - VREvent_t lin; - bool _ret; - _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::TrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, (vr::TrackedDevicePose_t *)pTrackedDevicePose); - if(pEvent) - struct_VREvent_t_0910_lin_to_win(&lin, pEvent); - return _ret; + return ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::TrackingUniverseOrigin)eOrigin, (vr::VREvent_t *)pEvent, (vr::TrackedDevicePose_t *)pTrackedDevicePose); } const char * cppIVRSystem_IVRSystem_006_GetEventTypeNameFromEnum(void *linux_side, EVREventType eType) @@ -169,23 +159,27 @@ vr::HiddenAreaMesh_t cppIVRSystem_IVRSystem_006_GetHiddenAreaMesh(void *linux_si return ((IVRSystem*)linux_side)->GetHiddenAreaMesh((vr::Hmd_Eye)eEye); } -bool cppIVRSystem_IVRSystem_006_GetControllerState(void *linux_side, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_0910 * pControllerState) +bool cppIVRSystem_IVRSystem_006_GetControllerState(void *linux_side, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_0910 * pControllerState) { - VRControllerState001_t lin; + VRControllerState_t lin; bool _ret; + if(pControllerState) + struct_VRControllerState_t_0910_win_to_lin(pControllerState, &lin); _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr); if(pControllerState) - struct_VRControllerState001_t_0910_lin_to_win(&lin, pControllerState); + struct_VRControllerState_t_0910_lin_to_win(&lin, pControllerState); return _ret; } -bool cppIVRSystem_IVRSystem_006_GetControllerStateWithPose(void *linux_side, TrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_0910 * pControllerState, TrackedDevicePose_t * pTrackedDevicePose) +bool cppIVRSystem_IVRSystem_006_GetControllerStateWithPose(void *linux_side, TrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_0910 * pControllerState, TrackedDevicePose_t * pTrackedDevicePose) { - VRControllerState001_t lin; + VRControllerState_t lin; bool _ret; + if(pControllerState) + struct_VRControllerState_t_0910_win_to_lin(pControllerState, &lin); _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::TrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (vr::TrackedDevicePose_t *)pTrackedDevicePose); if(pControllerState) - struct_VRControllerState001_t_0910_lin_to_win(&lin, pControllerState); + struct_VRControllerState_t_0910_lin_to_win(&lin, pControllerState); return _ret; } diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_006.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_006.h index 77563bec..29aaebed 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_006.h +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_006.h @@ -27,12 +27,12 @@ extern uint64_t cppIVRSystem_IVRSystem_006_GetUint64TrackedDeviceProperty(void * extern HmdMatrix34_t cppIVRSystem_IVRSystem_006_GetMatrix34TrackedDeviceProperty(void *, TrackedDeviceIndex_t, TrackedDeviceProperty, TrackedPropertyError *); extern uint32_t cppIVRSystem_IVRSystem_006_GetStringTrackedDeviceProperty(void *, TrackedDeviceIndex_t, TrackedDeviceProperty, char *, uint32_t, TrackedPropertyError *); extern const char * cppIVRSystem_IVRSystem_006_GetPropErrorNameFromEnum(void *, TrackedPropertyError); -extern bool cppIVRSystem_IVRSystem_006_PollNextEvent(void *, winVREvent_t_0910 *); -extern bool cppIVRSystem_IVRSystem_006_PollNextEventWithPose(void *, TrackingUniverseOrigin, winVREvent_t_0910 *, TrackedDevicePose_t *); +extern bool cppIVRSystem_IVRSystem_006_PollNextEvent(void *, VREvent_t *); +extern bool cppIVRSystem_IVRSystem_006_PollNextEventWithPose(void *, TrackingUniverseOrigin, VREvent_t *, TrackedDevicePose_t *); extern const char * cppIVRSystem_IVRSystem_006_GetEventTypeNameFromEnum(void *, EVREventType); extern HiddenAreaMesh_t cppIVRSystem_IVRSystem_006_GetHiddenAreaMesh(void *, Hmd_Eye); -extern bool cppIVRSystem_IVRSystem_006_GetControllerState(void *, TrackedDeviceIndex_t, winVRControllerState001_t_0910 *); -extern bool cppIVRSystem_IVRSystem_006_GetControllerStateWithPose(void *, TrackingUniverseOrigin, TrackedDeviceIndex_t, winVRControllerState001_t_0910 *, TrackedDevicePose_t *); +extern bool cppIVRSystem_IVRSystem_006_GetControllerState(void *, TrackedDeviceIndex_t, winVRControllerState_t_0910 *); +extern bool cppIVRSystem_IVRSystem_006_GetControllerStateWithPose(void *, TrackingUniverseOrigin, TrackedDeviceIndex_t, winVRControllerState_t_0910 *, TrackedDevicePose_t *); extern void cppIVRSystem_IVRSystem_006_TriggerHapticPulse(void *, TrackedDeviceIndex_t, uint32_t, unsigned short); extern const char * cppIVRSystem_IVRSystem_006_GetButtonIdNameFromEnum(void *, EVRButtonId); extern const char * cppIVRSystem_IVRSystem_006_GetControllerAxisTypeNameFromEnum(void *, EVRControllerAxisType); diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_009.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_009.cpp index 53aa3574..6fcc44b7 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_009.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_009.cpp @@ -139,24 +139,14 @@ const char * cppIVRSystem_IVRSystem_009_GetPropErrorNameFromEnum(void *linux_sid return ((IVRSystem*)linux_side)->GetPropErrorNameFromEnum((vr::ETrackedPropertyError)error); } -bool cppIVRSystem_IVRSystem_009_PollNextEvent(void *linux_side, winVREvent_t_0912 * pEvent) +bool cppIVRSystem_IVRSystem_009_PollNextEvent(void *linux_side, VREvent_t * pEvent) { - VREvent_t lin; - bool _ret; - _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr); - if(pEvent) - struct_VREvent_t_0912_lin_to_win(&lin, pEvent); - return _ret; + return ((IVRSystem*)linux_side)->PollNextEvent((vr::VREvent_t *)pEvent); } -bool cppIVRSystem_IVRSystem_009_PollNextEventWithPose(void *linux_side, ETrackingUniverseOrigin eOrigin, winVREvent_t_0912 * pEvent, TrackedDevicePose_t * pTrackedDevicePose) +bool cppIVRSystem_IVRSystem_009_PollNextEventWithPose(void *linux_side, ETrackingUniverseOrigin eOrigin, VREvent_t * pEvent, TrackedDevicePose_t * pTrackedDevicePose) { - VREvent_t lin; - bool _ret; - _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, (vr::TrackedDevicePose_t *)pTrackedDevicePose); - if(pEvent) - struct_VREvent_t_0912_lin_to_win(&lin, pEvent); - return _ret; + return ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::VREvent_t *)pEvent, (vr::TrackedDevicePose_t *)pTrackedDevicePose); } const char * cppIVRSystem_IVRSystem_009_GetEventTypeNameFromEnum(void *linux_side, EVREventType eType) @@ -169,23 +159,27 @@ vr::HiddenAreaMesh_t cppIVRSystem_IVRSystem_009_GetHiddenAreaMesh(void *linux_si return ((IVRSystem*)linux_side)->GetHiddenAreaMesh((vr::EVREye)eEye); } -bool cppIVRSystem_IVRSystem_009_GetControllerState(void *linux_side, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_0912 * pControllerState) +bool cppIVRSystem_IVRSystem_009_GetControllerState(void *linux_side, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_0912 * pControllerState) { - VRControllerState001_t lin; + VRControllerState_t lin; bool _ret; + if(pControllerState) + struct_VRControllerState_t_0912_win_to_lin(pControllerState, &lin); _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr); if(pControllerState) - struct_VRControllerState001_t_0912_lin_to_win(&lin, pControllerState); + struct_VRControllerState_t_0912_lin_to_win(&lin, pControllerState); return _ret; } -bool cppIVRSystem_IVRSystem_009_GetControllerStateWithPose(void *linux_side, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_0912 * pControllerState, TrackedDevicePose_t * pTrackedDevicePose) +bool cppIVRSystem_IVRSystem_009_GetControllerStateWithPose(void *linux_side, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_0912 * pControllerState, TrackedDevicePose_t * pTrackedDevicePose) { - VRControllerState001_t lin; + VRControllerState_t lin; bool _ret; + if(pControllerState) + struct_VRControllerState_t_0912_win_to_lin(pControllerState, &lin); _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (vr::TrackedDevicePose_t *)pTrackedDevicePose); if(pControllerState) - struct_VRControllerState001_t_0912_lin_to_win(&lin, pControllerState); + struct_VRControllerState_t_0912_lin_to_win(&lin, pControllerState); return _ret; } diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_009.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_009.h index 1b70b8ef..29e7fcc6 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_009.h +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_009.h @@ -27,12 +27,12 @@ extern uint64_t cppIVRSystem_IVRSystem_009_GetUint64TrackedDeviceProperty(void * extern HmdMatrix34_t cppIVRSystem_IVRSystem_009_GetMatrix34TrackedDeviceProperty(void *, TrackedDeviceIndex_t, ETrackedDeviceProperty, ETrackedPropertyError *); extern uint32_t cppIVRSystem_IVRSystem_009_GetStringTrackedDeviceProperty(void *, TrackedDeviceIndex_t, ETrackedDeviceProperty, char *, uint32_t, ETrackedPropertyError *); extern const char * cppIVRSystem_IVRSystem_009_GetPropErrorNameFromEnum(void *, ETrackedPropertyError); -extern bool cppIVRSystem_IVRSystem_009_PollNextEvent(void *, winVREvent_t_0912 *); -extern bool cppIVRSystem_IVRSystem_009_PollNextEventWithPose(void *, ETrackingUniverseOrigin, winVREvent_t_0912 *, TrackedDevicePose_t *); +extern bool cppIVRSystem_IVRSystem_009_PollNextEvent(void *, VREvent_t *); +extern bool cppIVRSystem_IVRSystem_009_PollNextEventWithPose(void *, ETrackingUniverseOrigin, VREvent_t *, TrackedDevicePose_t *); extern const char * cppIVRSystem_IVRSystem_009_GetEventTypeNameFromEnum(void *, EVREventType); extern HiddenAreaMesh_t cppIVRSystem_IVRSystem_009_GetHiddenAreaMesh(void *, EVREye); -extern bool cppIVRSystem_IVRSystem_009_GetControllerState(void *, TrackedDeviceIndex_t, winVRControllerState001_t_0912 *); -extern bool cppIVRSystem_IVRSystem_009_GetControllerStateWithPose(void *, ETrackingUniverseOrigin, TrackedDeviceIndex_t, winVRControllerState001_t_0912 *, TrackedDevicePose_t *); +extern bool cppIVRSystem_IVRSystem_009_GetControllerState(void *, TrackedDeviceIndex_t, winVRControllerState_t_0912 *); +extern bool cppIVRSystem_IVRSystem_009_GetControllerStateWithPose(void *, ETrackingUniverseOrigin, TrackedDeviceIndex_t, winVRControllerState_t_0912 *, TrackedDevicePose_t *); extern void cppIVRSystem_IVRSystem_009_TriggerHapticPulse(void *, TrackedDeviceIndex_t, uint32_t, unsigned short); extern const char * cppIVRSystem_IVRSystem_009_GetButtonIdNameFromEnum(void *, EVRButtonId); extern const char * cppIVRSystem_IVRSystem_009_GetControllerAxisTypeNameFromEnum(void *, EVRControllerAxisType); diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_010.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_010.cpp index 30562c0b..e1bdb168 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_010.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_010.cpp @@ -149,24 +149,14 @@ const char * cppIVRSystem_IVRSystem_010_GetPropErrorNameFromEnum(void *linux_sid return ((IVRSystem*)linux_side)->GetPropErrorNameFromEnum((vr::ETrackedPropertyError)error); } -bool cppIVRSystem_IVRSystem_010_PollNextEvent(void *linux_side, winVREvent_t_0914 * pEvent) +bool cppIVRSystem_IVRSystem_010_PollNextEvent(void *linux_side, VREvent_t * pEvent) { - VREvent_t lin; - bool _ret; - _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr); - if(pEvent) - struct_VREvent_t_0914_lin_to_win(&lin, pEvent); - return _ret; + return ((IVRSystem*)linux_side)->PollNextEvent((vr::VREvent_t *)pEvent); } -bool cppIVRSystem_IVRSystem_010_PollNextEventWithPose(void *linux_side, ETrackingUniverseOrigin eOrigin, winVREvent_t_0914 * pEvent, TrackedDevicePose_t * pTrackedDevicePose) +bool cppIVRSystem_IVRSystem_010_PollNextEventWithPose(void *linux_side, ETrackingUniverseOrigin eOrigin, VREvent_t * pEvent, TrackedDevicePose_t * pTrackedDevicePose) { - VREvent_t lin; - bool _ret; - _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, (vr::TrackedDevicePose_t *)pTrackedDevicePose); - if(pEvent) - struct_VREvent_t_0914_lin_to_win(&lin, pEvent); - return _ret; + return ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::VREvent_t *)pEvent, (vr::TrackedDevicePose_t *)pTrackedDevicePose); } const char * cppIVRSystem_IVRSystem_010_GetEventTypeNameFromEnum(void *linux_side, EVREventType eType) @@ -179,23 +169,27 @@ vr::HiddenAreaMesh_t cppIVRSystem_IVRSystem_010_GetHiddenAreaMesh(void *linux_si return ((IVRSystem*)linux_side)->GetHiddenAreaMesh((vr::EVREye)eEye); } -bool cppIVRSystem_IVRSystem_010_GetControllerState(void *linux_side, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_0914 * pControllerState) +bool cppIVRSystem_IVRSystem_010_GetControllerState(void *linux_side, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_0914 * pControllerState) { - VRControllerState001_t lin; + VRControllerState_t lin; bool _ret; + if(pControllerState) + struct_VRControllerState_t_0914_win_to_lin(pControllerState, &lin); _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr); if(pControllerState) - struct_VRControllerState001_t_0914_lin_to_win(&lin, pControllerState); + struct_VRControllerState_t_0914_lin_to_win(&lin, pControllerState); return _ret; } -bool cppIVRSystem_IVRSystem_010_GetControllerStateWithPose(void *linux_side, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_0914 * pControllerState, TrackedDevicePose_t * pTrackedDevicePose) +bool cppIVRSystem_IVRSystem_010_GetControllerStateWithPose(void *linux_side, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_0914 * pControllerState, TrackedDevicePose_t * pTrackedDevicePose) { - VRControllerState001_t lin; + VRControllerState_t lin; bool _ret; + if(pControllerState) + struct_VRControllerState_t_0914_win_to_lin(pControllerState, &lin); _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (vr::TrackedDevicePose_t *)pTrackedDevicePose); if(pControllerState) - struct_VRControllerState001_t_0914_lin_to_win(&lin, pControllerState); + struct_VRControllerState_t_0914_lin_to_win(&lin, pControllerState); return _ret; } diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_010.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_010.h index 5bdb2d96..a7d22f18 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_010.h +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_010.h @@ -29,12 +29,12 @@ extern uint64_t cppIVRSystem_IVRSystem_010_GetUint64TrackedDeviceProperty(void * extern HmdMatrix34_t cppIVRSystem_IVRSystem_010_GetMatrix34TrackedDeviceProperty(void *, TrackedDeviceIndex_t, ETrackedDeviceProperty, ETrackedPropertyError *); extern uint32_t cppIVRSystem_IVRSystem_010_GetStringTrackedDeviceProperty(void *, TrackedDeviceIndex_t, ETrackedDeviceProperty, char *, uint32_t, ETrackedPropertyError *); extern const char * cppIVRSystem_IVRSystem_010_GetPropErrorNameFromEnum(void *, ETrackedPropertyError); -extern bool cppIVRSystem_IVRSystem_010_PollNextEvent(void *, winVREvent_t_0914 *); -extern bool cppIVRSystem_IVRSystem_010_PollNextEventWithPose(void *, ETrackingUniverseOrigin, winVREvent_t_0914 *, TrackedDevicePose_t *); +extern bool cppIVRSystem_IVRSystem_010_PollNextEvent(void *, VREvent_t *); +extern bool cppIVRSystem_IVRSystem_010_PollNextEventWithPose(void *, ETrackingUniverseOrigin, VREvent_t *, TrackedDevicePose_t *); extern const char * cppIVRSystem_IVRSystem_010_GetEventTypeNameFromEnum(void *, EVREventType); extern HiddenAreaMesh_t cppIVRSystem_IVRSystem_010_GetHiddenAreaMesh(void *, EVREye); -extern bool cppIVRSystem_IVRSystem_010_GetControllerState(void *, TrackedDeviceIndex_t, winVRControllerState001_t_0914 *); -extern bool cppIVRSystem_IVRSystem_010_GetControllerStateWithPose(void *, ETrackingUniverseOrigin, TrackedDeviceIndex_t, winVRControllerState001_t_0914 *, TrackedDevicePose_t *); +extern bool cppIVRSystem_IVRSystem_010_GetControllerState(void *, TrackedDeviceIndex_t, winVRControllerState_t_0914 *); +extern bool cppIVRSystem_IVRSystem_010_GetControllerStateWithPose(void *, ETrackingUniverseOrigin, TrackedDeviceIndex_t, winVRControllerState_t_0914 *, TrackedDevicePose_t *); extern void cppIVRSystem_IVRSystem_010_TriggerHapticPulse(void *, TrackedDeviceIndex_t, uint32_t, unsigned short); extern const char * cppIVRSystem_IVRSystem_010_GetButtonIdNameFromEnum(void *, EVRButtonId); extern const char * cppIVRSystem_IVRSystem_010_GetControllerAxisTypeNameFromEnum(void *, EVRControllerAxisType); diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_011.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_011.cpp index 1d97ae8f..4085029b 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_011.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_011.cpp @@ -153,6 +153,8 @@ bool cppIVRSystem_IVRSystem_011_PollNextEvent(void *linux_side, winVREvent_t_091 { VREvent_t lin; bool _ret; + if(pEvent) + struct_VREvent_t_0918_win_to_lin(pEvent, &lin); _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, uncbVREvent ? sizeof(lin) : 0); if(pEvent) struct_VREvent_t_0918_lin_to_win(&lin, pEvent); @@ -163,6 +165,8 @@ bool cppIVRSystem_IVRSystem_011_PollNextEventWithPose(void *linux_side, ETrackin { VREvent_t lin; bool _ret; + if(pEvent) + struct_VREvent_t_0918_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_0918_lin_to_win(&lin, pEvent); @@ -179,23 +183,27 @@ vr::HiddenAreaMesh_t cppIVRSystem_IVRSystem_011_GetHiddenAreaMesh(void *linux_si return ((IVRSystem*)linux_side)->GetHiddenAreaMesh((vr::EVREye)eEye); } -bool cppIVRSystem_IVRSystem_011_GetControllerState(void *linux_side, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_0918 * pControllerState) +bool cppIVRSystem_IVRSystem_011_GetControllerState(void *linux_side, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_0918 * pControllerState) { - VRControllerState001_t lin; + VRControllerState_t lin; bool _ret; + if(pControllerState) + struct_VRControllerState_t_0918_win_to_lin(pControllerState, &lin); _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr); if(pControllerState) - struct_VRControllerState001_t_0918_lin_to_win(&lin, pControllerState); + struct_VRControllerState_t_0918_lin_to_win(&lin, pControllerState); return _ret; } -bool cppIVRSystem_IVRSystem_011_GetControllerStateWithPose(void *linux_side, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_0918 * pControllerState, TrackedDevicePose_t * pTrackedDevicePose) +bool cppIVRSystem_IVRSystem_011_GetControllerStateWithPose(void *linux_side, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_0918 * pControllerState, TrackedDevicePose_t * pTrackedDevicePose) { - VRControllerState001_t lin; + VRControllerState_t lin; bool _ret; + if(pControllerState) + struct_VRControllerState_t_0918_win_to_lin(pControllerState, &lin); _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (vr::TrackedDevicePose_t *)pTrackedDevicePose); if(pControllerState) - struct_VRControllerState001_t_0918_lin_to_win(&lin, pControllerState); + struct_VRControllerState_t_0918_lin_to_win(&lin, pControllerState); return _ret; } diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_011.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_011.h index 4f380c51..e138872a 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_011.h +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_011.h @@ -33,8 +33,8 @@ extern bool cppIVRSystem_IVRSystem_011_PollNextEvent(void *, winVREvent_t_0918 * extern bool cppIVRSystem_IVRSystem_011_PollNextEventWithPose(void *, ETrackingUniverseOrigin, winVREvent_t_0918 *, uint32_t, TrackedDevicePose_t *); extern const char * cppIVRSystem_IVRSystem_011_GetEventTypeNameFromEnum(void *, EVREventType); extern HiddenAreaMesh_t cppIVRSystem_IVRSystem_011_GetHiddenAreaMesh(void *, EVREye); -extern bool cppIVRSystem_IVRSystem_011_GetControllerState(void *, TrackedDeviceIndex_t, winVRControllerState001_t_0918 *); -extern bool cppIVRSystem_IVRSystem_011_GetControllerStateWithPose(void *, ETrackingUniverseOrigin, TrackedDeviceIndex_t, winVRControllerState001_t_0918 *, TrackedDevicePose_t *); +extern bool cppIVRSystem_IVRSystem_011_GetControllerState(void *, TrackedDeviceIndex_t, winVRControllerState_t_0918 *); +extern bool cppIVRSystem_IVRSystem_011_GetControllerStateWithPose(void *, ETrackingUniverseOrigin, TrackedDeviceIndex_t, winVRControllerState_t_0918 *, TrackedDevicePose_t *); extern void cppIVRSystem_IVRSystem_011_TriggerHapticPulse(void *, TrackedDeviceIndex_t, uint32_t, unsigned short); extern const char * cppIVRSystem_IVRSystem_011_GetButtonIdNameFromEnum(void *, EVRButtonId); extern const char * cppIVRSystem_IVRSystem_011_GetControllerAxisTypeNameFromEnum(void *, EVRControllerAxisType); diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_012.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_012.cpp index 3dccfb31..5757ef46 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_012.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_012.cpp @@ -153,6 +153,8 @@ bool cppIVRSystem_IVRSystem_012_PollNextEvent(void *linux_side, winVREvent_t_103 { VREvent_t lin; bool _ret; + if(pEvent) + struct_VREvent_t_103_win_to_lin(pEvent, &lin); _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, uncbVREvent ? sizeof(lin) : 0); if(pEvent) struct_VREvent_t_103_lin_to_win(&lin, pEvent); @@ -163,6 +165,8 @@ bool cppIVRSystem_IVRSystem_012_PollNextEventWithPose(void *linux_side, ETrackin { VREvent_t lin; bool _ret; + if(pEvent) + struct_VREvent_t_103_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_103_lin_to_win(&lin, pEvent); @@ -179,23 +183,27 @@ vr::HiddenAreaMesh_t cppIVRSystem_IVRSystem_012_GetHiddenAreaMesh(void *linux_si return ((IVRSystem*)linux_side)->GetHiddenAreaMesh((vr::EVREye)eEye); } -bool cppIVRSystem_IVRSystem_012_GetControllerState(void *linux_side, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_103 * pControllerState) +bool cppIVRSystem_IVRSystem_012_GetControllerState(void *linux_side, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_103 * pControllerState) { - VRControllerState001_t lin; + VRControllerState_t lin; bool _ret; + if(pControllerState) + struct_VRControllerState_t_103_win_to_lin(pControllerState, &lin); _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr); if(pControllerState) - struct_VRControllerState001_t_103_lin_to_win(&lin, pControllerState); + struct_VRControllerState_t_103_lin_to_win(&lin, pControllerState); return _ret; } -bool cppIVRSystem_IVRSystem_012_GetControllerStateWithPose(void *linux_side, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_103 * pControllerState, TrackedDevicePose_t * pTrackedDevicePose) +bool cppIVRSystem_IVRSystem_012_GetControllerStateWithPose(void *linux_side, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_103 * pControllerState, TrackedDevicePose_t * pTrackedDevicePose) { - VRControllerState001_t lin; + VRControllerState_t lin; bool _ret; + if(pControllerState) + struct_VRControllerState_t_103_win_to_lin(pControllerState, &lin); _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (vr::TrackedDevicePose_t *)pTrackedDevicePose); if(pControllerState) - struct_VRControllerState001_t_103_lin_to_win(&lin, pControllerState); + struct_VRControllerState_t_103_lin_to_win(&lin, pControllerState); return _ret; } diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_012.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_012.h index f833e061..495a5931 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_012.h +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_012.h @@ -33,8 +33,8 @@ extern bool cppIVRSystem_IVRSystem_012_PollNextEvent(void *, winVREvent_t_103 *, extern bool cppIVRSystem_IVRSystem_012_PollNextEventWithPose(void *, ETrackingUniverseOrigin, winVREvent_t_103 *, uint32_t, TrackedDevicePose_t *); extern const char * cppIVRSystem_IVRSystem_012_GetEventTypeNameFromEnum(void *, EVREventType); extern HiddenAreaMesh_t cppIVRSystem_IVRSystem_012_GetHiddenAreaMesh(void *, EVREye); -extern bool cppIVRSystem_IVRSystem_012_GetControllerState(void *, TrackedDeviceIndex_t, winVRControllerState001_t_103 *); -extern bool cppIVRSystem_IVRSystem_012_GetControllerStateWithPose(void *, ETrackingUniverseOrigin, TrackedDeviceIndex_t, winVRControllerState001_t_103 *, TrackedDevicePose_t *); +extern bool cppIVRSystem_IVRSystem_012_GetControllerState(void *, TrackedDeviceIndex_t, winVRControllerState_t_103 *); +extern bool cppIVRSystem_IVRSystem_012_GetControllerStateWithPose(void *, ETrackingUniverseOrigin, TrackedDeviceIndex_t, winVRControllerState_t_103 *, TrackedDevicePose_t *); extern void cppIVRSystem_IVRSystem_012_TriggerHapticPulse(void *, TrackedDeviceIndex_t, uint32_t, unsigned short); extern const char * cppIVRSystem_IVRSystem_012_GetButtonIdNameFromEnum(void *, EVRButtonId); extern const char * cppIVRSystem_IVRSystem_012_GetControllerAxisTypeNameFromEnum(void *, EVRControllerAxisType); diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_014.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_014.cpp index 5b58d9c1..571ccc02 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_014.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_014.cpp @@ -153,6 +153,8 @@ bool cppIVRSystem_IVRSystem_014_PollNextEvent(void *linux_side, winVREvent_t_104 { VREvent_t lin; bool _ret; + if(pEvent) + struct_VREvent_t_104_win_to_lin(pEvent, &lin); _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, uncbVREvent ? sizeof(lin) : 0); if(pEvent) struct_VREvent_t_104_lin_to_win(&lin, pEvent); @@ -163,6 +165,8 @@ bool cppIVRSystem_IVRSystem_014_PollNextEventWithPose(void *linux_side, ETrackin { VREvent_t lin; bool _ret; + if(pEvent) + struct_VREvent_t_104_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_104_lin_to_win(&lin, pEvent); @@ -179,23 +183,27 @@ vr::HiddenAreaMesh_t cppIVRSystem_IVRSystem_014_GetHiddenAreaMesh(void *linux_si return ((IVRSystem*)linux_side)->GetHiddenAreaMesh((vr::EVREye)eEye, (vr::EHiddenAreaMeshType)type); } -bool cppIVRSystem_IVRSystem_014_GetControllerState(void *linux_side, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_104 * pControllerState, uint32_t unControllerStateSize) +bool cppIVRSystem_IVRSystem_014_GetControllerState(void *linux_side, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_104 * pControllerState, uint32_t unControllerStateSize) { - VRControllerState001_t lin; + VRControllerState_t lin; bool _ret; - _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, unControllerStateSize ? sizeof(lin) : 0); if(pControllerState) - struct_VRControllerState001_t_104_lin_to_win(&lin, pControllerState); + struct_VRControllerState_t_104_win_to_lin(pControllerState, &lin); + _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (uint32_t)unControllerStateSize); + if(pControllerState) + struct_VRControllerState_t_104_lin_to_win(&lin, pControllerState); return _ret; } -bool cppIVRSystem_IVRSystem_014_GetControllerStateWithPose(void *linux_side, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_104 * pControllerState, uint32_t unControllerStateSize, TrackedDevicePose_t * pTrackedDevicePose) +bool cppIVRSystem_IVRSystem_014_GetControllerStateWithPose(void *linux_side, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_104 * pControllerState, uint32_t unControllerStateSize, TrackedDevicePose_t * pTrackedDevicePose) { - VRControllerState001_t lin; + VRControllerState_t lin; bool _ret; - _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_104_lin_to_win(&lin, pControllerState); + struct_VRControllerState_t_104_win_to_lin(pControllerState, &lin); + _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (uint32_t)unControllerStateSize, (vr::TrackedDevicePose_t *)pTrackedDevicePose); + if(pControllerState) + struct_VRControllerState_t_104_lin_to_win(&lin, pControllerState); return _ret; } diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_014.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_014.h index 0d207a3d..ed0b687b 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_014.h +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_014.h @@ -33,8 +33,8 @@ extern bool cppIVRSystem_IVRSystem_014_PollNextEvent(void *, winVREvent_t_104 *, extern bool cppIVRSystem_IVRSystem_014_PollNextEventWithPose(void *, ETrackingUniverseOrigin, winVREvent_t_104 *, uint32_t, TrackedDevicePose_t *); extern const char * cppIVRSystem_IVRSystem_014_GetEventTypeNameFromEnum(void *, EVREventType); extern HiddenAreaMesh_t cppIVRSystem_IVRSystem_014_GetHiddenAreaMesh(void *, EVREye, EHiddenAreaMeshType); -extern bool cppIVRSystem_IVRSystem_014_GetControllerState(void *, TrackedDeviceIndex_t, winVRControllerState001_t_104 *, uint32_t); -extern bool cppIVRSystem_IVRSystem_014_GetControllerStateWithPose(void *, ETrackingUniverseOrigin, TrackedDeviceIndex_t, winVRControllerState001_t_104 *, uint32_t, TrackedDevicePose_t *); +extern bool cppIVRSystem_IVRSystem_014_GetControllerState(void *, TrackedDeviceIndex_t, winVRControllerState_t_104 *, uint32_t); +extern bool cppIVRSystem_IVRSystem_014_GetControllerStateWithPose(void *, ETrackingUniverseOrigin, TrackedDeviceIndex_t, winVRControllerState_t_104 *, uint32_t, TrackedDevicePose_t *); extern void cppIVRSystem_IVRSystem_014_TriggerHapticPulse(void *, TrackedDeviceIndex_t, uint32_t, unsigned short); extern const char * cppIVRSystem_IVRSystem_014_GetButtonIdNameFromEnum(void *, EVRButtonId); extern const char * cppIVRSystem_IVRSystem_014_GetControllerAxisTypeNameFromEnum(void *, EVRControllerAxisType); diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_015.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_015.cpp index b9a28d1a..018f102c 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_015.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_015.cpp @@ -153,6 +153,8 @@ bool cppIVRSystem_IVRSystem_015_PollNextEvent(void *linux_side, winVREvent_t_107 { VREvent_t lin; bool _ret; + if(pEvent) + struct_VREvent_t_107_win_to_lin(pEvent, &lin); _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, uncbVREvent ? sizeof(lin) : 0); if(pEvent) struct_VREvent_t_107_lin_to_win(&lin, pEvent); @@ -163,6 +165,8 @@ bool cppIVRSystem_IVRSystem_015_PollNextEventWithPose(void *linux_side, ETrackin { VREvent_t lin; bool _ret; + if(pEvent) + struct_VREvent_t_107_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_107_lin_to_win(&lin, pEvent); @@ -179,23 +183,27 @@ vr::HiddenAreaMesh_t cppIVRSystem_IVRSystem_015_GetHiddenAreaMesh(void *linux_si return ((IVRSystem*)linux_side)->GetHiddenAreaMesh((vr::EVREye)eEye, (vr::EHiddenAreaMeshType)type); } -bool cppIVRSystem_IVRSystem_015_GetControllerState(void *linux_side, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_107 * pControllerState, uint32_t unControllerStateSize) +bool cppIVRSystem_IVRSystem_015_GetControllerState(void *linux_side, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_107 * pControllerState, uint32_t unControllerStateSize) { - VRControllerState001_t lin; + VRControllerState_t lin; bool _ret; - _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, unControllerStateSize ? sizeof(lin) : 0); if(pControllerState) - struct_VRControllerState001_t_107_lin_to_win(&lin, pControllerState); + struct_VRControllerState_t_107_win_to_lin(pControllerState, &lin); + _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (uint32_t)unControllerStateSize); + if(pControllerState) + struct_VRControllerState_t_107_lin_to_win(&lin, pControllerState); return _ret; } -bool cppIVRSystem_IVRSystem_015_GetControllerStateWithPose(void *linux_side, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_107 * pControllerState, uint32_t unControllerStateSize, TrackedDevicePose_t * pTrackedDevicePose) +bool cppIVRSystem_IVRSystem_015_GetControllerStateWithPose(void *linux_side, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_107 * pControllerState, uint32_t unControllerStateSize, TrackedDevicePose_t * pTrackedDevicePose) { - VRControllerState001_t lin; + VRControllerState_t lin; bool _ret; - _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_107_lin_to_win(&lin, pControllerState); + struct_VRControllerState_t_107_win_to_lin(pControllerState, &lin); + _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (uint32_t)unControllerStateSize, (vr::TrackedDevicePose_t *)pTrackedDevicePose); + if(pControllerState) + struct_VRControllerState_t_107_lin_to_win(&lin, pControllerState); return _ret; } diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_015.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_015.h index f42a0fd8..441d8075 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_015.h +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_015.h @@ -33,8 +33,8 @@ extern bool cppIVRSystem_IVRSystem_015_PollNextEvent(void *, winVREvent_t_107 *, extern bool cppIVRSystem_IVRSystem_015_PollNextEventWithPose(void *, ETrackingUniverseOrigin, winVREvent_t_107 *, uint32_t, TrackedDevicePose_t *); extern const char * cppIVRSystem_IVRSystem_015_GetEventTypeNameFromEnum(void *, EVREventType); extern HiddenAreaMesh_t cppIVRSystem_IVRSystem_015_GetHiddenAreaMesh(void *, EVREye, EHiddenAreaMeshType); -extern bool cppIVRSystem_IVRSystem_015_GetControllerState(void *, TrackedDeviceIndex_t, winVRControllerState001_t_107 *, uint32_t); -extern bool cppIVRSystem_IVRSystem_015_GetControllerStateWithPose(void *, ETrackingUniverseOrigin, TrackedDeviceIndex_t, winVRControllerState001_t_107 *, uint32_t, TrackedDevicePose_t *); +extern bool cppIVRSystem_IVRSystem_015_GetControllerState(void *, TrackedDeviceIndex_t, winVRControllerState_t_107 *, uint32_t); +extern bool cppIVRSystem_IVRSystem_015_GetControllerStateWithPose(void *, ETrackingUniverseOrigin, TrackedDeviceIndex_t, winVRControllerState_t_107 *, uint32_t, TrackedDevicePose_t *); extern void cppIVRSystem_IVRSystem_015_TriggerHapticPulse(void *, TrackedDeviceIndex_t, uint32_t, unsigned short); extern const char * cppIVRSystem_IVRSystem_015_GetButtonIdNameFromEnum(void *, EVRButtonId); extern const char * cppIVRSystem_IVRSystem_015_GetControllerAxisTypeNameFromEnum(void *, EVRControllerAxisType); diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_016.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_016.cpp index 5607f839..a60889b9 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_016.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_016.cpp @@ -158,6 +158,8 @@ bool cppIVRSystem_IVRSystem_016_PollNextEvent(void *linux_side, winVREvent_t_109 { VREvent_t lin; bool _ret; + if(pEvent) + struct_VREvent_t_109_win_to_lin(pEvent, &lin); _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, uncbVREvent ? sizeof(lin) : 0); if(pEvent) struct_VREvent_t_109_lin_to_win(&lin, pEvent); @@ -168,6 +170,8 @@ bool cppIVRSystem_IVRSystem_016_PollNextEventWithPose(void *linux_side, ETrackin { VREvent_t lin; bool _ret; + if(pEvent) + struct_VREvent_t_109_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_109_lin_to_win(&lin, pEvent); @@ -184,23 +188,27 @@ vr::HiddenAreaMesh_t cppIVRSystem_IVRSystem_016_GetHiddenAreaMesh(void *linux_si return ((IVRSystem*)linux_side)->GetHiddenAreaMesh((vr::EVREye)eEye, (vr::EHiddenAreaMeshType)type); } -bool cppIVRSystem_IVRSystem_016_GetControllerState(void *linux_side, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_109 * pControllerState, uint32_t unControllerStateSize) +bool cppIVRSystem_IVRSystem_016_GetControllerState(void *linux_side, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_109 * pControllerState, uint32_t unControllerStateSize) { - VRControllerState001_t lin; + VRControllerState_t lin; bool _ret; - _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, unControllerStateSize ? sizeof(lin) : 0); if(pControllerState) - struct_VRControllerState001_t_109_lin_to_win(&lin, pControllerState); + struct_VRControllerState_t_109_win_to_lin(pControllerState, &lin); + _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (uint32_t)unControllerStateSize); + if(pControllerState) + struct_VRControllerState_t_109_lin_to_win(&lin, pControllerState); return _ret; } -bool cppIVRSystem_IVRSystem_016_GetControllerStateWithPose(void *linux_side, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_109 * pControllerState, uint32_t unControllerStateSize, TrackedDevicePose_t * pTrackedDevicePose) +bool cppIVRSystem_IVRSystem_016_GetControllerStateWithPose(void *linux_side, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_109 * pControllerState, uint32_t unControllerStateSize, TrackedDevicePose_t * pTrackedDevicePose) { - VRControllerState001_t lin; + VRControllerState_t lin; bool _ret; - _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_109_lin_to_win(&lin, pControllerState); + struct_VRControllerState_t_109_win_to_lin(pControllerState, &lin); + _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (uint32_t)unControllerStateSize, (vr::TrackedDevicePose_t *)pTrackedDevicePose); + if(pControllerState) + struct_VRControllerState_t_109_lin_to_win(&lin, pControllerState); return _ret; } diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_016.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_016.h index 0ecc16be..d96aa5eb 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_016.h +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_016.h @@ -34,8 +34,8 @@ extern bool cppIVRSystem_IVRSystem_016_PollNextEvent(void *, winVREvent_t_109 *, extern bool cppIVRSystem_IVRSystem_016_PollNextEventWithPose(void *, ETrackingUniverseOrigin, winVREvent_t_109 *, uint32_t, TrackedDevicePose_t *); extern const char * cppIVRSystem_IVRSystem_016_GetEventTypeNameFromEnum(void *, EVREventType); extern HiddenAreaMesh_t cppIVRSystem_IVRSystem_016_GetHiddenAreaMesh(void *, EVREye, EHiddenAreaMeshType); -extern bool cppIVRSystem_IVRSystem_016_GetControllerState(void *, TrackedDeviceIndex_t, winVRControllerState001_t_109 *, uint32_t); -extern bool cppIVRSystem_IVRSystem_016_GetControllerStateWithPose(void *, ETrackingUniverseOrigin, TrackedDeviceIndex_t, winVRControllerState001_t_109 *, uint32_t, TrackedDevicePose_t *); +extern bool cppIVRSystem_IVRSystem_016_GetControllerState(void *, TrackedDeviceIndex_t, winVRControllerState_t_109 *, uint32_t); +extern bool cppIVRSystem_IVRSystem_016_GetControllerStateWithPose(void *, ETrackingUniverseOrigin, TrackedDeviceIndex_t, winVRControllerState_t_109 *, uint32_t, TrackedDevicePose_t *); extern void cppIVRSystem_IVRSystem_016_TriggerHapticPulse(void *, TrackedDeviceIndex_t, uint32_t, unsigned short); extern const char * cppIVRSystem_IVRSystem_016_GetButtonIdNameFromEnum(void *, EVRButtonId); extern const char * cppIVRSystem_IVRSystem_016_GetControllerAxisTypeNameFromEnum(void *, EVRControllerAxisType); diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_017.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_017.cpp index 4aa61510..c4e10129 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_017.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_017.cpp @@ -158,6 +158,8 @@ bool cppIVRSystem_IVRSystem_017_PollNextEvent(void *linux_side, winVREvent_t_101 { VREvent_t lin; bool _ret; + if(pEvent) + struct_VREvent_t_1011_win_to_lin(pEvent, &lin); _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, uncbVREvent ? sizeof(lin) : 0); if(pEvent) struct_VREvent_t_1011_lin_to_win(&lin, pEvent); @@ -168,6 +170,8 @@ bool cppIVRSystem_IVRSystem_017_PollNextEventWithPose(void *linux_side, ETrackin { VREvent_t lin; bool _ret; + if(pEvent) + struct_VREvent_t_1011_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_1011_lin_to_win(&lin, pEvent); @@ -184,23 +188,27 @@ vr::HiddenAreaMesh_t cppIVRSystem_IVRSystem_017_GetHiddenAreaMesh(void *linux_si return ((IVRSystem*)linux_side)->GetHiddenAreaMesh((vr::EVREye)eEye, (vr::EHiddenAreaMeshType)type); } -bool cppIVRSystem_IVRSystem_017_GetControllerState(void *linux_side, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_1011 * pControllerState, uint32_t unControllerStateSize) +bool cppIVRSystem_IVRSystem_017_GetControllerState(void *linux_side, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_1011 * pControllerState, uint32_t unControllerStateSize) { - VRControllerState001_t lin; + VRControllerState_t lin; bool _ret; - _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, unControllerStateSize ? sizeof(lin) : 0); if(pControllerState) - struct_VRControllerState001_t_1011_lin_to_win(&lin, pControllerState); + struct_VRControllerState_t_1011_win_to_lin(pControllerState, &lin); + _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (uint32_t)unControllerStateSize); + if(pControllerState) + struct_VRControllerState_t_1011_lin_to_win(&lin, pControllerState); return _ret; } -bool cppIVRSystem_IVRSystem_017_GetControllerStateWithPose(void *linux_side, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_1011 * pControllerState, uint32_t unControllerStateSize, TrackedDevicePose_t * pTrackedDevicePose) +bool cppIVRSystem_IVRSystem_017_GetControllerStateWithPose(void *linux_side, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_1011 * pControllerState, uint32_t unControllerStateSize, TrackedDevicePose_t * pTrackedDevicePose) { - VRControllerState001_t lin; + VRControllerState_t lin; bool _ret; - _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_1011_lin_to_win(&lin, pControllerState); + struct_VRControllerState_t_1011_win_to_lin(pControllerState, &lin); + _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (uint32_t)unControllerStateSize, (vr::TrackedDevicePose_t *)pTrackedDevicePose); + if(pControllerState) + struct_VRControllerState_t_1011_lin_to_win(&lin, pControllerState); return _ret; } diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_017.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_017.h index 9adbf179..297da385 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_017.h +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_017.h @@ -34,8 +34,8 @@ extern bool cppIVRSystem_IVRSystem_017_PollNextEvent(void *, winVREvent_t_1011 * extern bool cppIVRSystem_IVRSystem_017_PollNextEventWithPose(void *, ETrackingUniverseOrigin, winVREvent_t_1011 *, uint32_t, TrackedDevicePose_t *); extern const char * cppIVRSystem_IVRSystem_017_GetEventTypeNameFromEnum(void *, EVREventType); extern HiddenAreaMesh_t cppIVRSystem_IVRSystem_017_GetHiddenAreaMesh(void *, EVREye, EHiddenAreaMeshType); -extern bool cppIVRSystem_IVRSystem_017_GetControllerState(void *, TrackedDeviceIndex_t, winVRControllerState001_t_1011 *, uint32_t); -extern bool cppIVRSystem_IVRSystem_017_GetControllerStateWithPose(void *, ETrackingUniverseOrigin, TrackedDeviceIndex_t, winVRControllerState001_t_1011 *, uint32_t, TrackedDevicePose_t *); +extern bool cppIVRSystem_IVRSystem_017_GetControllerState(void *, TrackedDeviceIndex_t, winVRControllerState_t_1011 *, uint32_t); +extern bool cppIVRSystem_IVRSystem_017_GetControllerStateWithPose(void *, ETrackingUniverseOrigin, TrackedDeviceIndex_t, winVRControllerState_t_1011 *, uint32_t, TrackedDevicePose_t *); extern void cppIVRSystem_IVRSystem_017_TriggerHapticPulse(void *, TrackedDeviceIndex_t, uint32_t, unsigned short); extern const char * cppIVRSystem_IVRSystem_017_GetButtonIdNameFromEnum(void *, EVRButtonId); extern const char * cppIVRSystem_IVRSystem_017_GetControllerAxisTypeNameFromEnum(void *, EVRControllerAxisType); diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_019.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_019.cpp index 97ebe4d5..2e0df281 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_019.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_019.cpp @@ -163,6 +163,8 @@ bool cppIVRSystem_IVRSystem_019_PollNextEvent(void *linux_side, winVREvent_t_141 { VREvent_t lin; bool _ret; + if(pEvent) + struct_VREvent_t_1418_win_to_lin(pEvent, &lin); _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, uncbVREvent ? sizeof(lin) : 0); if(pEvent) struct_VREvent_t_1418_lin_to_win(&lin, pEvent); @@ -173,6 +175,8 @@ bool cppIVRSystem_IVRSystem_019_PollNextEventWithPose(void *linux_side, ETrackin { VREvent_t lin; bool _ret; + if(pEvent) + struct_VREvent_t_1418_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_1418_lin_to_win(&lin, pEvent); @@ -189,23 +193,27 @@ vr::HiddenAreaMesh_t cppIVRSystem_IVRSystem_019_GetHiddenAreaMesh(void *linux_si return ((IVRSystem*)linux_side)->GetHiddenAreaMesh((vr::EVREye)eEye, (vr::EHiddenAreaMeshType)type); } -bool cppIVRSystem_IVRSystem_019_GetControllerState(void *linux_side, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_1418 * pControllerState, uint32_t unControllerStateSize) +bool cppIVRSystem_IVRSystem_019_GetControllerState(void *linux_side, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_1418 * pControllerState, uint32_t unControllerStateSize) { - VRControllerState001_t lin; + VRControllerState_t lin; bool _ret; - _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, unControllerStateSize ? sizeof(lin) : 0); if(pControllerState) - struct_VRControllerState001_t_1418_lin_to_win(&lin, pControllerState); + struct_VRControllerState_t_1418_win_to_lin(pControllerState, &lin); + _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (uint32_t)unControllerStateSize); + if(pControllerState) + struct_VRControllerState_t_1418_lin_to_win(&lin, pControllerState); return _ret; } -bool cppIVRSystem_IVRSystem_019_GetControllerStateWithPose(void *linux_side, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_1418 * pControllerState, uint32_t unControllerStateSize, TrackedDevicePose_t * pTrackedDevicePose) +bool cppIVRSystem_IVRSystem_019_GetControllerStateWithPose(void *linux_side, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_1418 * pControllerState, uint32_t unControllerStateSize, TrackedDevicePose_t * pTrackedDevicePose) { - VRControllerState001_t lin; + VRControllerState_t lin; bool _ret; - _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_1418_lin_to_win(&lin, pControllerState); + struct_VRControllerState_t_1418_win_to_lin(pControllerState, &lin); + _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (uint32_t)unControllerStateSize, (vr::TrackedDevicePose_t *)pTrackedDevicePose); + if(pControllerState) + struct_VRControllerState_t_1418_lin_to_win(&lin, pControllerState); return _ret; } diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_019.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_019.h index dfc846e1..206a7a33 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_019.h +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_019.h @@ -35,8 +35,8 @@ extern bool cppIVRSystem_IVRSystem_019_PollNextEvent(void *, winVREvent_t_1418 * extern bool cppIVRSystem_IVRSystem_019_PollNextEventWithPose(void *, ETrackingUniverseOrigin, winVREvent_t_1418 *, uint32_t, TrackedDevicePose_t *); extern const char * cppIVRSystem_IVRSystem_019_GetEventTypeNameFromEnum(void *, EVREventType); extern HiddenAreaMesh_t cppIVRSystem_IVRSystem_019_GetHiddenAreaMesh(void *, EVREye, EHiddenAreaMeshType); -extern bool cppIVRSystem_IVRSystem_019_GetControllerState(void *, TrackedDeviceIndex_t, winVRControllerState001_t_1418 *, uint32_t); -extern bool cppIVRSystem_IVRSystem_019_GetControllerStateWithPose(void *, ETrackingUniverseOrigin, TrackedDeviceIndex_t, winVRControllerState001_t_1418 *, uint32_t, TrackedDevicePose_t *); +extern bool cppIVRSystem_IVRSystem_019_GetControllerState(void *, TrackedDeviceIndex_t, winVRControllerState_t_1418 *, uint32_t); +extern bool cppIVRSystem_IVRSystem_019_GetControllerStateWithPose(void *, ETrackingUniverseOrigin, TrackedDeviceIndex_t, winVRControllerState_t_1418 *, uint32_t, TrackedDevicePose_t *); extern void cppIVRSystem_IVRSystem_019_TriggerHapticPulse(void *, TrackedDeviceIndex_t, uint32_t, unsigned short); extern const char * cppIVRSystem_IVRSystem_019_GetButtonIdNameFromEnum(void *, EVRButtonId); extern const char * cppIVRSystem_IVRSystem_019_GetControllerAxisTypeNameFromEnum(void *, EVRControllerAxisType); diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_020.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_020.cpp index e29564d3..22bae398 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_020.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_020.cpp @@ -163,6 +163,8 @@ bool cppIVRSystem_IVRSystem_020_PollNextEvent(void *linux_side, winVREvent_t_161 { VREvent_t lin; bool _ret; + if(pEvent) + struct_VREvent_t_1610_win_to_lin(pEvent, &lin); _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, uncbVREvent ? sizeof(lin) : 0); if(pEvent) struct_VREvent_t_1610_lin_to_win(&lin, pEvent); @@ -173,6 +175,8 @@ bool cppIVRSystem_IVRSystem_020_PollNextEventWithPose(void *linux_side, ETrackin { VREvent_t lin; bool _ret; + if(pEvent) + struct_VREvent_t_1610_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_1610_lin_to_win(&lin, pEvent); @@ -189,23 +193,27 @@ vr::HiddenAreaMesh_t cppIVRSystem_IVRSystem_020_GetHiddenAreaMesh(void *linux_si return ((IVRSystem*)linux_side)->GetHiddenAreaMesh((vr::EVREye)eEye, (vr::EHiddenAreaMeshType)type); } -bool cppIVRSystem_IVRSystem_020_GetControllerState(void *linux_side, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_1610 * pControllerState, uint32_t unControllerStateSize) +bool cppIVRSystem_IVRSystem_020_GetControllerState(void *linux_side, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_1610 * pControllerState, uint32_t unControllerStateSize) { - VRControllerState001_t lin; + VRControllerState_t lin; bool _ret; - _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, unControllerStateSize ? sizeof(lin) : 0); if(pControllerState) - struct_VRControllerState001_t_1610_lin_to_win(&lin, pControllerState); + struct_VRControllerState_t_1610_win_to_lin(pControllerState, &lin); + _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (uint32_t)unControllerStateSize); + if(pControllerState) + struct_VRControllerState_t_1610_lin_to_win(&lin, pControllerState); return _ret; } -bool cppIVRSystem_IVRSystem_020_GetControllerStateWithPose(void *linux_side, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_1610 * pControllerState, uint32_t unControllerStateSize, TrackedDevicePose_t * pTrackedDevicePose) +bool cppIVRSystem_IVRSystem_020_GetControllerStateWithPose(void *linux_side, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_1610 * pControllerState, uint32_t unControllerStateSize, TrackedDevicePose_t * pTrackedDevicePose) { - VRControllerState001_t lin; + VRControllerState_t lin; bool _ret; - _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_1610_lin_to_win(&lin, pControllerState); + struct_VRControllerState_t_1610_win_to_lin(pControllerState, &lin); + _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (uint32_t)unControllerStateSize, (vr::TrackedDevicePose_t *)pTrackedDevicePose); + if(pControllerState) + struct_VRControllerState_t_1610_lin_to_win(&lin, pControllerState); return _ret; } diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_020.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_020.h index 3a17390e..b0d1710b 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_020.h +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_020.h @@ -35,8 +35,8 @@ extern bool cppIVRSystem_IVRSystem_020_PollNextEvent(void *, winVREvent_t_1610 * extern bool cppIVRSystem_IVRSystem_020_PollNextEventWithPose(void *, ETrackingUniverseOrigin, winVREvent_t_1610 *, uint32_t, TrackedDevicePose_t *); extern const char * cppIVRSystem_IVRSystem_020_GetEventTypeNameFromEnum(void *, EVREventType); extern HiddenAreaMesh_t cppIVRSystem_IVRSystem_020_GetHiddenAreaMesh(void *, EVREye, EHiddenAreaMeshType); -extern bool cppIVRSystem_IVRSystem_020_GetControllerState(void *, TrackedDeviceIndex_t, winVRControllerState001_t_1610 *, uint32_t); -extern bool cppIVRSystem_IVRSystem_020_GetControllerStateWithPose(void *, ETrackingUniverseOrigin, TrackedDeviceIndex_t, winVRControllerState001_t_1610 *, uint32_t, TrackedDevicePose_t *); +extern bool cppIVRSystem_IVRSystem_020_GetControllerState(void *, TrackedDeviceIndex_t, winVRControllerState_t_1610 *, uint32_t); +extern bool cppIVRSystem_IVRSystem_020_GetControllerStateWithPose(void *, ETrackingUniverseOrigin, TrackedDeviceIndex_t, winVRControllerState_t_1610 *, uint32_t, TrackedDevicePose_t *); extern void cppIVRSystem_IVRSystem_020_TriggerHapticPulse(void *, TrackedDeviceIndex_t, uint32_t, unsigned short); extern const char * cppIVRSystem_IVRSystem_020_GetButtonIdNameFromEnum(void *, EVRButtonId); extern const char * cppIVRSystem_IVRSystem_020_GetControllerAxisTypeNameFromEnum(void *, EVRControllerAxisType); diff --git a/vrclient_x64/vrclient_x64/struct_converters.h b/vrclient_x64/vrclient_x64/struct_converters.h index 7f00a22c..b6891d51 100644 --- a/vrclient_x64/vrclient_x64/struct_converters.h +++ b/vrclient_x64/vrclient_x64/struct_converters.h @@ -629,8 +629,6 @@ extern void struct_RenderModel_t_0915_lin_to_win(void *l, void *w); extern void struct_RenderModel_t_0915_win_to_lin(void *w, void *l); extern struct winRenderModel_t_0915 *struct_RenderModel_t_0915_wrap(void *l); extern RenderModel_t *struct_RenderModel_t_0915_unwrap(winRenderModel_t_0915 *w); -typedef struct winVREvent_t_0914 winVREvent_t_0914; -extern void struct_VREvent_t_0914_lin_to_win(void *l, void *w); typedef struct winVRControllerState001_t_0914 winVRControllerState001_t_0914; extern void struct_VRControllerState001_t_0914_lin_to_win(void *l, void *w); extern void struct_VRControllerState001_t_0914_win_to_lin(void *w, void *l); @@ -650,8 +648,6 @@ extern void struct_RenderModel_t_0914_lin_to_win(void *l, void *w); extern void struct_RenderModel_t_0914_win_to_lin(void *w, void *l); extern struct winRenderModel_t_0914 *struct_RenderModel_t_0914_wrap(void *l); extern RenderModel_t *struct_RenderModel_t_0914_unwrap(winRenderModel_t_0914 *w); -typedef struct winVREvent_t_0913 winVREvent_t_0913; -extern void struct_VREvent_t_0913_lin_to_win(void *l, void *w); typedef struct winVRControllerState001_t_0913 winVRControllerState001_t_0913; extern void struct_VRControllerState001_t_0913_lin_to_win(void *l, void *w); extern void struct_VRControllerState001_t_0913_win_to_lin(void *w, void *l); @@ -671,8 +667,6 @@ extern void struct_RenderModel_t_0913_lin_to_win(void *l, void *w); extern void struct_RenderModel_t_0913_win_to_lin(void *w, void *l); extern struct winRenderModel_t_0913 *struct_RenderModel_t_0913_wrap(void *l); extern RenderModel_t *struct_RenderModel_t_0913_unwrap(winRenderModel_t_0913 *w); -typedef struct winVREvent_t_0912 winVREvent_t_0912; -extern void struct_VREvent_t_0912_lin_to_win(void *l, void *w); typedef struct winVRControllerState001_t_0912 winVRControllerState001_t_0912; extern void struct_VRControllerState001_t_0912_lin_to_win(void *l, void *w); extern void struct_VRControllerState001_t_0912_win_to_lin(void *w, void *l); @@ -702,8 +696,6 @@ extern void struct_RenderModel_t_0910_lin_to_win(void *l, void *w); extern void struct_RenderModel_t_0910_win_to_lin(void *w, void *l); extern struct winRenderModel_t_0910 *struct_RenderModel_t_0910_wrap(void *l); extern RenderModel_t *struct_RenderModel_t_0910_unwrap(winRenderModel_t_0910 *w); -typedef struct winVREvent_t_0910 winVREvent_t_0910; -extern void struct_VREvent_t_0910_lin_to_win(void *l, void *w); typedef struct winVRControllerState001_t_0910 winVRControllerState001_t_0910; extern void struct_VRControllerState001_t_0910_lin_to_win(void *l, void *w); extern void struct_VRControllerState001_t_0910_win_to_lin(void *w, void *l); @@ -720,8 +712,6 @@ extern void struct_RenderModel_t_099_lin_to_win(void *l, void *w); extern void struct_RenderModel_t_099_win_to_lin(void *w, void *l); extern struct winRenderModel_t_099 *struct_RenderModel_t_099_wrap(void *l); extern RenderModel_t *struct_RenderModel_t_099_unwrap(winRenderModel_t_099 *w); -typedef struct winVREvent_t_099 winVREvent_t_099; -extern void struct_VREvent_t_099_lin_to_win(void *l, void *w); typedef struct winVRControllerState001_t_099 winVRControllerState001_t_099; extern void struct_VRControllerState001_t_099_lin_to_win(void *l, void *w); extern void struct_VRControllerState001_t_099_win_to_lin(void *w, void *l); @@ -738,8 +728,6 @@ extern void struct_RenderModel_t_098_lin_to_win(void *l, void *w); extern void struct_RenderModel_t_098_win_to_lin(void *w, void *l); extern struct winRenderModel_t_098 *struct_RenderModel_t_098_wrap(void *l); extern RenderModel_t *struct_RenderModel_t_098_unwrap(winRenderModel_t_098 *w); -typedef struct winVREvent_t_098 winVREvent_t_098; -extern void struct_VREvent_t_098_lin_to_win(void *l, void *w); typedef struct winVRControllerState001_t_098 winVRControllerState001_t_098; extern void struct_VRControllerState001_t_098_lin_to_win(void *l, void *w); extern void struct_VRControllerState001_t_098_win_to_lin(void *w, void *l); @@ -756,8 +744,6 @@ extern void struct_RenderModel_t_097_lin_to_win(void *l, void *w); extern void struct_RenderModel_t_097_win_to_lin(void *w, void *l); extern struct winRenderModel_t_097 *struct_RenderModel_t_097_wrap(void *l); extern RenderModel_t *struct_RenderModel_t_097_unwrap(winRenderModel_t_097 *w); -typedef struct winVREvent_t_097 winVREvent_t_097; -extern void struct_VREvent_t_097_lin_to_win(void *l, void *w); typedef struct winVRControllerState001_t_097 winVRControllerState001_t_097; extern void struct_VRControllerState001_t_097_lin_to_win(void *l, void *w); extern void struct_VRControllerState001_t_097_win_to_lin(void *w, void *l); @@ -774,8 +760,6 @@ extern void struct_RenderModel_t_096_lin_to_win(void *l, void *w); extern void struct_RenderModel_t_096_win_to_lin(void *w, void *l); extern struct winRenderModel_t_096 *struct_RenderModel_t_096_wrap(void *l); extern RenderModel_t *struct_RenderModel_t_096_unwrap(winRenderModel_t_096 *w); -typedef struct winVREvent_t_096 winVREvent_t_096; -extern void struct_VREvent_t_096_lin_to_win(void *l, void *w); typedef struct winVRControllerState001_t_096 winVRControllerState001_t_096; extern void struct_VRControllerState001_t_096_lin_to_win(void *l, void *w); extern void struct_VRControllerState001_t_096_win_to_lin(void *w, void *l); @@ -792,8 +776,6 @@ extern void struct_RenderModel_t_094_lin_to_win(void *l, void *w); extern void struct_RenderModel_t_094_win_to_lin(void *w, void *l); extern struct winRenderModel_t_094 *struct_RenderModel_t_094_wrap(void *l); extern RenderModel_t *struct_RenderModel_t_094_unwrap(winRenderModel_t_094 *w); -typedef struct winVREvent_t_094 winVREvent_t_094; -extern void struct_VREvent_t_094_lin_to_win(void *l, void *w); typedef struct winVRControllerState001_t_094 winVRControllerState001_t_094; extern void struct_VRControllerState001_t_094_lin_to_win(void *l, void *w); extern void struct_VRControllerState001_t_094_win_to_lin(void *w, void *l); @@ -810,8 +792,6 @@ extern void struct_RenderModel_t_093_lin_to_win(void *l, void *w); extern void struct_RenderModel_t_093_win_to_lin(void *w, void *l); extern struct winRenderModel_t_093 *struct_RenderModel_t_093_wrap(void *l); extern RenderModel_t *struct_RenderModel_t_093_unwrap(winRenderModel_t_093 *w); -typedef struct winVREvent_t_093 winVREvent_t_093; -extern void struct_VREvent_t_093_lin_to_win(void *l, void *w); typedef struct winVRControllerState001_t_093 winVRControllerState001_t_093; extern void struct_VRControllerState001_t_093_lin_to_win(void *l, void *w); extern void struct_VRControllerState001_t_093_win_to_lin(void *w, void *l); @@ -828,8 +808,6 @@ extern void struct_RenderModel_t_092_lin_to_win(void *l, void *w); extern void struct_RenderModel_t_092_win_to_lin(void *w, void *l); extern struct winRenderModel_t_092 *struct_RenderModel_t_092_wrap(void *l); extern RenderModel_t *struct_RenderModel_t_092_unwrap(winRenderModel_t_092 *w); -typedef struct winVREvent_t_092 winVREvent_t_092; -extern void struct_VREvent_t_092_lin_to_win(void *l, void *w); typedef struct winVRControllerState001_t_092 winVRControllerState001_t_092; extern void struct_VRControllerState001_t_092_lin_to_win(void *l, void *w); extern void struct_VRControllerState001_t_092_win_to_lin(void *w, void *l); @@ -846,8 +824,6 @@ extern void struct_RenderModel_t_091_lin_to_win(void *l, void *w); extern void struct_RenderModel_t_091_win_to_lin(void *w, void *l); extern struct winRenderModel_t_091 *struct_RenderModel_t_091_wrap(void *l); extern RenderModel_t *struct_RenderModel_t_091_unwrap(winRenderModel_t_091 *w); -typedef struct winVREvent_t_091 winVREvent_t_091; -extern void struct_VREvent_t_091_lin_to_win(void *l, void *w); typedef struct winVRControllerState001_t_091 winVRControllerState001_t_091; extern void struct_VRControllerState001_t_091_lin_to_win(void *l, void *w); extern void struct_VRControllerState001_t_091_win_to_lin(void *w, void *l); @@ -864,8 +840,6 @@ extern void struct_RenderModel_t_090_lin_to_win(void *l, void *w); extern void struct_RenderModel_t_090_win_to_lin(void *w, void *l); extern struct winRenderModel_t_090 *struct_RenderModel_t_090_wrap(void *l); extern RenderModel_t *struct_RenderModel_t_090_unwrap(winRenderModel_t_090 *w); -typedef struct winVREvent_t_090 winVREvent_t_090; -extern void struct_VREvent_t_090_lin_to_win(void *l, void *w); typedef struct winVRControllerState001_t_090 winVRControllerState001_t_090; extern void struct_VRControllerState001_t_090_lin_to_win(void *l, void *w); extern void struct_VRControllerState001_t_090_win_to_lin(void *w, void *l); diff --git a/vrclient_x64/vrclient_x64/struct_converters_090.cpp b/vrclient_x64/vrclient_x64/struct_converters_090.cpp index 66f1bfd5..636afe0b 100644 --- a/vrclient_x64/vrclient_x64/struct_converters_090.cpp +++ b/vrclient_x64/vrclient_x64/struct_converters_090.cpp @@ -110,25 +110,6 @@ struct RenderModel_t *struct_RenderModel_t_090_unwrap(winRenderModel_t_090 *w) return ret; } -#pragma pack(push, 8) -struct winVREvent_t_090 { - vr::EVREventType eventType; - vr::TrackedDeviceIndex_t trackedDeviceIndex; - vr::VREvent_Data_t data __attribute__((aligned(8))); - float eventAgeSeconds; -} __attribute__ ((ms_struct)); -#pragma pack(pop) - -void struct_VREvent_t_090_lin_to_win(void *l, void *w) -{ - struct winVREvent_t_090 *win = (struct winVREvent_t_090 *)w; - VREvent_t *lin = (VREvent_t *)l; - win->eventType = lin->eventType; - win->trackedDeviceIndex = lin->trackedDeviceIndex; - win->data = lin->data; - win->eventAgeSeconds = lin->eventAgeSeconds; -} - #pragma pack(push, 8) struct winVRControllerState001_t_090 { uint32_t unPacketNum; diff --git a/vrclient_x64/vrclient_x64/struct_converters_091.cpp b/vrclient_x64/vrclient_x64/struct_converters_091.cpp index fd29547a..abd11dff 100644 --- a/vrclient_x64/vrclient_x64/struct_converters_091.cpp +++ b/vrclient_x64/vrclient_x64/struct_converters_091.cpp @@ -110,25 +110,6 @@ struct RenderModel_t *struct_RenderModel_t_091_unwrap(winRenderModel_t_091 *w) return ret; } -#pragma pack(push, 8) -struct winVREvent_t_091 { - vr::EVREventType eventType; - vr::TrackedDeviceIndex_t trackedDeviceIndex; - vr::VREvent_Data_t data __attribute__((aligned(8))); - float eventAgeSeconds; -} __attribute__ ((ms_struct)); -#pragma pack(pop) - -void struct_VREvent_t_091_lin_to_win(void *l, void *w) -{ - struct winVREvent_t_091 *win = (struct winVREvent_t_091 *)w; - VREvent_t *lin = (VREvent_t *)l; - win->eventType = lin->eventType; - win->trackedDeviceIndex = lin->trackedDeviceIndex; - win->data = lin->data; - win->eventAgeSeconds = lin->eventAgeSeconds; -} - #pragma pack(push, 8) struct winVRControllerState001_t_091 { uint32_t unPacketNum; diff --git a/vrclient_x64/vrclient_x64/struct_converters_0910.cpp b/vrclient_x64/vrclient_x64/struct_converters_0910.cpp index 21369dbb..99328906 100644 --- a/vrclient_x64/vrclient_x64/struct_converters_0910.cpp +++ b/vrclient_x64/vrclient_x64/struct_converters_0910.cpp @@ -110,25 +110,6 @@ struct RenderModel_t *struct_RenderModel_t_0910_unwrap(winRenderModel_t_0910 *w) return ret; } -#pragma pack(push, 8) -struct winVREvent_t_0910 { - vr::EVREventType eventType; - vr::TrackedDeviceIndex_t trackedDeviceIndex; - vr::VREvent_Data_t data __attribute__((aligned(8))); - float eventAgeSeconds; -} __attribute__ ((ms_struct)); -#pragma pack(pop) - -void struct_VREvent_t_0910_lin_to_win(void *l, void *w) -{ - struct winVREvent_t_0910 *win = (struct winVREvent_t_0910 *)w; - VREvent_t *lin = (VREvent_t *)l; - win->eventType = lin->eventType; - win->trackedDeviceIndex = lin->trackedDeviceIndex; - win->data = lin->data; - win->eventAgeSeconds = lin->eventAgeSeconds; -} - #pragma pack(push, 8) struct winVRControllerState001_t_0910 { uint32_t unPacketNum; diff --git a/vrclient_x64/vrclient_x64/struct_converters_0912.cpp b/vrclient_x64/vrclient_x64/struct_converters_0912.cpp index 7afe9b36..75af165e 100644 --- a/vrclient_x64/vrclient_x64/struct_converters_0912.cpp +++ b/vrclient_x64/vrclient_x64/struct_converters_0912.cpp @@ -6,25 +6,6 @@ using namespace vr; extern "C" { #include "struct_converters.h" -#pragma pack(push, 8) -struct winVREvent_t_0912 { - vr::EVREventType eventType; - vr::TrackedDeviceIndex_t trackedDeviceIndex; - vr::VREvent_Data_t data __attribute__((aligned(8))); - float eventAgeSeconds; -} __attribute__ ((ms_struct)); -#pragma pack(pop) - -void struct_VREvent_t_0912_lin_to_win(void *l, void *w) -{ - struct winVREvent_t_0912 *win = (struct winVREvent_t_0912 *)w; - VREvent_t *lin = (VREvent_t *)l; - win->eventType = lin->eventType; - win->trackedDeviceIndex = lin->trackedDeviceIndex; - win->data = lin->data; - win->eventAgeSeconds = lin->eventAgeSeconds; -} - #pragma pack(push, 8) struct winVRControllerState001_t_0912 { uint32_t unPacketNum; diff --git a/vrclient_x64/vrclient_x64/struct_converters_0913.cpp b/vrclient_x64/vrclient_x64/struct_converters_0913.cpp index 4b241017..06d49789 100644 --- a/vrclient_x64/vrclient_x64/struct_converters_0913.cpp +++ b/vrclient_x64/vrclient_x64/struct_converters_0913.cpp @@ -6,25 +6,6 @@ using namespace vr; extern "C" { #include "struct_converters.h" -#pragma pack(push, 8) -struct winVREvent_t_0913 { - vr::EVREventType eventType; - vr::TrackedDeviceIndex_t trackedDeviceIndex; - vr::VREvent_Data_t data __attribute__((aligned(8))); - float eventAgeSeconds; -} __attribute__ ((ms_struct)); -#pragma pack(pop) - -void struct_VREvent_t_0913_lin_to_win(void *l, void *w) -{ - struct winVREvent_t_0913 *win = (struct winVREvent_t_0913 *)w; - VREvent_t *lin = (VREvent_t *)l; - win->eventType = lin->eventType; - win->trackedDeviceIndex = lin->trackedDeviceIndex; - win->data = lin->data; - win->eventAgeSeconds = lin->eventAgeSeconds; -} - #pragma pack(push, 8) struct winVRControllerState001_t_0913 { uint32_t unPacketNum; diff --git a/vrclient_x64/vrclient_x64/struct_converters_0914.cpp b/vrclient_x64/vrclient_x64/struct_converters_0914.cpp index 69f1699d..a60fb158 100644 --- a/vrclient_x64/vrclient_x64/struct_converters_0914.cpp +++ b/vrclient_x64/vrclient_x64/struct_converters_0914.cpp @@ -6,25 +6,6 @@ using namespace vr; extern "C" { #include "struct_converters.h" -#pragma pack(push, 8) -struct winVREvent_t_0914 { - vr::EVREventType eventType; - vr::TrackedDeviceIndex_t trackedDeviceIndex; - vr::VREvent_Data_t data __attribute__((aligned(8))); - float eventAgeSeconds; -} __attribute__ ((ms_struct)); -#pragma pack(pop) - -void struct_VREvent_t_0914_lin_to_win(void *l, void *w) -{ - struct winVREvent_t_0914 *win = (struct winVREvent_t_0914 *)w; - VREvent_t *lin = (VREvent_t *)l; - win->eventType = lin->eventType; - win->trackedDeviceIndex = lin->trackedDeviceIndex; - win->data = lin->data; - win->eventAgeSeconds = lin->eventAgeSeconds; -} - #pragma pack(push, 8) struct winVRControllerState001_t_0914 { uint32_t unPacketNum; diff --git a/vrclient_x64/vrclient_x64/struct_converters_092.cpp b/vrclient_x64/vrclient_x64/struct_converters_092.cpp index 57a5047c..083d49a2 100644 --- a/vrclient_x64/vrclient_x64/struct_converters_092.cpp +++ b/vrclient_x64/vrclient_x64/struct_converters_092.cpp @@ -110,25 +110,6 @@ struct RenderModel_t *struct_RenderModel_t_092_unwrap(winRenderModel_t_092 *w) return ret; } -#pragma pack(push, 8) -struct winVREvent_t_092 { - vr::EVREventType eventType; - vr::TrackedDeviceIndex_t trackedDeviceIndex; - vr::VREvent_Data_t data __attribute__((aligned(8))); - float eventAgeSeconds; -} __attribute__ ((ms_struct)); -#pragma pack(pop) - -void struct_VREvent_t_092_lin_to_win(void *l, void *w) -{ - struct winVREvent_t_092 *win = (struct winVREvent_t_092 *)w; - VREvent_t *lin = (VREvent_t *)l; - win->eventType = lin->eventType; - win->trackedDeviceIndex = lin->trackedDeviceIndex; - win->data = lin->data; - win->eventAgeSeconds = lin->eventAgeSeconds; -} - #pragma pack(push, 8) struct winVRControllerState001_t_092 { uint32_t unPacketNum; diff --git a/vrclient_x64/vrclient_x64/struct_converters_093.cpp b/vrclient_x64/vrclient_x64/struct_converters_093.cpp index d84ef5af..6b1aa70c 100644 --- a/vrclient_x64/vrclient_x64/struct_converters_093.cpp +++ b/vrclient_x64/vrclient_x64/struct_converters_093.cpp @@ -110,25 +110,6 @@ struct RenderModel_t *struct_RenderModel_t_093_unwrap(winRenderModel_t_093 *w) return ret; } -#pragma pack(push, 8) -struct winVREvent_t_093 { - vr::EVREventType eventType; - vr::TrackedDeviceIndex_t trackedDeviceIndex; - vr::VREvent_Data_t data __attribute__((aligned(8))); - float eventAgeSeconds; -} __attribute__ ((ms_struct)); -#pragma pack(pop) - -void struct_VREvent_t_093_lin_to_win(void *l, void *w) -{ - struct winVREvent_t_093 *win = (struct winVREvent_t_093 *)w; - VREvent_t *lin = (VREvent_t *)l; - win->eventType = lin->eventType; - win->trackedDeviceIndex = lin->trackedDeviceIndex; - win->data = lin->data; - win->eventAgeSeconds = lin->eventAgeSeconds; -} - #pragma pack(push, 8) struct winVRControllerState001_t_093 { uint32_t unPacketNum; diff --git a/vrclient_x64/vrclient_x64/struct_converters_094.cpp b/vrclient_x64/vrclient_x64/struct_converters_094.cpp index ee5f300b..30c589bc 100644 --- a/vrclient_x64/vrclient_x64/struct_converters_094.cpp +++ b/vrclient_x64/vrclient_x64/struct_converters_094.cpp @@ -110,25 +110,6 @@ struct RenderModel_t *struct_RenderModel_t_094_unwrap(winRenderModel_t_094 *w) return ret; } -#pragma pack(push, 8) -struct winVREvent_t_094 { - vr::EVREventType eventType; - vr::TrackedDeviceIndex_t trackedDeviceIndex; - vr::VREvent_Data_t data __attribute__((aligned(8))); - float eventAgeSeconds; -} __attribute__ ((ms_struct)); -#pragma pack(pop) - -void struct_VREvent_t_094_lin_to_win(void *l, void *w) -{ - struct winVREvent_t_094 *win = (struct winVREvent_t_094 *)w; - VREvent_t *lin = (VREvent_t *)l; - win->eventType = lin->eventType; - win->trackedDeviceIndex = lin->trackedDeviceIndex; - win->data = lin->data; - win->eventAgeSeconds = lin->eventAgeSeconds; -} - #pragma pack(push, 8) struct winVRControllerState001_t_094 { uint32_t unPacketNum; diff --git a/vrclient_x64/vrclient_x64/struct_converters_096.cpp b/vrclient_x64/vrclient_x64/struct_converters_096.cpp index 89702ab5..2e90c010 100644 --- a/vrclient_x64/vrclient_x64/struct_converters_096.cpp +++ b/vrclient_x64/vrclient_x64/struct_converters_096.cpp @@ -110,25 +110,6 @@ struct RenderModel_t *struct_RenderModel_t_096_unwrap(winRenderModel_t_096 *w) return ret; } -#pragma pack(push, 8) -struct winVREvent_t_096 { - vr::EVREventType eventType; - vr::TrackedDeviceIndex_t trackedDeviceIndex; - vr::VREvent_Data_t data __attribute__((aligned(8))); - float eventAgeSeconds; -} __attribute__ ((ms_struct)); -#pragma pack(pop) - -void struct_VREvent_t_096_lin_to_win(void *l, void *w) -{ - struct winVREvent_t_096 *win = (struct winVREvent_t_096 *)w; - VREvent_t *lin = (VREvent_t *)l; - win->eventType = lin->eventType; - win->trackedDeviceIndex = lin->trackedDeviceIndex; - win->data = lin->data; - win->eventAgeSeconds = lin->eventAgeSeconds; -} - #pragma pack(push, 8) struct winVRControllerState001_t_096 { uint32_t unPacketNum; diff --git a/vrclient_x64/vrclient_x64/struct_converters_097.cpp b/vrclient_x64/vrclient_x64/struct_converters_097.cpp index 888aa687..e5046b6c 100644 --- a/vrclient_x64/vrclient_x64/struct_converters_097.cpp +++ b/vrclient_x64/vrclient_x64/struct_converters_097.cpp @@ -110,25 +110,6 @@ struct RenderModel_t *struct_RenderModel_t_097_unwrap(winRenderModel_t_097 *w) return ret; } -#pragma pack(push, 8) -struct winVREvent_t_097 { - vr::EVREventType eventType; - vr::TrackedDeviceIndex_t trackedDeviceIndex; - vr::VREvent_Data_t data __attribute__((aligned(8))); - float eventAgeSeconds; -} __attribute__ ((ms_struct)); -#pragma pack(pop) - -void struct_VREvent_t_097_lin_to_win(void *l, void *w) -{ - struct winVREvent_t_097 *win = (struct winVREvent_t_097 *)w; - VREvent_t *lin = (VREvent_t *)l; - win->eventType = lin->eventType; - win->trackedDeviceIndex = lin->trackedDeviceIndex; - win->data = lin->data; - win->eventAgeSeconds = lin->eventAgeSeconds; -} - #pragma pack(push, 8) struct winVRControllerState001_t_097 { uint32_t unPacketNum; diff --git a/vrclient_x64/vrclient_x64/struct_converters_098.cpp b/vrclient_x64/vrclient_x64/struct_converters_098.cpp index 0c704a8b..05dbcc6d 100644 --- a/vrclient_x64/vrclient_x64/struct_converters_098.cpp +++ b/vrclient_x64/vrclient_x64/struct_converters_098.cpp @@ -110,25 +110,6 @@ struct RenderModel_t *struct_RenderModel_t_098_unwrap(winRenderModel_t_098 *w) return ret; } -#pragma pack(push, 8) -struct winVREvent_t_098 { - vr::EVREventType eventType; - vr::TrackedDeviceIndex_t trackedDeviceIndex; - vr::VREvent_Data_t data __attribute__((aligned(8))); - float eventAgeSeconds; -} __attribute__ ((ms_struct)); -#pragma pack(pop) - -void struct_VREvent_t_098_lin_to_win(void *l, void *w) -{ - struct winVREvent_t_098 *win = (struct winVREvent_t_098 *)w; - VREvent_t *lin = (VREvent_t *)l; - win->eventType = lin->eventType; - win->trackedDeviceIndex = lin->trackedDeviceIndex; - win->data = lin->data; - win->eventAgeSeconds = lin->eventAgeSeconds; -} - #pragma pack(push, 8) struct winVRControllerState001_t_098 { uint32_t unPacketNum; diff --git a/vrclient_x64/vrclient_x64/struct_converters_099.cpp b/vrclient_x64/vrclient_x64/struct_converters_099.cpp index 795f2124..6021c549 100644 --- a/vrclient_x64/vrclient_x64/struct_converters_099.cpp +++ b/vrclient_x64/vrclient_x64/struct_converters_099.cpp @@ -110,25 +110,6 @@ struct RenderModel_t *struct_RenderModel_t_099_unwrap(winRenderModel_t_099 *w) return ret; } -#pragma pack(push, 8) -struct winVREvent_t_099 { - vr::EVREventType eventType; - vr::TrackedDeviceIndex_t trackedDeviceIndex; - vr::VREvent_Data_t data __attribute__((aligned(8))); - float eventAgeSeconds; -} __attribute__ ((ms_struct)); -#pragma pack(pop) - -void struct_VREvent_t_099_lin_to_win(void *l, void *w) -{ - struct winVREvent_t_099 *win = (struct winVREvent_t_099 *)w; - VREvent_t *lin = (VREvent_t *)l; - win->eventType = lin->eventType; - win->trackedDeviceIndex = lin->trackedDeviceIndex; - win->data = lin->data; - win->eventAgeSeconds = lin->eventAgeSeconds; -} - #pragma pack(push, 8) struct winVRControllerState001_t_099 { uint32_t unPacketNum; diff --git a/vrclient_x64/vrclient_x64/winIVROverlay.c b/vrclient_x64/vrclient_x64/winIVROverlay.c index 1d3a097c..bdf75cf8 100644 --- a/vrclient_x64/vrclient_x64/winIVROverlay.c +++ b/vrclient_x64/vrclient_x64/winIVROverlay.c @@ -6847,7 +6847,7 @@ EVROverlayError __thiscall winIVROverlay_IVROverlay_008_GetTransformForOverlayCo } DEFINE_THISCALL_WRAPPER(winIVROverlay_IVROverlay_008_PollNextOverlayEvent, 16) -bool __thiscall winIVROverlay_IVROverlay_008_PollNextOverlayEvent(winIVROverlay_IVROverlay_008 *_this, VROverlayHandle_t ulOverlayHandle, winVREvent_t_0914 * pEvent) +bool __thiscall winIVROverlay_IVROverlay_008_PollNextOverlayEvent(winIVROverlay_IVROverlay_008 *_this, VROverlayHandle_t ulOverlayHandle, VREvent_t * pEvent) { TRACE("%p\n", _this); return cppIVROverlay_IVROverlay_008_PollNextOverlayEvent(_this->linux_side, ulOverlayHandle, pEvent); @@ -7439,7 +7439,7 @@ bool __thiscall winIVROverlay_IVROverlay_007_IsOverlayVisible(winIVROverlay_IVRO } DEFINE_THISCALL_WRAPPER(winIVROverlay_IVROverlay_007_PollNextOverlayEvent, 16) -bool __thiscall winIVROverlay_IVROverlay_007_PollNextOverlayEvent(winIVROverlay_IVROverlay_007 *_this, VROverlayHandle_t ulOverlayHandle, winVREvent_t_0912 * pEvent) +bool __thiscall winIVROverlay_IVROverlay_007_PollNextOverlayEvent(winIVROverlay_IVROverlay_007 *_this, VROverlayHandle_t ulOverlayHandle, VREvent_t * pEvent) { TRACE("%p\n", _this); return cppIVROverlay_IVROverlay_007_PollNextOverlayEvent(_this->linux_side, ulOverlayHandle, pEvent); @@ -8011,7 +8011,7 @@ bool __thiscall winIVROverlay_IVROverlay_005_IsOverlayVisible(winIVROverlay_IVRO } DEFINE_THISCALL_WRAPPER(winIVROverlay_IVROverlay_005_PollNextOverlayEvent, 16) -bool __thiscall winIVROverlay_IVROverlay_005_PollNextOverlayEvent(winIVROverlay_IVROverlay_005 *_this, VROverlayHandle_t ulOverlayHandle, winVREvent_t_0910 * pEvent) +bool __thiscall winIVROverlay_IVROverlay_005_PollNextOverlayEvent(winIVROverlay_IVROverlay_005 *_this, VROverlayHandle_t ulOverlayHandle, VREvent_t * pEvent) { TRACE("%p\n", _this); return cppIVROverlay_IVROverlay_005_PollNextOverlayEvent(_this->linux_side, ulOverlayHandle, pEvent); @@ -8538,7 +8538,7 @@ bool __thiscall winIVROverlay_IVROverlay_004_IsOverlayVisible(winIVROverlay_IVRO } DEFINE_THISCALL_WRAPPER(winIVROverlay_IVROverlay_004_PollNextOverlayEvent, 16) -bool __thiscall winIVROverlay_IVROverlay_004_PollNextOverlayEvent(winIVROverlay_IVROverlay_004 *_this, VROverlayHandle_t ulOverlayHandle, winVREvent_t_098 * pEvent) +bool __thiscall winIVROverlay_IVROverlay_004_PollNextOverlayEvent(winIVROverlay_IVROverlay_004 *_this, VROverlayHandle_t ulOverlayHandle, VREvent_t * pEvent) { TRACE("%p\n", _this); return cppIVROverlay_IVROverlay_004_PollNextOverlayEvent(_this->linux_side, ulOverlayHandle, pEvent); @@ -9015,7 +9015,7 @@ bool __thiscall winIVROverlay_IVROverlay_003_IsOverlayVisible(winIVROverlay_IVRO } DEFINE_THISCALL_WRAPPER(winIVROverlay_IVROverlay_003_PollNextOverlayEvent, 16) -bool __thiscall winIVROverlay_IVROverlay_003_PollNextOverlayEvent(winIVROverlay_IVROverlay_003 *_this, VROverlayHandle_t ulOverlayHandle, winVREvent_t_097 * pEvent) +bool __thiscall winIVROverlay_IVROverlay_003_PollNextOverlayEvent(winIVROverlay_IVROverlay_003 *_this, VROverlayHandle_t ulOverlayHandle, VREvent_t * pEvent) { TRACE("%p\n", _this); return cppIVROverlay_IVROverlay_003_PollNextOverlayEvent(_this->linux_side, ulOverlayHandle, pEvent); @@ -9467,7 +9467,7 @@ bool __thiscall winIVROverlay_IVROverlay_002_IsOverlayVisible(winIVROverlay_IVRO } DEFINE_THISCALL_WRAPPER(winIVROverlay_IVROverlay_002_PollNextOverlayEvent, 16) -bool __thiscall winIVROverlay_IVROverlay_002_PollNextOverlayEvent(winIVROverlay_IVROverlay_002 *_this, VROverlayHandle_t ulOverlayHandle, winVREvent_t_094 * pEvent) +bool __thiscall winIVROverlay_IVROverlay_002_PollNextOverlayEvent(winIVROverlay_IVROverlay_002 *_this, VROverlayHandle_t ulOverlayHandle, VREvent_t * pEvent) { TRACE("%p\n", _this); return cppIVROverlay_IVROverlay_002_PollNextOverlayEvent(_this->linux_side, ulOverlayHandle, pEvent); @@ -9904,7 +9904,7 @@ bool __thiscall winIVROverlay_IVROverlay_001_IsOverlayVisible(winIVROverlay_IVRO } DEFINE_THISCALL_WRAPPER(winIVROverlay_IVROverlay_001_PollNextOverlayEvent, 16) -bool __thiscall winIVROverlay_IVROverlay_001_PollNextOverlayEvent(winIVROverlay_IVROverlay_001 *_this, VROverlayHandle_t ulOverlayHandle, winVREvent_t_092 * pEvent) +bool __thiscall winIVROverlay_IVROverlay_001_PollNextOverlayEvent(winIVROverlay_IVROverlay_001 *_this, VROverlayHandle_t ulOverlayHandle, VREvent_t * pEvent) { TRACE("%p\n", _this); return cppIVROverlay_IVROverlay_001_PollNextOverlayEvent(_this->linux_side, ulOverlayHandle, pEvent); diff --git a/vrclient_x64/vrclient_x64/winIVRSystem.c b/vrclient_x64/vrclient_x64/winIVRSystem.c index b66fe34f..05a4e5c6 100644 --- a/vrclient_x64/vrclient_x64/winIVRSystem.c +++ b/vrclient_x64/vrclient_x64/winIVRSystem.c @@ -270,14 +270,14 @@ HiddenAreaMesh_t *__thiscall winIVRSystem_IVRSystem_020_GetHiddenAreaMesh(winIVR } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_020_GetControllerState, 16) -bool __thiscall winIVRSystem_IVRSystem_020_GetControllerState(winIVRSystem_IVRSystem_020 *_this, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_1610 * pControllerState, uint32_t unControllerStateSize) +bool __thiscall winIVRSystem_IVRSystem_020_GetControllerState(winIVRSystem_IVRSystem_020 *_this, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_1610 * pControllerState, uint32_t unControllerStateSize) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_020_GetControllerState(_this->linux_side, unControllerDeviceIndex, pControllerState, unControllerStateSize); } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_020_GetControllerStateWithPose, 24) -bool __thiscall winIVRSystem_IVRSystem_020_GetControllerStateWithPose(winIVRSystem_IVRSystem_020 *_this, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_1610 * pControllerState, uint32_t unControllerStateSize, TrackedDevicePose_t * pTrackedDevicePose) +bool __thiscall winIVRSystem_IVRSystem_020_GetControllerStateWithPose(winIVRSystem_IVRSystem_020 *_this, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_1610 * pControllerState, uint32_t unControllerStateSize, TrackedDevicePose_t * pTrackedDevicePose) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_020_GetControllerStateWithPose(_this->linux_side, eOrigin, unControllerDeviceIndex, pControllerState, unControllerStateSize, pTrackedDevicePose); @@ -765,14 +765,14 @@ HiddenAreaMesh_t *__thiscall winIVRSystem_IVRSystem_019_GetHiddenAreaMesh(winIVR } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_019_GetControllerState, 16) -bool __thiscall winIVRSystem_IVRSystem_019_GetControllerState(winIVRSystem_IVRSystem_019 *_this, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_1418 * pControllerState, uint32_t unControllerStateSize) +bool __thiscall winIVRSystem_IVRSystem_019_GetControllerState(winIVRSystem_IVRSystem_019 *_this, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_1418 * pControllerState, uint32_t unControllerStateSize) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_019_GetControllerState(_this->linux_side, unControllerDeviceIndex, pControllerState, unControllerStateSize); } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_019_GetControllerStateWithPose, 24) -bool __thiscall winIVRSystem_IVRSystem_019_GetControllerStateWithPose(winIVRSystem_IVRSystem_019 *_this, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_1418 * pControllerState, uint32_t unControllerStateSize, TrackedDevicePose_t * pTrackedDevicePose) +bool __thiscall winIVRSystem_IVRSystem_019_GetControllerStateWithPose(winIVRSystem_IVRSystem_019 *_this, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_1418 * pControllerState, uint32_t unControllerStateSize, TrackedDevicePose_t * pTrackedDevicePose) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_019_GetControllerStateWithPose(_this->linux_side, eOrigin, unControllerDeviceIndex, pControllerState, unControllerStateSize, pTrackedDevicePose); @@ -1244,14 +1244,14 @@ HiddenAreaMesh_t *__thiscall winIVRSystem_IVRSystem_017_GetHiddenAreaMesh(winIVR } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_017_GetControllerState, 16) -bool __thiscall winIVRSystem_IVRSystem_017_GetControllerState(winIVRSystem_IVRSystem_017 *_this, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_1011 * pControllerState, uint32_t unControllerStateSize) +bool __thiscall winIVRSystem_IVRSystem_017_GetControllerState(winIVRSystem_IVRSystem_017 *_this, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_1011 * pControllerState, uint32_t unControllerStateSize) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_017_GetControllerState(_this->linux_side, unControllerDeviceIndex, pControllerState, unControllerStateSize); } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_017_GetControllerStateWithPose, 24) -bool __thiscall winIVRSystem_IVRSystem_017_GetControllerStateWithPose(winIVRSystem_IVRSystem_017 *_this, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_1011 * pControllerState, uint32_t unControllerStateSize, TrackedDevicePose_t * pTrackedDevicePose) +bool __thiscall winIVRSystem_IVRSystem_017_GetControllerStateWithPose(winIVRSystem_IVRSystem_017 *_this, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_1011 * pControllerState, uint32_t unControllerStateSize, TrackedDevicePose_t * pTrackedDevicePose) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_017_GetControllerStateWithPose(_this->linux_side, eOrigin, unControllerDeviceIndex, pControllerState, unControllerStateSize, pTrackedDevicePose); @@ -1712,14 +1712,14 @@ HiddenAreaMesh_t *__thiscall winIVRSystem_IVRSystem_016_GetHiddenAreaMesh(winIVR } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_016_GetControllerState, 16) -bool __thiscall winIVRSystem_IVRSystem_016_GetControllerState(winIVRSystem_IVRSystem_016 *_this, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_109 * pControllerState, uint32_t unControllerStateSize) +bool __thiscall winIVRSystem_IVRSystem_016_GetControllerState(winIVRSystem_IVRSystem_016 *_this, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_109 * pControllerState, uint32_t unControllerStateSize) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_016_GetControllerState(_this->linux_side, unControllerDeviceIndex, pControllerState, unControllerStateSize); } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_016_GetControllerStateWithPose, 24) -bool __thiscall winIVRSystem_IVRSystem_016_GetControllerStateWithPose(winIVRSystem_IVRSystem_016 *_this, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_109 * pControllerState, uint32_t unControllerStateSize, TrackedDevicePose_t * pTrackedDevicePose) +bool __thiscall winIVRSystem_IVRSystem_016_GetControllerStateWithPose(winIVRSystem_IVRSystem_016 *_this, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_109 * pControllerState, uint32_t unControllerStateSize, TrackedDevicePose_t * pTrackedDevicePose) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_016_GetControllerStateWithPose(_this->linux_side, eOrigin, unControllerDeviceIndex, pControllerState, unControllerStateSize, pTrackedDevicePose); @@ -2173,14 +2173,14 @@ HiddenAreaMesh_t *__thiscall winIVRSystem_IVRSystem_015_GetHiddenAreaMesh(winIVR } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_015_GetControllerState, 16) -bool __thiscall winIVRSystem_IVRSystem_015_GetControllerState(winIVRSystem_IVRSystem_015 *_this, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_107 * pControllerState, uint32_t unControllerStateSize) +bool __thiscall winIVRSystem_IVRSystem_015_GetControllerState(winIVRSystem_IVRSystem_015 *_this, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_107 * pControllerState, uint32_t unControllerStateSize) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_015_GetControllerState(_this->linux_side, unControllerDeviceIndex, pControllerState, unControllerStateSize); } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_015_GetControllerStateWithPose, 24) -bool __thiscall winIVRSystem_IVRSystem_015_GetControllerStateWithPose(winIVRSystem_IVRSystem_015 *_this, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_107 * pControllerState, uint32_t unControllerStateSize, TrackedDevicePose_t * pTrackedDevicePose) +bool __thiscall winIVRSystem_IVRSystem_015_GetControllerStateWithPose(winIVRSystem_IVRSystem_015 *_this, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_107 * pControllerState, uint32_t unControllerStateSize, TrackedDevicePose_t * pTrackedDevicePose) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_015_GetControllerStateWithPose(_this->linux_side, eOrigin, unControllerDeviceIndex, pControllerState, unControllerStateSize, pTrackedDevicePose); @@ -2632,14 +2632,14 @@ HiddenAreaMesh_t *__thiscall winIVRSystem_IVRSystem_014_GetHiddenAreaMesh(winIVR } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_014_GetControllerState, 16) -bool __thiscall winIVRSystem_IVRSystem_014_GetControllerState(winIVRSystem_IVRSystem_014 *_this, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_104 * pControllerState, uint32_t unControllerStateSize) +bool __thiscall winIVRSystem_IVRSystem_014_GetControllerState(winIVRSystem_IVRSystem_014 *_this, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_104 * pControllerState, uint32_t unControllerStateSize) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_014_GetControllerState(_this->linux_side, unControllerDeviceIndex, pControllerState, unControllerStateSize); } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_014_GetControllerStateWithPose, 24) -bool __thiscall winIVRSystem_IVRSystem_014_GetControllerStateWithPose(winIVRSystem_IVRSystem_014 *_this, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_104 * pControllerState, uint32_t unControllerStateSize, TrackedDevicePose_t * pTrackedDevicePose) +bool __thiscall winIVRSystem_IVRSystem_014_GetControllerStateWithPose(winIVRSystem_IVRSystem_014 *_this, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_104 * pControllerState, uint32_t unControllerStateSize, TrackedDevicePose_t * pTrackedDevicePose) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_014_GetControllerStateWithPose(_this->linux_side, eOrigin, unControllerDeviceIndex, pControllerState, unControllerStateSize, pTrackedDevicePose); @@ -3092,14 +3092,14 @@ HiddenAreaMesh_t *__thiscall winIVRSystem_IVRSystem_012_GetHiddenAreaMesh(winIVR } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_012_GetControllerState, 12) -bool __thiscall winIVRSystem_IVRSystem_012_GetControllerState(winIVRSystem_IVRSystem_012 *_this, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_103 * pControllerState) +bool __thiscall winIVRSystem_IVRSystem_012_GetControllerState(winIVRSystem_IVRSystem_012 *_this, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_103 * pControllerState) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_012_GetControllerState(_this->linux_side, unControllerDeviceIndex, pControllerState); } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_012_GetControllerStateWithPose, 20) -bool __thiscall winIVRSystem_IVRSystem_012_GetControllerStateWithPose(winIVRSystem_IVRSystem_012 *_this, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_103 * pControllerState, TrackedDevicePose_t * pTrackedDevicePose) +bool __thiscall winIVRSystem_IVRSystem_012_GetControllerStateWithPose(winIVRSystem_IVRSystem_012 *_this, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_103 * pControllerState, TrackedDevicePose_t * pTrackedDevicePose) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_012_GetControllerStateWithPose(_this->linux_side, eOrigin, unControllerDeviceIndex, pControllerState, pTrackedDevicePose); @@ -3552,14 +3552,14 @@ HiddenAreaMesh_t *__thiscall winIVRSystem_IVRSystem_011_GetHiddenAreaMesh(winIVR } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_011_GetControllerState, 12) -bool __thiscall winIVRSystem_IVRSystem_011_GetControllerState(winIVRSystem_IVRSystem_011 *_this, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_0918 * pControllerState) +bool __thiscall winIVRSystem_IVRSystem_011_GetControllerState(winIVRSystem_IVRSystem_011 *_this, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_0918 * pControllerState) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_011_GetControllerState(_this->linux_side, unControllerDeviceIndex, pControllerState); } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_011_GetControllerStateWithPose, 20) -bool __thiscall winIVRSystem_IVRSystem_011_GetControllerStateWithPose(winIVRSystem_IVRSystem_011 *_this, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_0918 * pControllerState, TrackedDevicePose_t * pTrackedDevicePose) +bool __thiscall winIVRSystem_IVRSystem_011_GetControllerStateWithPose(winIVRSystem_IVRSystem_011 *_this, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_0918 * pControllerState, TrackedDevicePose_t * pTrackedDevicePose) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_011_GetControllerStateWithPose(_this->linux_side, eOrigin, unControllerDeviceIndex, pControllerState, pTrackedDevicePose); @@ -4001,14 +4001,14 @@ const char * __thiscall winIVRSystem_IVRSystem_010_GetPropErrorNameFromEnum(winI } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_010_PollNextEvent, 8) -bool __thiscall winIVRSystem_IVRSystem_010_PollNextEvent(winIVRSystem_IVRSystem_010 *_this, winVREvent_t_0914 * pEvent) +bool __thiscall winIVRSystem_IVRSystem_010_PollNextEvent(winIVRSystem_IVRSystem_010 *_this, VREvent_t * pEvent) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_010_PollNextEvent(_this->linux_side, pEvent); } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_010_PollNextEventWithPose, 16) -bool __thiscall winIVRSystem_IVRSystem_010_PollNextEventWithPose(winIVRSystem_IVRSystem_010 *_this, ETrackingUniverseOrigin eOrigin, winVREvent_t_0914 * pEvent, TrackedDevicePose_t * pTrackedDevicePose) +bool __thiscall winIVRSystem_IVRSystem_010_PollNextEventWithPose(winIVRSystem_IVRSystem_010 *_this, ETrackingUniverseOrigin eOrigin, VREvent_t * pEvent, TrackedDevicePose_t * pTrackedDevicePose) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_010_PollNextEventWithPose(_this->linux_side, eOrigin, pEvent, pTrackedDevicePose); @@ -4030,14 +4030,14 @@ HiddenAreaMesh_t *__thiscall winIVRSystem_IVRSystem_010_GetHiddenAreaMesh(winIVR } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_010_GetControllerState, 12) -bool __thiscall winIVRSystem_IVRSystem_010_GetControllerState(winIVRSystem_IVRSystem_010 *_this, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_0914 * pControllerState) +bool __thiscall winIVRSystem_IVRSystem_010_GetControllerState(winIVRSystem_IVRSystem_010 *_this, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_0914 * pControllerState) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_010_GetControllerState(_this->linux_side, unControllerDeviceIndex, pControllerState); } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_010_GetControllerStateWithPose, 20) -bool __thiscall winIVRSystem_IVRSystem_010_GetControllerStateWithPose(winIVRSystem_IVRSystem_010 *_this, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_0914 * pControllerState, TrackedDevicePose_t * pTrackedDevicePose) +bool __thiscall winIVRSystem_IVRSystem_010_GetControllerStateWithPose(winIVRSystem_IVRSystem_010 *_this, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_0914 * pControllerState, TrackedDevicePose_t * pTrackedDevicePose) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_010_GetControllerStateWithPose(_this->linux_side, eOrigin, unControllerDeviceIndex, pControllerState, pTrackedDevicePose); @@ -4465,14 +4465,14 @@ const char * __thiscall winIVRSystem_IVRSystem_009_GetPropErrorNameFromEnum(winI } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_009_PollNextEvent, 8) -bool __thiscall winIVRSystem_IVRSystem_009_PollNextEvent(winIVRSystem_IVRSystem_009 *_this, winVREvent_t_0912 * pEvent) +bool __thiscall winIVRSystem_IVRSystem_009_PollNextEvent(winIVRSystem_IVRSystem_009 *_this, VREvent_t * pEvent) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_009_PollNextEvent(_this->linux_side, pEvent); } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_009_PollNextEventWithPose, 16) -bool __thiscall winIVRSystem_IVRSystem_009_PollNextEventWithPose(winIVRSystem_IVRSystem_009 *_this, ETrackingUniverseOrigin eOrigin, winVREvent_t_0912 * pEvent, TrackedDevicePose_t * pTrackedDevicePose) +bool __thiscall winIVRSystem_IVRSystem_009_PollNextEventWithPose(winIVRSystem_IVRSystem_009 *_this, ETrackingUniverseOrigin eOrigin, VREvent_t * pEvent, TrackedDevicePose_t * pTrackedDevicePose) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_009_PollNextEventWithPose(_this->linux_side, eOrigin, pEvent, pTrackedDevicePose); @@ -4494,14 +4494,14 @@ HiddenAreaMesh_t *__thiscall winIVRSystem_IVRSystem_009_GetHiddenAreaMesh(winIVR } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_009_GetControllerState, 12) -bool __thiscall winIVRSystem_IVRSystem_009_GetControllerState(winIVRSystem_IVRSystem_009 *_this, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_0912 * pControllerState) +bool __thiscall winIVRSystem_IVRSystem_009_GetControllerState(winIVRSystem_IVRSystem_009 *_this, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_0912 * pControllerState) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_009_GetControllerState(_this->linux_side, unControllerDeviceIndex, pControllerState); } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_009_GetControllerStateWithPose, 20) -bool __thiscall winIVRSystem_IVRSystem_009_GetControllerStateWithPose(winIVRSystem_IVRSystem_009 *_this, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_0912 * pControllerState, TrackedDevicePose_t * pTrackedDevicePose) +bool __thiscall winIVRSystem_IVRSystem_009_GetControllerStateWithPose(winIVRSystem_IVRSystem_009 *_this, ETrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_0912 * pControllerState, TrackedDevicePose_t * pTrackedDevicePose) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_009_GetControllerStateWithPose(_this->linux_side, eOrigin, unControllerDeviceIndex, pControllerState, pTrackedDevicePose); @@ -4907,14 +4907,14 @@ const char * __thiscall winIVRSystem_IVRSystem_006_GetPropErrorNameFromEnum(winI } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_006_PollNextEvent, 8) -bool __thiscall winIVRSystem_IVRSystem_006_PollNextEvent(winIVRSystem_IVRSystem_006 *_this, winVREvent_t_0910 * pEvent) +bool __thiscall winIVRSystem_IVRSystem_006_PollNextEvent(winIVRSystem_IVRSystem_006 *_this, VREvent_t * pEvent) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_006_PollNextEvent(_this->linux_side, pEvent); } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_006_PollNextEventWithPose, 16) -bool __thiscall winIVRSystem_IVRSystem_006_PollNextEventWithPose(winIVRSystem_IVRSystem_006 *_this, TrackingUniverseOrigin eOrigin, winVREvent_t_0910 * pEvent, TrackedDevicePose_t * pTrackedDevicePose) +bool __thiscall winIVRSystem_IVRSystem_006_PollNextEventWithPose(winIVRSystem_IVRSystem_006 *_this, TrackingUniverseOrigin eOrigin, VREvent_t * pEvent, TrackedDevicePose_t * pTrackedDevicePose) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_006_PollNextEventWithPose(_this->linux_side, eOrigin, pEvent, pTrackedDevicePose); @@ -4936,14 +4936,14 @@ HiddenAreaMesh_t *__thiscall winIVRSystem_IVRSystem_006_GetHiddenAreaMesh(winIVR } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_006_GetControllerState, 12) -bool __thiscall winIVRSystem_IVRSystem_006_GetControllerState(winIVRSystem_IVRSystem_006 *_this, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_0910 * pControllerState) +bool __thiscall winIVRSystem_IVRSystem_006_GetControllerState(winIVRSystem_IVRSystem_006 *_this, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_0910 * pControllerState) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_006_GetControllerState(_this->linux_side, unControllerDeviceIndex, pControllerState); } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_006_GetControllerStateWithPose, 20) -bool __thiscall winIVRSystem_IVRSystem_006_GetControllerStateWithPose(winIVRSystem_IVRSystem_006 *_this, TrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_0910 * pControllerState, TrackedDevicePose_t * pTrackedDevicePose) +bool __thiscall winIVRSystem_IVRSystem_006_GetControllerStateWithPose(winIVRSystem_IVRSystem_006 *_this, TrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_0910 * pControllerState, TrackedDevicePose_t * pTrackedDevicePose) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_006_GetControllerStateWithPose(_this->linux_side, eOrigin, unControllerDeviceIndex, pControllerState, pTrackedDevicePose); @@ -5334,14 +5334,14 @@ const char * __thiscall winIVRSystem_IVRSystem_005_GetPropErrorNameFromEnum(winI } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_005_PollNextEvent, 8) -bool __thiscall winIVRSystem_IVRSystem_005_PollNextEvent(winIVRSystem_IVRSystem_005 *_this, winVREvent_t_098 * pEvent) +bool __thiscall winIVRSystem_IVRSystem_005_PollNextEvent(winIVRSystem_IVRSystem_005 *_this, VREvent_t * pEvent) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_005_PollNextEvent(_this->linux_side, pEvent); } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_005_PollNextEventWithPose, 16) -bool __thiscall winIVRSystem_IVRSystem_005_PollNextEventWithPose(winIVRSystem_IVRSystem_005 *_this, TrackingUniverseOrigin eOrigin, winVREvent_t_098 * pEvent, TrackedDevicePose_t * pTrackedDevicePose) +bool __thiscall winIVRSystem_IVRSystem_005_PollNextEventWithPose(winIVRSystem_IVRSystem_005 *_this, TrackingUniverseOrigin eOrigin, VREvent_t * pEvent, TrackedDevicePose_t * pTrackedDevicePose) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_005_PollNextEventWithPose(_this->linux_side, eOrigin, pEvent, pTrackedDevicePose); @@ -5363,14 +5363,14 @@ HiddenAreaMesh_t *__thiscall winIVRSystem_IVRSystem_005_GetHiddenAreaMesh(winIVR } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_005_GetControllerState, 12) -bool __thiscall winIVRSystem_IVRSystem_005_GetControllerState(winIVRSystem_IVRSystem_005 *_this, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_098 * pControllerState) +bool __thiscall winIVRSystem_IVRSystem_005_GetControllerState(winIVRSystem_IVRSystem_005 *_this, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_098 * pControllerState) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_005_GetControllerState(_this->linux_side, unControllerDeviceIndex, pControllerState); } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_005_GetControllerStateWithPose, 20) -bool __thiscall winIVRSystem_IVRSystem_005_GetControllerStateWithPose(winIVRSystem_IVRSystem_005 *_this, TrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_098 * pControllerState, TrackedDevicePose_t * pTrackedDevicePose) +bool __thiscall winIVRSystem_IVRSystem_005_GetControllerStateWithPose(winIVRSystem_IVRSystem_005 *_this, TrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_098 * pControllerState, TrackedDevicePose_t * pTrackedDevicePose) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_005_GetControllerStateWithPose(_this->linux_side, eOrigin, unControllerDeviceIndex, pControllerState, pTrackedDevicePose); @@ -5723,14 +5723,14 @@ const char * __thiscall winIVRSystem_IVRSystem_004_GetPropErrorNameFromEnum(winI } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_004_PollNextEvent, 8) -bool __thiscall winIVRSystem_IVRSystem_004_PollNextEvent(winIVRSystem_IVRSystem_004 *_this, winVREvent_t_092 * pEvent) +bool __thiscall winIVRSystem_IVRSystem_004_PollNextEvent(winIVRSystem_IVRSystem_004 *_this, VREvent_t * pEvent) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_004_PollNextEvent(_this->linux_side, pEvent); } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_004_PollNextEventWithPose, 16) -bool __thiscall winIVRSystem_IVRSystem_004_PollNextEventWithPose(winIVRSystem_IVRSystem_004 *_this, TrackingUniverseOrigin eOrigin, winVREvent_t_092 * pEvent, TrackedDevicePose_t * pTrackedDevicePose) +bool __thiscall winIVRSystem_IVRSystem_004_PollNextEventWithPose(winIVRSystem_IVRSystem_004 *_this, TrackingUniverseOrigin eOrigin, VREvent_t * pEvent, TrackedDevicePose_t * pTrackedDevicePose) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_004_PollNextEventWithPose(_this->linux_side, eOrigin, pEvent, pTrackedDevicePose); @@ -5752,14 +5752,14 @@ HiddenAreaMesh_t *__thiscall winIVRSystem_IVRSystem_004_GetHiddenAreaMesh(winIVR } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_004_GetControllerState, 12) -bool __thiscall winIVRSystem_IVRSystem_004_GetControllerState(winIVRSystem_IVRSystem_004 *_this, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_092 * pControllerState) +bool __thiscall winIVRSystem_IVRSystem_004_GetControllerState(winIVRSystem_IVRSystem_004 *_this, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_092 * pControllerState) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_004_GetControllerState(_this->linux_side, unControllerDeviceIndex, pControllerState); } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_004_GetControllerStateWithPose, 20) -bool __thiscall winIVRSystem_IVRSystem_004_GetControllerStateWithPose(winIVRSystem_IVRSystem_004 *_this, TrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_092 * pControllerState, TrackedDevicePose_t * pTrackedDevicePose) +bool __thiscall winIVRSystem_IVRSystem_004_GetControllerStateWithPose(winIVRSystem_IVRSystem_004 *_this, TrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_092 * pControllerState, TrackedDevicePose_t * pTrackedDevicePose) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_004_GetControllerStateWithPose(_this->linux_side, eOrigin, unControllerDeviceIndex, pControllerState, pTrackedDevicePose); @@ -6124,14 +6124,14 @@ const char * __thiscall winIVRSystem_IVRSystem_003_GetPropErrorNameFromEnum(winI } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_003_PollNextEvent, 8) -bool __thiscall winIVRSystem_IVRSystem_003_PollNextEvent(winIVRSystem_IVRSystem_003 *_this, winVREvent_t_091 * pEvent) +bool __thiscall winIVRSystem_IVRSystem_003_PollNextEvent(winIVRSystem_IVRSystem_003 *_this, VREvent_t * pEvent) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_003_PollNextEvent(_this->linux_side, pEvent); } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_003_PollNextEventWithPose, 16) -bool __thiscall winIVRSystem_IVRSystem_003_PollNextEventWithPose(winIVRSystem_IVRSystem_003 *_this, TrackingUniverseOrigin eOrigin, winVREvent_t_091 * pEvent, TrackedDevicePose_t * pTrackedDevicePose) +bool __thiscall winIVRSystem_IVRSystem_003_PollNextEventWithPose(winIVRSystem_IVRSystem_003 *_this, TrackingUniverseOrigin eOrigin, VREvent_t * pEvent, TrackedDevicePose_t * pTrackedDevicePose) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_003_PollNextEventWithPose(_this->linux_side, eOrigin, pEvent, pTrackedDevicePose); @@ -6153,14 +6153,14 @@ HiddenAreaMesh_t *__thiscall winIVRSystem_IVRSystem_003_GetHiddenAreaMesh(winIVR } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_003_GetControllerState, 12) -bool __thiscall winIVRSystem_IVRSystem_003_GetControllerState(winIVRSystem_IVRSystem_003 *_this, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_091 * pControllerState) +bool __thiscall winIVRSystem_IVRSystem_003_GetControllerState(winIVRSystem_IVRSystem_003 *_this, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_091 * pControllerState) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_003_GetControllerState(_this->linux_side, unControllerDeviceIndex, pControllerState); } DEFINE_THISCALL_WRAPPER(winIVRSystem_IVRSystem_003_GetControllerStateWithPose, 20) -bool __thiscall winIVRSystem_IVRSystem_003_GetControllerStateWithPose(winIVRSystem_IVRSystem_003 *_this, TrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState001_t_091 * pControllerState, TrackedDevicePose_t * pTrackedDevicePose) +bool __thiscall winIVRSystem_IVRSystem_003_GetControllerStateWithPose(winIVRSystem_IVRSystem_003 *_this, TrackingUniverseOrigin eOrigin, TrackedDeviceIndex_t unControllerDeviceIndex, winVRControllerState_t_091 * pControllerState, TrackedDevicePose_t * pTrackedDevicePose) { TRACE("%p\n", _this); return cppIVRSystem_IVRSystem_003_GetControllerStateWithPose(_this->linux_side, eOrigin, unControllerDeviceIndex, pControllerState, pTrackedDevicePose);