vrclient: remove redundant user_structs field

This commit is contained in:
Andrew Eikum
2019-09-24 08:00:09 -05:00
parent 3584832fa4
commit f24e88d400
68 changed files with 336 additions and 609 deletions
+2 -13
View File
@@ -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)
@@ -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)
@@ -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 *);
@@ -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)
@@ -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 *);
@@ -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)
@@ -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 *);
@@ -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)
@@ -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 *);
@@ -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)
@@ -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 *);
@@ -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)
@@ -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 *);
@@ -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)
@@ -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 *);
@@ -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);
@@ -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);
@@ -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);
@@ -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);
@@ -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);

Some files were not shown because too many files have changed in this diff Show More