diff --git a/vrclient_x64/gen_wrapper.py b/vrclient_x64/gen_wrapper.py index 3539c577..cbce2390 100755 --- a/vrclient_x64/gen_wrapper.py +++ b/vrclient_x64/gen_wrapper.py @@ -420,6 +420,16 @@ def method_unique_name(method, existing_methods): return used_name +def underlying_type(decl): + if type(decl) is Cursor: + decl = decl.type + decl = decl.get_canonical() + if decl.kind == TypeKind.LVALUEREFERENCE: return underlying_type(decl.get_pointee()) + if decl.kind == TypeKind.CONSTANTARRAY: return underlying_type(decl.element_type) + if decl.kind == TypeKind.POINTER: return underlying_type(decl.get_pointee()) + return decl + + def declspec(decl, name): if type(decl) is Cursor: decl = decl.type @@ -483,7 +493,6 @@ def handle_method_cpp(method_name, classname, cppname, method, cpp): do_lin_to_win = None do_win_to_lin = None - do_size_fixup = None do_wrap = None do_unwrap = None for param in method.get_arguments(): @@ -507,11 +516,6 @@ def handle_method_cpp(method_name, classname, cppname, method, cpp): do_win_to_lin = (strip_ns(real_name), param.spelling) if not real_type.is_const_qualified(): do_lin_to_win = (strip_ns(real_name), param.spelling) - elif real_type.get_canonical().kind == TypeKind.RECORD and \ - strip_ns(real_type.spelling) in STRUCTS_NEXT_IS_SIZE and \ - struct_needs_size_adjustment(real_type.get_canonical()): - real_name = canonical_typename(real_type) - do_size_fixup = (strip_ns(real_name), param.spelling) if do_lin_to_win or do_win_to_lin: if do_lin_to_win: @@ -531,6 +535,28 @@ def handle_method_cpp(method_name, classname, cppname, method, cpp): cpp.write(" if(%s)\n" % do_win_to_lin[1]) cpp.write(" struct_%s_%s_win_to_lin(%s, &lin);\n" % (strip_ns(do_win_to_lin[0]), display_sdkver(sdkver), do_win_to_lin[1])) + + convert_size_param = "" + params = list(zip(names[1:], method.get_arguments())) + params += [(None, None)] # for next_name, next_param + for i, (name, param) in enumerate(params[:-1]): + real_type = underlying_type(param) + if strip_ns(real_type.spelling) not in STRUCTS_NEXT_IS_SIZE: + continue + + next_name, next_param = params[i + 1] + if not next_param or next_param.type.spelling != "uint32_t": + convert_size_param = ', -1' + elif struct_needs_size_adjustment(real_type.get_canonical()): + real_name = real_type.spelling + cpp.write(f' {next_name} = std::min({next_name}, (uint32_t)sizeof({real_name}));\n') + convert_size_param = f', {next_name}' + elif do_win_to_lin and do_win_to_lin[1] == name: + assert do_win_to_lin[0] not in STRUCTS_NEXT_IS_SIZE_UNHANDLED + cpp.write(f' {next_name} = {next_name} ? sizeof(lin) : 0;\n') + convert_size_param = f', {next_name}' + + if method.result_type.kind == TypeKind.VOID: cpp.write(" ") elif do_lin_to_win or do_win_to_lin or do_wrap: @@ -541,9 +567,6 @@ def handle_method_cpp(method_name, classname, cppname, method, cpp): cpp.write("((%s*)linux_side)->%s(" % (classname, method.spelling)) unnamed = 'a' first = True - next_is_size = False - next_is_size_no_conv = False - convert_size_param = "" for param in method.get_arguments(): if not first: cpp.write(", ") @@ -557,36 +580,14 @@ def handle_method_cpp(method_name, classname, cppname, method, cpp): do_win_to_lin and do_win_to_lin[1] == param.spelling or \ do_wrap and do_wrap[1] == param.spelling: cpp.write("%s ? &lin : nullptr" % param.spelling) - if do_win_to_lin: - assert(not do_win_to_lin[0] in STRUCTS_NEXT_IS_SIZE_UNHANDLED) - if do_win_to_lin[0] in STRUCTS_NEXT_IS_SIZE: - next_is_size = True elif do_unwrap and do_unwrap[1] == param.spelling: cpp.write("struct_%s_%s_unwrap(%s)" % (strip_ns(do_unwrap[0]), display_sdkver(sdkver), do_unwrap[1])) - elif do_size_fixup and do_size_fixup[1] == param.spelling: - next_is_size = True - next_is_size_no_conv = True - cpp.write("(%s)%s" % (param.type.spelling, param.spelling)) - elif next_is_size: - next_is_size = False - if next_is_size_no_conv and param.type.spelling == "uint32_t": - cpp.write("std::min(%s, (uint32_t)sizeof(vr::%s))" % (param.spelling, do_size_fixup[0])) - convert_size_param = ", " + param.spelling - elif param.type.spelling == "uint32_t": - cpp.write("%s ? sizeof(lin) : 0" % param.spelling) - convert_size_param = ", " + param.spelling - else: - cpp.write("(%s)%s" % (param.type.spelling, param.spelling)) - convert_size_param = ", -1" - next_is_size_no_conv = False elif "&" in param.type.spelling: cpp.write("*%s" % param.spelling) else: cpp.write("(%s)%s" % (param.type.spelling, param.spelling)) cpp.write(");\n") if do_lin_to_win: - if next_is_size and not convert_size_param: - convert_size_param = ", -1" cpp.write(" if(%s)\n" % do_lin_to_win[1]) cpp.write(" struct_%s_%s_lin_to_win(&lin, %s%s);\n" % (strip_ns(do_lin_to_win[0]), display_sdkver(sdkver), do_lin_to_win[1], convert_size_param)) if do_lin_to_win or do_win_to_lin: diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_003.cpp b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_003.cpp index 8f2b6456..b86ae369 100644 --- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_003.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_003.cpp @@ -40,7 +40,8 @@ vr::EVRInputError cppIVRInput_IVRInput_003_GetDigitalActionData(void *linux_side vr::EVRInputError _ret; if(pActionData) struct_InputDigitalActionData_t_1015_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetDigitalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0); + unActionDataSize = unActionDataSize ? sizeof(lin) : 0; + _ret = ((IVRInput*)linux_side)->GetDigitalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize); if(pActionData) struct_InputDigitalActionData_t_1015_lin_to_win(&lin, pActionData, unActionDataSize); return _ret; @@ -52,7 +53,8 @@ vr::EVRInputError cppIVRInput_IVRInput_003_GetAnalogActionData(void *linux_side, vr::EVRInputError _ret; if(pActionData) struct_InputAnalogActionData_t_1015_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetAnalogActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0); + unActionDataSize = unActionDataSize ? sizeof(lin) : 0; + _ret = ((IVRInput*)linux_side)->GetAnalogActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize); if(pActionData) struct_InputAnalogActionData_t_1015_lin_to_win(&lin, pActionData, unActionDataSize); return _ret; @@ -64,7 +66,8 @@ vr::EVRInputError cppIVRInput_IVRInput_003_GetPoseActionData(void *linux_side, V vr::EVRInputError _ret; if(pActionData) struct_InputPoseActionData_t_1015_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetPoseActionData((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, (float)fPredictedSecondsFromNow, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0); + unActionDataSize = unActionDataSize ? sizeof(lin) : 0; + _ret = ((IVRInput*)linux_side)->GetPoseActionData((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, (float)fPredictedSecondsFromNow, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize); if(pActionData) struct_InputPoseActionData_t_1015_lin_to_win(&lin, pActionData, unActionDataSize); return _ret; @@ -109,7 +112,8 @@ vr::EVRInputError cppIVRInput_IVRInput_003_GetOriginLocalizedName(void *linux_si vr::EVRInputError cppIVRInput_IVRInput_003_GetOriginTrackedDeviceInfo(void *linux_side, VRInputValueHandle_t origin, InputOriginInfo_t *pOriginInfo, uint32_t unOriginInfoSize) { - return ((IVRInput*)linux_side)->GetOriginTrackedDeviceInfo((vr::VRInputValueHandle_t)origin, (vr::InputOriginInfo_t *)pOriginInfo, std::min(unOriginInfoSize, (uint32_t)sizeof(vr::InputOriginInfo_t))); + unOriginInfoSize = std::min(unOriginInfoSize, (uint32_t)sizeof(vr::InputOriginInfo_t)); + return ((IVRInput*)linux_side)->GetOriginTrackedDeviceInfo((vr::VRInputValueHandle_t)origin, (vr::InputOriginInfo_t *)pOriginInfo, (uint32_t)unOriginInfoSize); } vr::EVRInputError cppIVRInput_IVRInput_003_ShowActionOrigins(void *linux_side, VRActionSetHandle_t actionSetHandle, VRActionHandle_t ulActionHandle) diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_004.cpp b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_004.cpp index c7934dcc..cd5bb1da 100644 --- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_004.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_004.cpp @@ -40,7 +40,8 @@ vr::EVRInputError cppIVRInput_IVRInput_004_GetDigitalActionData(void *linux_side vr::EVRInputError _ret; if(pActionData) struct_InputDigitalActionData_t_1017_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetDigitalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); + unActionDataSize = unActionDataSize ? sizeof(lin) : 0; + _ret = ((IVRInput*)linux_side)->GetDigitalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) struct_InputDigitalActionData_t_1017_lin_to_win(&lin, pActionData, unActionDataSize); return _ret; @@ -52,7 +53,8 @@ vr::EVRInputError cppIVRInput_IVRInput_004_GetAnalogActionData(void *linux_side, vr::EVRInputError _ret; if(pActionData) struct_InputAnalogActionData_t_1017_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetAnalogActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); + unActionDataSize = unActionDataSize ? sizeof(lin) : 0; + _ret = ((IVRInput*)linux_side)->GetAnalogActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) struct_InputAnalogActionData_t_1017_lin_to_win(&lin, pActionData, unActionDataSize); return _ret; @@ -64,7 +66,8 @@ vr::EVRInputError cppIVRInput_IVRInput_004_GetPoseActionData(void *linux_side, V vr::EVRInputError _ret; if(pActionData) struct_InputPoseActionData_t_1017_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetPoseActionData((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, (float)fPredictedSecondsFromNow, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); + unActionDataSize = unActionDataSize ? sizeof(lin) : 0; + _ret = ((IVRInput*)linux_side)->GetPoseActionData((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, (float)fPredictedSecondsFromNow, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) struct_InputPoseActionData_t_1017_lin_to_win(&lin, pActionData, unActionDataSize); return _ret; @@ -76,7 +79,8 @@ vr::EVRInputError cppIVRInput_IVRInput_004_GetSkeletalActionData(void *linux_sid vr::EVRInputError _ret; if(pActionData) struct_InputSkeletalActionData_t_1017_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetSkeletalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); + unActionDataSize = unActionDataSize ? sizeof(lin) : 0; + _ret = ((IVRInput*)linux_side)->GetSkeletalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) struct_InputSkeletalActionData_t_1017_lin_to_win(&lin, pActionData, unActionDataSize); return _ret; @@ -114,7 +118,8 @@ vr::EVRInputError cppIVRInput_IVRInput_004_GetOriginLocalizedName(void *linux_si vr::EVRInputError cppIVRInput_IVRInput_004_GetOriginTrackedDeviceInfo(void *linux_side, VRInputValueHandle_t origin, InputOriginInfo_t *pOriginInfo, uint32_t unOriginInfoSize) { - return ((IVRInput*)linux_side)->GetOriginTrackedDeviceInfo((vr::VRInputValueHandle_t)origin, (vr::InputOriginInfo_t *)pOriginInfo, std::min(unOriginInfoSize, (uint32_t)sizeof(vr::InputOriginInfo_t))); + unOriginInfoSize = std::min(unOriginInfoSize, (uint32_t)sizeof(vr::InputOriginInfo_t)); + return ((IVRInput*)linux_side)->GetOriginTrackedDeviceInfo((vr::VRInputValueHandle_t)origin, (vr::InputOriginInfo_t *)pOriginInfo, (uint32_t)unOriginInfoSize); } vr::EVRInputError cppIVRInput_IVRInput_004_ShowActionOrigins(void *linux_side, VRActionSetHandle_t actionSetHandle, VRActionHandle_t ulActionHandle) diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_005.cpp b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_005.cpp index 49d7b552..2906a5c6 100644 --- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_005.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_005.cpp @@ -40,7 +40,8 @@ vr::EVRInputError cppIVRInput_IVRInput_005_GetDigitalActionData(void *linux_side vr::EVRInputError _ret; if(pActionData) struct_InputDigitalActionData_t_1322_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetDigitalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); + unActionDataSize = unActionDataSize ? sizeof(lin) : 0; + _ret = ((IVRInput*)linux_side)->GetDigitalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) struct_InputDigitalActionData_t_1322_lin_to_win(&lin, pActionData, unActionDataSize); return _ret; @@ -52,7 +53,8 @@ vr::EVRInputError cppIVRInput_IVRInput_005_GetAnalogActionData(void *linux_side, vr::EVRInputError _ret; if(pActionData) struct_InputAnalogActionData_t_1322_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetAnalogActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); + unActionDataSize = unActionDataSize ? sizeof(lin) : 0; + _ret = ((IVRInput*)linux_side)->GetAnalogActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) struct_InputAnalogActionData_t_1322_lin_to_win(&lin, pActionData, unActionDataSize); return _ret; @@ -64,7 +66,8 @@ vr::EVRInputError cppIVRInput_IVRInput_005_GetPoseActionData(void *linux_side, V vr::EVRInputError _ret; if(pActionData) struct_InputPoseActionData_t_1322_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetPoseActionData((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, (float)fPredictedSecondsFromNow, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); + unActionDataSize = unActionDataSize ? sizeof(lin) : 0; + _ret = ((IVRInput*)linux_side)->GetPoseActionData((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, (float)fPredictedSecondsFromNow, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) struct_InputPoseActionData_t_1322_lin_to_win(&lin, pActionData, unActionDataSize); return _ret; @@ -76,7 +79,8 @@ vr::EVRInputError cppIVRInput_IVRInput_005_GetSkeletalActionData(void *linux_sid vr::EVRInputError _ret; if(pActionData) struct_InputSkeletalActionData_t_1322_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetSkeletalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0); + unActionDataSize = unActionDataSize ? sizeof(lin) : 0; + _ret = ((IVRInput*)linux_side)->GetSkeletalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize); if(pActionData) struct_InputSkeletalActionData_t_1322_lin_to_win(&lin, pActionData, unActionDataSize); return _ret; @@ -144,7 +148,8 @@ vr::EVRInputError cppIVRInput_IVRInput_005_GetOriginLocalizedName(void *linux_si vr::EVRInputError cppIVRInput_IVRInput_005_GetOriginTrackedDeviceInfo(void *linux_side, VRInputValueHandle_t origin, InputOriginInfo_t *pOriginInfo, uint32_t unOriginInfoSize) { - return ((IVRInput*)linux_side)->GetOriginTrackedDeviceInfo((vr::VRInputValueHandle_t)origin, (vr::InputOriginInfo_t *)pOriginInfo, std::min(unOriginInfoSize, (uint32_t)sizeof(vr::InputOriginInfo_t))); + unOriginInfoSize = std::min(unOriginInfoSize, (uint32_t)sizeof(vr::InputOriginInfo_t)); + return ((IVRInput*)linux_side)->GetOriginTrackedDeviceInfo((vr::VRInputValueHandle_t)origin, (vr::InputOriginInfo_t *)pOriginInfo, (uint32_t)unOriginInfoSize); } vr::EVRInputError cppIVRInput_IVRInput_005_ShowActionOrigins(void *linux_side, VRActionSetHandle_t actionSetHandle, VRActionHandle_t ulActionHandle) diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_006.cpp b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_006.cpp index 701aabe9..ad751d4b 100644 --- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_006.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_006.cpp @@ -40,7 +40,8 @@ vr::EVRInputError cppIVRInput_IVRInput_006_GetDigitalActionData(void *linux_side vr::EVRInputError _ret; if(pActionData) struct_InputDigitalActionData_t_1418_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetDigitalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); + unActionDataSize = unActionDataSize ? sizeof(lin) : 0; + _ret = ((IVRInput*)linux_side)->GetDigitalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) struct_InputDigitalActionData_t_1418_lin_to_win(&lin, pActionData, unActionDataSize); return _ret; @@ -52,7 +53,8 @@ vr::EVRInputError cppIVRInput_IVRInput_006_GetAnalogActionData(void *linux_side, vr::EVRInputError _ret; if(pActionData) struct_InputAnalogActionData_t_1418_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetAnalogActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); + unActionDataSize = unActionDataSize ? sizeof(lin) : 0; + _ret = ((IVRInput*)linux_side)->GetAnalogActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) struct_InputAnalogActionData_t_1418_lin_to_win(&lin, pActionData, unActionDataSize); return _ret; @@ -64,7 +66,8 @@ vr::EVRInputError cppIVRInput_IVRInput_006_GetPoseActionDataRelativeToNow(void * vr::EVRInputError _ret; if(pActionData) struct_InputPoseActionData_t_1418_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetPoseActionDataRelativeToNow((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, (float)fPredictedSecondsFromNow, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); + unActionDataSize = unActionDataSize ? sizeof(lin) : 0; + _ret = ((IVRInput*)linux_side)->GetPoseActionDataRelativeToNow((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, (float)fPredictedSecondsFromNow, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) struct_InputPoseActionData_t_1418_lin_to_win(&lin, pActionData, unActionDataSize); return _ret; @@ -76,7 +79,8 @@ vr::EVRInputError cppIVRInput_IVRInput_006_GetPoseActionDataForNextFrame(void *l vr::EVRInputError _ret; if(pActionData) struct_InputPoseActionData_t_1418_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetPoseActionDataForNextFrame((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); + unActionDataSize = unActionDataSize ? sizeof(lin) : 0; + _ret = ((IVRInput*)linux_side)->GetPoseActionDataForNextFrame((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) struct_InputPoseActionData_t_1418_lin_to_win(&lin, pActionData, unActionDataSize); return _ret; @@ -88,7 +92,8 @@ vr::EVRInputError cppIVRInput_IVRInput_006_GetSkeletalActionData(void *linux_sid vr::EVRInputError _ret; if(pActionData) struct_InputSkeletalActionData_t_1418_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetSkeletalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0); + unActionDataSize = unActionDataSize ? sizeof(lin) : 0; + _ret = ((IVRInput*)linux_side)->GetSkeletalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize); if(pActionData) struct_InputSkeletalActionData_t_1418_lin_to_win(&lin, pActionData, unActionDataSize); return _ret; @@ -156,7 +161,8 @@ vr::EVRInputError cppIVRInput_IVRInput_006_GetOriginLocalizedName(void *linux_si vr::EVRInputError cppIVRInput_IVRInput_006_GetOriginTrackedDeviceInfo(void *linux_side, VRInputValueHandle_t origin, InputOriginInfo_t *pOriginInfo, uint32_t unOriginInfoSize) { - return ((IVRInput*)linux_side)->GetOriginTrackedDeviceInfo((vr::VRInputValueHandle_t)origin, (vr::InputOriginInfo_t *)pOriginInfo, std::min(unOriginInfoSize, (uint32_t)sizeof(vr::InputOriginInfo_t))); + unOriginInfoSize = std::min(unOriginInfoSize, (uint32_t)sizeof(vr::InputOriginInfo_t)); + return ((IVRInput*)linux_side)->GetOriginTrackedDeviceInfo((vr::VRInputValueHandle_t)origin, (vr::InputOriginInfo_t *)pOriginInfo, (uint32_t)unOriginInfoSize); } vr::EVRInputError cppIVRInput_IVRInput_006_ShowActionOrigins(void *linux_side, VRActionSetHandle_t actionSetHandle, VRActionHandle_t ulActionHandle) diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_007.cpp b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_007.cpp index 4eefda8d..ca706933 100644 --- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_007.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_007.cpp @@ -40,7 +40,8 @@ vr::EVRInputError cppIVRInput_IVRInput_007_GetDigitalActionData(void *linux_side vr::EVRInputError _ret; if(pActionData) struct_InputDigitalActionData_t_1916_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetDigitalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); + unActionDataSize = unActionDataSize ? sizeof(lin) : 0; + _ret = ((IVRInput*)linux_side)->GetDigitalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) struct_InputDigitalActionData_t_1916_lin_to_win(&lin, pActionData, unActionDataSize); return _ret; @@ -52,7 +53,8 @@ vr::EVRInputError cppIVRInput_IVRInput_007_GetAnalogActionData(void *linux_side, vr::EVRInputError _ret; if(pActionData) struct_InputAnalogActionData_t_1916_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetAnalogActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); + unActionDataSize = unActionDataSize ? sizeof(lin) : 0; + _ret = ((IVRInput*)linux_side)->GetAnalogActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) struct_InputAnalogActionData_t_1916_lin_to_win(&lin, pActionData, unActionDataSize); return _ret; @@ -64,7 +66,8 @@ vr::EVRInputError cppIVRInput_IVRInput_007_GetPoseActionDataRelativeToNow(void * vr::EVRInputError _ret; if(pActionData) struct_InputPoseActionData_t_1916_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetPoseActionDataRelativeToNow((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, (float)fPredictedSecondsFromNow, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); + unActionDataSize = unActionDataSize ? sizeof(lin) : 0; + _ret = ((IVRInput*)linux_side)->GetPoseActionDataRelativeToNow((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, (float)fPredictedSecondsFromNow, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) struct_InputPoseActionData_t_1916_lin_to_win(&lin, pActionData, unActionDataSize); return _ret; @@ -76,7 +79,8 @@ vr::EVRInputError cppIVRInput_IVRInput_007_GetPoseActionDataForNextFrame(void *l vr::EVRInputError _ret; if(pActionData) struct_InputPoseActionData_t_1916_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetPoseActionDataForNextFrame((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); + unActionDataSize = unActionDataSize ? sizeof(lin) : 0; + _ret = ((IVRInput*)linux_side)->GetPoseActionDataForNextFrame((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) struct_InputPoseActionData_t_1916_lin_to_win(&lin, pActionData, unActionDataSize); return _ret; @@ -88,7 +92,8 @@ vr::EVRInputError cppIVRInput_IVRInput_007_GetSkeletalActionData(void *linux_sid vr::EVRInputError _ret; if(pActionData) struct_InputSkeletalActionData_t_1916_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetSkeletalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0); + unActionDataSize = unActionDataSize ? sizeof(lin) : 0; + _ret = ((IVRInput*)linux_side)->GetSkeletalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize); if(pActionData) struct_InputSkeletalActionData_t_1916_lin_to_win(&lin, pActionData, unActionDataSize); return _ret; @@ -156,7 +161,8 @@ vr::EVRInputError cppIVRInput_IVRInput_007_GetOriginLocalizedName(void *linux_si vr::EVRInputError cppIVRInput_IVRInput_007_GetOriginTrackedDeviceInfo(void *linux_side, VRInputValueHandle_t origin, InputOriginInfo_t *pOriginInfo, uint32_t unOriginInfoSize) { - return ((IVRInput*)linux_side)->GetOriginTrackedDeviceInfo((vr::VRInputValueHandle_t)origin, (vr::InputOriginInfo_t *)pOriginInfo, std::min(unOriginInfoSize, (uint32_t)sizeof(vr::InputOriginInfo_t))); + unOriginInfoSize = std::min(unOriginInfoSize, (uint32_t)sizeof(vr::InputOriginInfo_t)); + return ((IVRInput*)linux_side)->GetOriginTrackedDeviceInfo((vr::VRInputValueHandle_t)origin, (vr::InputOriginInfo_t *)pOriginInfo, (uint32_t)unOriginInfoSize); } vr::EVRInputError cppIVRInput_IVRInput_007_GetActionBindingInfo(void *linux_side, VRActionHandle_t action, InputBindingInfo_t *pOriginInfo, uint32_t unBindingInfoSize, uint32_t unBindingInfoCount, uint32_t *punReturnedBindingInfoCount) diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_010.cpp b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_010.cpp index 1201530b..113ffe33 100644 --- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_010.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_010.cpp @@ -40,7 +40,8 @@ vr::EVRInputError cppIVRInput_IVRInput_010_GetDigitalActionData(void *linux_side vr::EVRInputError _ret; if(pActionData) struct_InputDigitalActionData_t_1267_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetDigitalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); + unActionDataSize = unActionDataSize ? sizeof(lin) : 0; + _ret = ((IVRInput*)linux_side)->GetDigitalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) struct_InputDigitalActionData_t_1267_lin_to_win(&lin, pActionData, unActionDataSize); return _ret; @@ -52,7 +53,8 @@ vr::EVRInputError cppIVRInput_IVRInput_010_GetAnalogActionData(void *linux_side, vr::EVRInputError _ret; if(pActionData) struct_InputAnalogActionData_t_1267_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetAnalogActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); + unActionDataSize = unActionDataSize ? sizeof(lin) : 0; + _ret = ((IVRInput*)linux_side)->GetAnalogActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) struct_InputAnalogActionData_t_1267_lin_to_win(&lin, pActionData, unActionDataSize); return _ret; @@ -64,7 +66,8 @@ vr::EVRInputError cppIVRInput_IVRInput_010_GetPoseActionDataRelativeToNow(void * vr::EVRInputError _ret; if(pActionData) struct_InputPoseActionData_t_1267_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetPoseActionDataRelativeToNow((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, (float)fPredictedSecondsFromNow, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); + unActionDataSize = unActionDataSize ? sizeof(lin) : 0; + _ret = ((IVRInput*)linux_side)->GetPoseActionDataRelativeToNow((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, (float)fPredictedSecondsFromNow, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) struct_InputPoseActionData_t_1267_lin_to_win(&lin, pActionData, unActionDataSize); return _ret; @@ -76,7 +79,8 @@ vr::EVRInputError cppIVRInput_IVRInput_010_GetPoseActionDataForNextFrame(void *l vr::EVRInputError _ret; if(pActionData) struct_InputPoseActionData_t_1267_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetPoseActionDataForNextFrame((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); + unActionDataSize = unActionDataSize ? sizeof(lin) : 0; + _ret = ((IVRInput*)linux_side)->GetPoseActionDataForNextFrame((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) struct_InputPoseActionData_t_1267_lin_to_win(&lin, pActionData, unActionDataSize); return _ret; @@ -88,7 +92,8 @@ vr::EVRInputError cppIVRInput_IVRInput_010_GetSkeletalActionData(void *linux_sid vr::EVRInputError _ret; if(pActionData) struct_InputSkeletalActionData_t_1267_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetSkeletalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0); + unActionDataSize = unActionDataSize ? sizeof(lin) : 0; + _ret = ((IVRInput*)linux_side)->GetSkeletalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize); if(pActionData) struct_InputSkeletalActionData_t_1267_lin_to_win(&lin, pActionData, unActionDataSize); return _ret; @@ -166,7 +171,8 @@ vr::EVRInputError cppIVRInput_IVRInput_010_GetOriginLocalizedName(void *linux_si vr::EVRInputError cppIVRInput_IVRInput_010_GetOriginTrackedDeviceInfo(void *linux_side, VRInputValueHandle_t origin, InputOriginInfo_t *pOriginInfo, uint32_t unOriginInfoSize) { - return ((IVRInput*)linux_side)->GetOriginTrackedDeviceInfo((vr::VRInputValueHandle_t)origin, (vr::InputOriginInfo_t *)pOriginInfo, std::min(unOriginInfoSize, (uint32_t)sizeof(vr::InputOriginInfo_t))); + unOriginInfoSize = std::min(unOriginInfoSize, (uint32_t)sizeof(vr::InputOriginInfo_t)); + return ((IVRInput*)linux_side)->GetOriginTrackedDeviceInfo((vr::VRInputValueHandle_t)origin, (vr::InputOriginInfo_t *)pOriginInfo, (uint32_t)unOriginInfoSize); } vr::EVRInputError cppIVRInput_IVRInput_010_GetActionBindingInfo(void *linux_side, VRActionHandle_t action, InputBindingInfo_t *pOriginInfo, uint32_t unBindingInfoSize, uint32_t unBindingInfoCount, uint32_t *punReturnedBindingInfoCount) diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_010.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_010.cpp index d66fe89a..1192b9c9 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_010.cpp +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_010.cpp @@ -185,7 +185,8 @@ bool cppIVROverlay_IVROverlay_010_PollNextOverlayEvent(void *linux_side, VROverl 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); + uncbVREvent = uncbVREvent ? sizeof(lin) : 0; + _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent); if(pEvent) struct_VREvent_t_0918_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_011.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_011.cpp index 54834326..a6a83ef8 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_011.cpp +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_011.cpp @@ -195,7 +195,8 @@ bool cppIVROverlay_IVROverlay_011_PollNextOverlayEvent(void *linux_side, VROverl 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); + uncbVREvent = uncbVREvent ? sizeof(lin) : 0; + _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent); if(pEvent) struct_VREvent_t_0920_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_012.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_012.cpp index da58fe12..8993e805 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_012.cpp +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_012.cpp @@ -195,7 +195,8 @@ bool cppIVROverlay_IVROverlay_012_PollNextOverlayEvent(void *linux_side, VROverl 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); + uncbVREvent = uncbVREvent ? sizeof(lin) : 0; + _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent); if(pEvent) struct_VREvent_t_101_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_013.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_013.cpp index 0b42d6e8..aa5639d7 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_013.cpp +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_013.cpp @@ -215,7 +215,8 @@ bool cppIVROverlay_IVROverlay_013_PollNextOverlayEvent(void *linux_side, VROverl 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); + uncbVREvent = uncbVREvent ? sizeof(lin) : 0; + _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent); if(pEvent) struct_VREvent_t_104_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_014.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_014.cpp index 66283957..6ab08e94 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_014.cpp +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_014.cpp @@ -215,7 +215,8 @@ bool cppIVROverlay_IVROverlay_014_PollNextOverlayEvent(void *linux_side, VROverl 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); + uncbVREvent = uncbVREvent ? sizeof(lin) : 0; + _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent); if(pEvent) struct_VREvent_t_106_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_016.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_016.cpp index e1c27290..7cd2831d 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_016.cpp +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_016.cpp @@ -240,7 +240,8 @@ bool cppIVROverlay_IVROverlay_016_PollNextOverlayEvent(void *linux_side, VROverl 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); + uncbVREvent = uncbVREvent ? sizeof(lin) : 0; + _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent); if(pEvent) struct_VREvent_t_1010_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_017.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_017.cpp index cac93024..a35cb73b 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_017.cpp +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_017.cpp @@ -240,7 +240,8 @@ bool cppIVROverlay_IVROverlay_017_PollNextOverlayEvent(void *linux_side, VROverl 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); + uncbVREvent = uncbVREvent ? sizeof(lin) : 0; + _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent); if(pEvent) struct_VREvent_t_1011_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_018.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_018.cpp index 43b0dc63..1b292a23 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_018.cpp +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_018.cpp @@ -240,7 +240,8 @@ bool cppIVROverlay_IVROverlay_018_PollNextOverlayEvent(void *linux_side, VROverl 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); + uncbVREvent = uncbVREvent ? sizeof(lin) : 0; + _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent); if(pEvent) struct_VREvent_t_1017_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_019.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_019.cpp index 5e0cd27d..9687bc0b 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_019.cpp +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_019.cpp @@ -240,7 +240,8 @@ bool cppIVROverlay_IVROverlay_019_PollNextOverlayEvent(void *linux_side, VROverl 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); + uncbVREvent = uncbVREvent ? sizeof(lin) : 0; + _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent); if(pEvent) struct_VREvent_t_1610_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_020.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_020.cpp index d0d27baa..605877b9 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_020.cpp +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_020.cpp @@ -230,7 +230,8 @@ bool cppIVROverlay_IVROverlay_020_PollNextOverlayEvent(void *linux_side, VROverl bool _ret; if(pEvent) struct_VREvent_t_1715_win_to_lin(pEvent, &lin); - _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, uncbVREvent ? sizeof(lin) : 0); + uncbVREvent = uncbVREvent ? sizeof(lin) : 0; + _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent); if(pEvent) struct_VREvent_t_1715_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_021.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_021.cpp index 2b0c887f..83b27869 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_021.cpp +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_021.cpp @@ -230,7 +230,8 @@ bool cppIVROverlay_IVROverlay_021_PollNextOverlayEvent(void *linux_side, VROverl bool _ret; if(pEvent) struct_VREvent_t_1819_win_to_lin(pEvent, &lin); - _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, uncbVREvent ? sizeof(lin) : 0); + uncbVREvent = uncbVREvent ? sizeof(lin) : 0; + _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent); if(pEvent) struct_VREvent_t_1819_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_022.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_022.cpp index c2eec545..4ee24b92 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_022.cpp +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_022.cpp @@ -245,7 +245,8 @@ bool cppIVROverlay_IVROverlay_022_PollNextOverlayEvent(void *linux_side, VROverl bool _ret; if(pEvent) struct_VREvent_t_1916_win_to_lin(pEvent, &lin); - _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, uncbVREvent ? sizeof(lin) : 0); + uncbVREvent = uncbVREvent ? sizeof(lin) : 0; + _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent); if(pEvent) struct_VREvent_t_1916_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_024.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_024.cpp index 62f10cfa..608cdc7f 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_024.cpp +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_024.cpp @@ -235,7 +235,8 @@ bool cppIVROverlay_IVROverlay_024_PollNextOverlayEvent(void *linux_side, VROverl bool _ret; if(pEvent) struct_VREvent_t_11415_win_to_lin(pEvent, &lin); - _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, uncbVREvent ? sizeof(lin) : 0); + uncbVREvent = uncbVREvent ? sizeof(lin) : 0; + _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent); if(pEvent) struct_VREvent_t_11415_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_025.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_025.cpp index 57d8f283..da058339 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_025.cpp +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_025.cpp @@ -240,7 +240,8 @@ bool cppIVROverlay_IVROverlay_025_PollNextOverlayEvent(void *linux_side, VROverl bool _ret; if(pEvent) struct_VREvent_t_1168_win_to_lin(pEvent, &lin); - _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, uncbVREvent ? sizeof(lin) : 0); + uncbVREvent = uncbVREvent ? sizeof(lin) : 0; + _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent); if(pEvent) struct_VREvent_t_1168_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_026.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_026.cpp index edc4ec76..f94f0453 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_026.cpp +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_026.cpp @@ -255,7 +255,8 @@ bool cppIVROverlay_IVROverlay_026_PollNextOverlayEvent(void *linux_side, VROverl bool _ret; if(pEvent) struct_VREvent_t_1237_win_to_lin(pEvent, &lin); - _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, uncbVREvent ? sizeof(lin) : 0); + uncbVREvent = uncbVREvent ? sizeof(lin) : 0; + _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent); if(pEvent) struct_VREvent_t_1237_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_027.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_027.cpp index e006badf..4848f146 100644 --- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_027.cpp +++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_027.cpp @@ -245,7 +245,8 @@ bool cppIVROverlay_IVROverlay_027_PollNextOverlayEvent(void *linux_side, VROverl bool _ret; if(pEvent) struct_VREvent_t_1267_win_to_lin(pEvent, &lin); - _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, uncbVREvent ? sizeof(lin) : 0); + uncbVREvent = uncbVREvent ? sizeof(lin) : 0; + _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent); if(pEvent) struct_VREvent_t_1267_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_011.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_011.cpp index 61c98d92..11dfb7d5 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_011.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_011.cpp @@ -155,7 +155,8 @@ bool cppIVRSystem_IVRSystem_011_PollNextEvent(void *linux_side, winVREvent_t_091 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); + uncbVREvent = uncbVREvent ? sizeof(lin) : 0; + _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, (uint32_t)uncbVREvent); if(pEvent) struct_VREvent_t_0918_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; @@ -167,7 +168,8 @@ bool cppIVRSystem_IVRSystem_011_PollNextEventWithPose(void *linux_side, ETrackin 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); + uncbVREvent = uncbVREvent ? sizeof(lin) : 0; + _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent, (vr::TrackedDevicePose_t *)pTrackedDevicePose); if(pEvent) struct_VREvent_t_0918_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_012.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_012.cpp index a70a2608..79c517cb 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_012.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_012.cpp @@ -155,7 +155,8 @@ bool cppIVRSystem_IVRSystem_012_PollNextEvent(void *linux_side, winVREvent_t_103 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); + uncbVREvent = uncbVREvent ? sizeof(lin) : 0; + _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, (uint32_t)uncbVREvent); if(pEvent) struct_VREvent_t_103_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; @@ -167,7 +168,8 @@ bool cppIVRSystem_IVRSystem_012_PollNextEventWithPose(void *linux_side, ETrackin 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); + uncbVREvent = uncbVREvent ? sizeof(lin) : 0; + _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent, (vr::TrackedDevicePose_t *)pTrackedDevicePose); if(pEvent) struct_VREvent_t_103_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_014.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_014.cpp index e0d62734..da761d3b 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_014.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_014.cpp @@ -155,7 +155,8 @@ bool cppIVRSystem_IVRSystem_014_PollNextEvent(void *linux_side, winVREvent_t_104 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); + uncbVREvent = uncbVREvent ? sizeof(lin) : 0; + _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, (uint32_t)uncbVREvent); if(pEvent) struct_VREvent_t_104_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; @@ -167,7 +168,8 @@ bool cppIVRSystem_IVRSystem_014_PollNextEventWithPose(void *linux_side, ETrackin 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); + uncbVREvent = uncbVREvent ? sizeof(lin) : 0; + _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent, (vr::TrackedDevicePose_t *)pTrackedDevicePose); if(pEvent) struct_VREvent_t_104_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; @@ -189,7 +191,8 @@ bool cppIVRSystem_IVRSystem_014_GetControllerState(void *linux_side, TrackedDevi bool _ret; if(pControllerState) struct_VRControllerState001_t_104_win_to_lin(pControllerState, &lin); - _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, unControllerStateSize ? sizeof(lin) : 0); + unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0; + _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (uint32_t)unControllerStateSize); if(pControllerState) struct_VRControllerState001_t_104_lin_to_win(&lin, pControllerState, unControllerStateSize); return _ret; @@ -201,7 +204,8 @@ bool cppIVRSystem_IVRSystem_014_GetControllerStateWithPose(void *linux_side, ETr bool _ret; if(pControllerState) struct_VRControllerState001_t_104_win_to_lin(pControllerState, &lin); - _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, unControllerStateSize ? sizeof(lin) : 0, (vr::TrackedDevicePose_t *)pTrackedDevicePose); + unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0; + _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_VRControllerState001_t_104_lin_to_win(&lin, pControllerState, unControllerStateSize); return _ret; diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_015.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_015.cpp index 83f39492..0820c227 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_015.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_015.cpp @@ -155,7 +155,8 @@ bool cppIVRSystem_IVRSystem_015_PollNextEvent(void *linux_side, winVREvent_t_107 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); + uncbVREvent = uncbVREvent ? sizeof(lin) : 0; + _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, (uint32_t)uncbVREvent); if(pEvent) struct_VREvent_t_107_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; @@ -167,7 +168,8 @@ bool cppIVRSystem_IVRSystem_015_PollNextEventWithPose(void *linux_side, ETrackin 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); + uncbVREvent = uncbVREvent ? sizeof(lin) : 0; + _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent, (vr::TrackedDevicePose_t *)pTrackedDevicePose); if(pEvent) struct_VREvent_t_107_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; @@ -189,7 +191,8 @@ bool cppIVRSystem_IVRSystem_015_GetControllerState(void *linux_side, TrackedDevi bool _ret; if(pControllerState) struct_VRControllerState001_t_107_win_to_lin(pControllerState, &lin); - _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, unControllerStateSize ? sizeof(lin) : 0); + unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0; + _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (uint32_t)unControllerStateSize); if(pControllerState) struct_VRControllerState001_t_107_lin_to_win(&lin, pControllerState, unControllerStateSize); return _ret; @@ -201,7 +204,8 @@ bool cppIVRSystem_IVRSystem_015_GetControllerStateWithPose(void *linux_side, ETr bool _ret; if(pControllerState) struct_VRControllerState001_t_107_win_to_lin(pControllerState, &lin); - _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, unControllerStateSize ? sizeof(lin) : 0, (vr::TrackedDevicePose_t *)pTrackedDevicePose); + unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0; + _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_VRControllerState001_t_107_lin_to_win(&lin, pControllerState, unControllerStateSize); return _ret; diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_016.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_016.cpp index bb27c281..89b11e9a 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_016.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_016.cpp @@ -160,7 +160,8 @@ bool cppIVRSystem_IVRSystem_016_PollNextEvent(void *linux_side, winVREvent_t_109 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); + uncbVREvent = uncbVREvent ? sizeof(lin) : 0; + _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, (uint32_t)uncbVREvent); if(pEvent) struct_VREvent_t_109_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; @@ -172,7 +173,8 @@ bool cppIVRSystem_IVRSystem_016_PollNextEventWithPose(void *linux_side, ETrackin 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); + uncbVREvent = uncbVREvent ? sizeof(lin) : 0; + _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent, (vr::TrackedDevicePose_t *)pTrackedDevicePose); if(pEvent) struct_VREvent_t_109_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; @@ -194,7 +196,8 @@ bool cppIVRSystem_IVRSystem_016_GetControllerState(void *linux_side, TrackedDevi bool _ret; if(pControllerState) struct_VRControllerState001_t_109_win_to_lin(pControllerState, &lin); - _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, unControllerStateSize ? sizeof(lin) : 0); + unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0; + _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (uint32_t)unControllerStateSize); if(pControllerState) struct_VRControllerState001_t_109_lin_to_win(&lin, pControllerState, unControllerStateSize); return _ret; @@ -206,7 +209,8 @@ bool cppIVRSystem_IVRSystem_016_GetControllerStateWithPose(void *linux_side, ETr bool _ret; if(pControllerState) struct_VRControllerState001_t_109_win_to_lin(pControllerState, &lin); - _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, unControllerStateSize ? sizeof(lin) : 0, (vr::TrackedDevicePose_t *)pTrackedDevicePose); + unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0; + _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_VRControllerState001_t_109_lin_to_win(&lin, pControllerState, unControllerStateSize); return _ret; diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_017.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_017.cpp index 291eaa9e..43203db9 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_017.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_017.cpp @@ -160,7 +160,8 @@ bool cppIVRSystem_IVRSystem_017_PollNextEvent(void *linux_side, winVREvent_t_101 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); + uncbVREvent = uncbVREvent ? sizeof(lin) : 0; + _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, (uint32_t)uncbVREvent); if(pEvent) struct_VREvent_t_1011_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; @@ -172,7 +173,8 @@ bool cppIVRSystem_IVRSystem_017_PollNextEventWithPose(void *linux_side, ETrackin 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); + uncbVREvent = uncbVREvent ? sizeof(lin) : 0; + _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent, (vr::TrackedDevicePose_t *)pTrackedDevicePose); if(pEvent) struct_VREvent_t_1011_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; @@ -194,7 +196,8 @@ bool cppIVRSystem_IVRSystem_017_GetControllerState(void *linux_side, TrackedDevi bool _ret; if(pControllerState) struct_VRControllerState001_t_1011_win_to_lin(pControllerState, &lin); - _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, unControllerStateSize ? sizeof(lin) : 0); + unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0; + _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (uint32_t)unControllerStateSize); if(pControllerState) struct_VRControllerState001_t_1011_lin_to_win(&lin, pControllerState, unControllerStateSize); return _ret; @@ -206,7 +209,8 @@ bool cppIVRSystem_IVRSystem_017_GetControllerStateWithPose(void *linux_side, ETr bool _ret; if(pControllerState) struct_VRControllerState001_t_1011_win_to_lin(pControllerState, &lin); - _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, unControllerStateSize ? sizeof(lin) : 0, (vr::TrackedDevicePose_t *)pTrackedDevicePose); + unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0; + _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_VRControllerState001_t_1011_lin_to_win(&lin, pControllerState, unControllerStateSize); return _ret; diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_019.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_019.cpp index 2c13f6d2..cd206ea9 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_019.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_019.cpp @@ -165,7 +165,8 @@ bool cppIVRSystem_IVRSystem_019_PollNextEvent(void *linux_side, winVREvent_t_141 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); + uncbVREvent = uncbVREvent ? sizeof(lin) : 0; + _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, (uint32_t)uncbVREvent); if(pEvent) struct_VREvent_t_1418_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; @@ -177,7 +178,8 @@ bool cppIVRSystem_IVRSystem_019_PollNextEventWithPose(void *linux_side, ETrackin 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); + uncbVREvent = uncbVREvent ? sizeof(lin) : 0; + _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent, (vr::TrackedDevicePose_t *)pTrackedDevicePose); if(pEvent) struct_VREvent_t_1418_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; @@ -199,7 +201,8 @@ bool cppIVRSystem_IVRSystem_019_GetControllerState(void *linux_side, TrackedDevi bool _ret; if(pControllerState) struct_VRControllerState001_t_1418_win_to_lin(pControllerState, &lin); - _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, unControllerStateSize ? sizeof(lin) : 0); + unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0; + _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (uint32_t)unControllerStateSize); if(pControllerState) struct_VRControllerState001_t_1418_lin_to_win(&lin, pControllerState, unControllerStateSize); return _ret; @@ -211,7 +214,8 @@ bool cppIVRSystem_IVRSystem_019_GetControllerStateWithPose(void *linux_side, ETr bool _ret; if(pControllerState) struct_VRControllerState001_t_1418_win_to_lin(pControllerState, &lin); - _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, unControllerStateSize ? sizeof(lin) : 0, (vr::TrackedDevicePose_t *)pTrackedDevicePose); + unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0; + _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_VRControllerState001_t_1418_lin_to_win(&lin, pControllerState, unControllerStateSize); return _ret; diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_020.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_020.cpp index ebe579cc..acb13dd6 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_020.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_020.cpp @@ -165,7 +165,8 @@ bool cppIVRSystem_IVRSystem_020_PollNextEvent(void *linux_side, winVREvent_t_171 bool _ret; if(pEvent) struct_VREvent_t_1715_win_to_lin(pEvent, &lin); - _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, uncbVREvent ? sizeof(lin) : 0); + uncbVREvent = uncbVREvent ? sizeof(lin) : 0; + _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, (uint32_t)uncbVREvent); if(pEvent) struct_VREvent_t_1715_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; @@ -177,7 +178,8 @@ bool cppIVRSystem_IVRSystem_020_PollNextEventWithPose(void *linux_side, ETrackin bool _ret; if(pEvent) struct_VREvent_t_1715_win_to_lin(pEvent, &lin); - _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, uncbVREvent ? sizeof(lin) : 0, (vr::TrackedDevicePose_t *)pTrackedDevicePose); + uncbVREvent = uncbVREvent ? sizeof(lin) : 0; + _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent, (vr::TrackedDevicePose_t *)pTrackedDevicePose); if(pEvent) struct_VREvent_t_1715_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; @@ -199,7 +201,8 @@ bool cppIVRSystem_IVRSystem_020_GetControllerState(void *linux_side, TrackedDevi bool _ret; if(pControllerState) struct_VRControllerState001_t_1715_win_to_lin(pControllerState, &lin); - _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, unControllerStateSize ? sizeof(lin) : 0); + unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0; + _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (uint32_t)unControllerStateSize); if(pControllerState) struct_VRControllerState001_t_1715_lin_to_win(&lin, pControllerState, unControllerStateSize); return _ret; @@ -211,7 +214,8 @@ bool cppIVRSystem_IVRSystem_020_GetControllerStateWithPose(void *linux_side, ETr bool _ret; if(pControllerState) struct_VRControllerState001_t_1715_win_to_lin(pControllerState, &lin); - _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, unControllerStateSize ? sizeof(lin) : 0, (vr::TrackedDevicePose_t *)pTrackedDevicePose); + unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0; + _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_VRControllerState001_t_1715_lin_to_win(&lin, pControllerState, unControllerStateSize); return _ret; diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_021.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_021.cpp index 2bb93461..4008f7ae 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_021.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_021.cpp @@ -165,7 +165,8 @@ bool cppIVRSystem_IVRSystem_021_PollNextEvent(void *linux_side, winVREvent_t_112 bool _ret; if(pEvent) struct_VREvent_t_1125_win_to_lin(pEvent, &lin); - _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, uncbVREvent ? sizeof(lin) : 0); + uncbVREvent = uncbVREvent ? sizeof(lin) : 0; + _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, (uint32_t)uncbVREvent); if(pEvent) struct_VREvent_t_1125_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; @@ -177,7 +178,8 @@ bool cppIVRSystem_IVRSystem_021_PollNextEventWithPose(void *linux_side, ETrackin bool _ret; if(pEvent) struct_VREvent_t_1125_win_to_lin(pEvent, &lin); - _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, uncbVREvent ? sizeof(lin) : 0, (vr::TrackedDevicePose_t *)pTrackedDevicePose); + uncbVREvent = uncbVREvent ? sizeof(lin) : 0; + _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent, (vr::TrackedDevicePose_t *)pTrackedDevicePose); if(pEvent) struct_VREvent_t_1125_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; @@ -199,7 +201,8 @@ bool cppIVRSystem_IVRSystem_021_GetControllerState(void *linux_side, TrackedDevi bool _ret; if(pControllerState) struct_VRControllerState001_t_1125_win_to_lin(pControllerState, &lin); - _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, unControllerStateSize ? sizeof(lin) : 0); + unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0; + _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (uint32_t)unControllerStateSize); if(pControllerState) struct_VRControllerState001_t_1125_lin_to_win(&lin, pControllerState, unControllerStateSize); return _ret; @@ -211,7 +214,8 @@ bool cppIVRSystem_IVRSystem_021_GetControllerStateWithPose(void *linux_side, ETr bool _ret; if(pControllerState) struct_VRControllerState001_t_1125_win_to_lin(pControllerState, &lin); - _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, unControllerStateSize ? sizeof(lin) : 0, (vr::TrackedDevicePose_t *)pTrackedDevicePose); + unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0; + _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_VRControllerState001_t_1125_lin_to_win(&lin, pControllerState, unControllerStateSize); return _ret; diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_022.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_022.cpp index 1d2932df..a324616e 100644 --- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_022.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_022.cpp @@ -160,7 +160,8 @@ bool cppIVRSystem_IVRSystem_022_PollNextEvent(void *linux_side, winVREvent_t_126 bool _ret; if(pEvent) struct_VREvent_t_1267_win_to_lin(pEvent, &lin); - _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, uncbVREvent ? sizeof(lin) : 0); + uncbVREvent = uncbVREvent ? sizeof(lin) : 0; + _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, (uint32_t)uncbVREvent); if(pEvent) struct_VREvent_t_1267_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; @@ -172,7 +173,8 @@ bool cppIVRSystem_IVRSystem_022_PollNextEventWithPose(void *linux_side, ETrackin bool _ret; if(pEvent) struct_VREvent_t_1267_win_to_lin(pEvent, &lin); - _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, uncbVREvent ? sizeof(lin) : 0, (vr::TrackedDevicePose_t *)pTrackedDevicePose); + uncbVREvent = uncbVREvent ? sizeof(lin) : 0; + _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent, (vr::TrackedDevicePose_t *)pTrackedDevicePose); if(pEvent) struct_VREvent_t_1267_lin_to_win(&lin, pEvent, uncbVREvent); return _ret; @@ -194,7 +196,8 @@ bool cppIVRSystem_IVRSystem_022_GetControllerState(void *linux_side, TrackedDevi bool _ret; if(pControllerState) struct_VRControllerState001_t_1267_win_to_lin(pControllerState, &lin); - _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, unControllerStateSize ? sizeof(lin) : 0); + unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0; + _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (uint32_t)unControllerStateSize); if(pControllerState) struct_VRControllerState001_t_1267_lin_to_win(&lin, pControllerState, unControllerStateSize); return _ret; @@ -206,7 +209,8 @@ bool cppIVRSystem_IVRSystem_022_GetControllerStateWithPose(void *linux_side, ETr bool _ret; if(pControllerState) struct_VRControllerState001_t_1267_win_to_lin(pControllerState, &lin); - _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, unControllerStateSize ? sizeof(lin) : 0, (vr::TrackedDevicePose_t *)pTrackedDevicePose); + unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0; + _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_VRControllerState001_t_1267_lin_to_win(&lin, pControllerState, unControllerStateSize); return _ret; diff --git a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_004.cpp b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_004.cpp index 5acb4d96..da27feb9 100644 --- a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_004.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_004.cpp @@ -50,7 +50,8 @@ vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_004_GetVideoStrea vr::EVRTrackedCameraError _ret; if(pFrameHeader) struct_CameraVideoStreamFrameHeader_t_1017_win_to_lin(pFrameHeader, &lin); - _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamFrameBuffer((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pFrameBuffer, (uint32_t)nFrameBufferSize, pFrameHeader ? &lin : nullptr, nFrameHeaderSize ? sizeof(lin) : 0); + nFrameHeaderSize = nFrameHeaderSize ? sizeof(lin) : 0; + _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamFrameBuffer((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pFrameBuffer, (uint32_t)nFrameBufferSize, pFrameHeader ? &lin : nullptr, (uint32_t)nFrameHeaderSize); if(pFrameHeader) struct_CameraVideoStreamFrameHeader_t_1017_lin_to_win(&lin, pFrameHeader, nFrameHeaderSize); return _ret; @@ -67,7 +68,8 @@ vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_004_GetVideoStrea vr::EVRTrackedCameraError _ret; if(pFrameHeader) struct_CameraVideoStreamFrameHeader_t_1017_win_to_lin(pFrameHeader, &lin); - _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureD3D11((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pD3D11DeviceOrResource, (void **)ppD3D11ShaderResourceView, pFrameHeader ? &lin : nullptr, nFrameHeaderSize ? sizeof(lin) : 0); + nFrameHeaderSize = nFrameHeaderSize ? sizeof(lin) : 0; + _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureD3D11((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pD3D11DeviceOrResource, (void **)ppD3D11ShaderResourceView, pFrameHeader ? &lin : nullptr, (uint32_t)nFrameHeaderSize); if(pFrameHeader) struct_CameraVideoStreamFrameHeader_t_1017_lin_to_win(&lin, pFrameHeader, nFrameHeaderSize); return _ret; @@ -79,7 +81,8 @@ vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_004_GetVideoStrea vr::EVRTrackedCameraError _ret; if(pFrameHeader) struct_CameraVideoStreamFrameHeader_t_1017_win_to_lin(pFrameHeader, &lin); - _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureGL((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (vr::glUInt_t *)pglTextureId, pFrameHeader ? &lin : nullptr, nFrameHeaderSize ? sizeof(lin) : 0); + nFrameHeaderSize = nFrameHeaderSize ? sizeof(lin) : 0; + _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureGL((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (vr::glUInt_t *)pglTextureId, pFrameHeader ? &lin : nullptr, (uint32_t)nFrameHeaderSize); if(pFrameHeader) struct_CameraVideoStreamFrameHeader_t_1017_lin_to_win(&lin, pFrameHeader, nFrameHeaderSize); return _ret; diff --git a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_005.cpp b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_005.cpp index 73310084..2ddccd21 100644 --- a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_005.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_005.cpp @@ -50,7 +50,8 @@ vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_005_GetVideoStrea vr::EVRTrackedCameraError _ret; if(pFrameHeader) struct_CameraVideoStreamFrameHeader_t_1610_win_to_lin(pFrameHeader, &lin); - _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamFrameBuffer((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pFrameBuffer, (uint32_t)nFrameBufferSize, pFrameHeader ? &lin : nullptr, nFrameHeaderSize ? sizeof(lin) : 0); + nFrameHeaderSize = nFrameHeaderSize ? sizeof(lin) : 0; + _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamFrameBuffer((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pFrameBuffer, (uint32_t)nFrameBufferSize, pFrameHeader ? &lin : nullptr, (uint32_t)nFrameHeaderSize); if(pFrameHeader) struct_CameraVideoStreamFrameHeader_t_1610_lin_to_win(&lin, pFrameHeader, nFrameHeaderSize); return _ret; @@ -67,7 +68,8 @@ vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_005_GetVideoStrea vr::EVRTrackedCameraError _ret; if(pFrameHeader) struct_CameraVideoStreamFrameHeader_t_1610_win_to_lin(pFrameHeader, &lin); - _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureD3D11((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pD3D11DeviceOrResource, (void **)ppD3D11ShaderResourceView, pFrameHeader ? &lin : nullptr, nFrameHeaderSize ? sizeof(lin) : 0); + nFrameHeaderSize = nFrameHeaderSize ? sizeof(lin) : 0; + _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureD3D11((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pD3D11DeviceOrResource, (void **)ppD3D11ShaderResourceView, pFrameHeader ? &lin : nullptr, (uint32_t)nFrameHeaderSize); if(pFrameHeader) struct_CameraVideoStreamFrameHeader_t_1610_lin_to_win(&lin, pFrameHeader, nFrameHeaderSize); return _ret; @@ -79,7 +81,8 @@ vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_005_GetVideoStrea vr::EVRTrackedCameraError _ret; if(pFrameHeader) struct_CameraVideoStreamFrameHeader_t_1610_win_to_lin(pFrameHeader, &lin); - _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureGL((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (vr::glUInt_t *)pglTextureId, pFrameHeader ? &lin : nullptr, nFrameHeaderSize ? sizeof(lin) : 0); + nFrameHeaderSize = nFrameHeaderSize ? sizeof(lin) : 0; + _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureGL((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (vr::glUInt_t *)pglTextureId, pFrameHeader ? &lin : nullptr, (uint32_t)nFrameHeaderSize); if(pFrameHeader) struct_CameraVideoStreamFrameHeader_t_1610_lin_to_win(&lin, pFrameHeader, nFrameHeaderSize); return _ret; diff --git a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_006.cpp b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_006.cpp index b5ff9885..e778da17 100644 --- a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_006.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_006.cpp @@ -50,7 +50,8 @@ vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStrea vr::EVRTrackedCameraError _ret; if(pFrameHeader) struct_CameraVideoStreamFrameHeader_t_1267_win_to_lin(pFrameHeader, &lin); - _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamFrameBuffer((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pFrameBuffer, (uint32_t)nFrameBufferSize, pFrameHeader ? &lin : nullptr, nFrameHeaderSize ? sizeof(lin) : 0); + nFrameHeaderSize = nFrameHeaderSize ? sizeof(lin) : 0; + _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamFrameBuffer((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pFrameBuffer, (uint32_t)nFrameBufferSize, pFrameHeader ? &lin : nullptr, (uint32_t)nFrameHeaderSize); if(pFrameHeader) struct_CameraVideoStreamFrameHeader_t_1267_lin_to_win(&lin, pFrameHeader, nFrameHeaderSize); return _ret; @@ -67,7 +68,8 @@ vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStrea vr::EVRTrackedCameraError _ret; if(pFrameHeader) struct_CameraVideoStreamFrameHeader_t_1267_win_to_lin(pFrameHeader, &lin); - _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureD3D11((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pD3D11DeviceOrResource, (void **)ppD3D11ShaderResourceView, pFrameHeader ? &lin : nullptr, nFrameHeaderSize ? sizeof(lin) : 0); + nFrameHeaderSize = nFrameHeaderSize ? sizeof(lin) : 0; + _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureD3D11((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pD3D11DeviceOrResource, (void **)ppD3D11ShaderResourceView, pFrameHeader ? &lin : nullptr, (uint32_t)nFrameHeaderSize); if(pFrameHeader) struct_CameraVideoStreamFrameHeader_t_1267_lin_to_win(&lin, pFrameHeader, nFrameHeaderSize); return _ret; @@ -79,7 +81,8 @@ vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStrea vr::EVRTrackedCameraError _ret; if(pFrameHeader) struct_CameraVideoStreamFrameHeader_t_1267_win_to_lin(pFrameHeader, &lin); - _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureGL((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (vr::glUInt_t *)pglTextureId, pFrameHeader ? &lin : nullptr, nFrameHeaderSize ? sizeof(lin) : 0); + nFrameHeaderSize = nFrameHeaderSize ? sizeof(lin) : 0; + _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureGL((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (vr::glUInt_t *)pglTextureId, pFrameHeader ? &lin : nullptr, (uint32_t)nFrameHeaderSize); if(pFrameHeader) struct_CameraVideoStreamFrameHeader_t_1267_lin_to_win(&lin, pFrameHeader, nFrameHeaderSize); return _ret;