From b843fc3dbe32a4068efb89b65fe02e4e562b46e9 Mon Sep 17 00:00:00 2001 From: bjornbytes Date: Sat, 12 Aug 2017 21:13:57 -0700 Subject: [PATCH] Return proper headset name for OpenVR backend; --- src/headset/openvr.c | 3 ++- src/headset/openvr.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/headset/openvr.c b/src/headset/openvr.c index 111d7119..72ce0f55 100644 --- a/src/headset/openvr.c +++ b/src/headset/openvr.c @@ -90,6 +90,7 @@ void lovrHeadsetInit() { state.isInitialized = 1; state.headsetIndex = k_unTrackedDeviceIndex_Hmd; + state.system->GetStringTrackedDeviceProperty(state.headsetIndex, ETrackedDeviceProperty_Prop_ModelNumber_String, state.type, 128, NULL); state.clipNear = 0.1f; state.clipFar = 30.f; lovrHeadsetRefreshControllers(); @@ -169,7 +170,7 @@ int lovrHeadsetIsPresent() { } const char* lovrHeadsetGetType() { - return state.isInitialized ? "Vive" : NULL; + return state.type; } HeadsetOrigin lovrHeadsetGetOriginType() { diff --git a/src/headset/openvr.h b/src/headset/openvr.h index 681e6566..430e0c4b 100644 --- a/src/headset/openvr.h +++ b/src/headset/openvr.h @@ -29,6 +29,7 @@ typedef struct { struct VR_IVRRenderModels_FnTable* renderModels; unsigned int headsetIndex; + char type[128]; TrackedDevicePose_t renderPoses[16]; RenderModel_t* deviceModels[16];