1
0
Fork 0
mirror of https://github.com/bjornbytes/lovr.git synced 2024-07-02 12:33:52 +00:00

Return proper headset name for OpenVR backend;

This commit is contained in:
bjornbytes 2017-08-12 21:13:57 -07:00
parent 3c3076f8c4
commit b843fc3dbe
2 changed files with 3 additions and 1 deletions

View file

@ -90,6 +90,7 @@ void lovrHeadsetInit() {
state.isInitialized = 1; state.isInitialized = 1;
state.headsetIndex = k_unTrackedDeviceIndex_Hmd; state.headsetIndex = k_unTrackedDeviceIndex_Hmd;
state.system->GetStringTrackedDeviceProperty(state.headsetIndex, ETrackedDeviceProperty_Prop_ModelNumber_String, state.type, 128, NULL);
state.clipNear = 0.1f; state.clipNear = 0.1f;
state.clipFar = 30.f; state.clipFar = 30.f;
lovrHeadsetRefreshControllers(); lovrHeadsetRefreshControllers();
@ -169,7 +170,7 @@ int lovrHeadsetIsPresent() {
} }
const char* lovrHeadsetGetType() { const char* lovrHeadsetGetType() {
return state.isInitialized ? "Vive" : NULL; return state.type;
} }
HeadsetOrigin lovrHeadsetGetOriginType() { HeadsetOrigin lovrHeadsetGetOriginType() {

View file

@ -29,6 +29,7 @@ typedef struct {
struct VR_IVRRenderModels_FnTable* renderModels; struct VR_IVRRenderModels_FnTable* renderModels;
unsigned int headsetIndex; unsigned int headsetIndex;
char type[128];
TrackedDevicePose_t renderPoses[16]; TrackedDevicePose_t renderPoses[16];
RenderModel_t* deviceModels[16]; RenderModel_t* deviceModels[16];