Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 19:14:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #8129 from ZappoMan/reduceLogSpam

Browse source 
reduce log spam in Vive plugins
This commit is contained in:
Howard Stearns 2016-06-24 13:00:13 -07:00 committed by GitHub
commit c4398c3950
2 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/openvr/src/OpenVrDisplayPlugin.cpp
View file

@ -96,7 +96,9 @@ bool OpenVrDisplayPlugin::internalActivate() {
glm::vec3 uiPos(0.0f, UI_HEIGHT, UI_RADIUS - (0.5f * zSize) - UI_Z_OFFSET);
_sensorResetMat = glm::inverse(createMatFromQuatAndPos(glm::quat(), uiPos));
} else {
qDebug() << "OpenVR: error could not get chaperone pointer";
#if DEV_BUILD
qDebug() << "OpenVR: error could not get chaperone pointer";
#endif
}
return Parent::internalActivate();

28
plugins/openvr/src/OpenVrHelpers.cpp
View file

@ -64,17 +64,25 @@ vr::IVRSystem* acquireOpenVrSystem() {
if (hmdPresent) {
Lock lock(mutex);
if (!activeHmd) {
qCDebug(displayplugins) << "OpenVR: No vr::IVRSystem instance active, building";
#if DEV_BUILD
qCDebug(displayplugins) << "OpenVR: No vr::IVRSystem instance active, building";
#endif
vr::EVRInitError eError = vr::VRInitError_None;
activeHmd = vr::VR_Init(&eError, vr::VRApplication_Scene);
qCDebug(displayplugins) << "OpenVR display: HMD is " << activeHmd << " error is " << eError;
#if DEV_BUILD
qCDebug(displayplugins) << "OpenVR display: HMD is " << activeHmd << " error is " << eError;
#endif
}
if (activeHmd) {
qCDebug(displayplugins) << "OpenVR: incrementing refcount";
#if DEV_BUILD
qCDebug(displayplugins) << "OpenVR: incrementing refcount";
#endif
++refCount;
}
} else {
qCDebug(displayplugins) << "OpenVR: no hmd present";
#if DEV_BUILD
qCDebug(displayplugins) << "OpenVR: no hmd present";
#endif
}
return activeHmd;
}
@ -82,10 +90,14 @@ vr::IVRSystem* acquireOpenVrSystem() {
void releaseOpenVrSystem() {
if (activeHmd) {
Lock lock(mutex);
qCDebug(displayplugins) << "OpenVR: decrementing refcount";
#if DEV_BUILD
qCDebug(displayplugins) << "OpenVR: decrementing refcount";
#endif
--refCount;
if (0 == refCount) {
qCDebug(displayplugins) << "OpenVR: zero refcount, deallocate VR system";
#if DEV_BUILD
qCDebug(displayplugins) << "OpenVR: zero refcount, deallocate VR system";
#endif
vr::VR_Shutdown();
activeHmd = nullptr;
}
@ -261,7 +273,9 @@ void handleOpenVrEvents() {
default:
break;
}
qDebug() << "OpenVR: Event " << activeHmd->GetEventTypeNameFromEnum((vr::EVREventType)event.eventType) << "(" << event.eventType << ")";
#if DEV_BUILD
qDebug() << "OpenVR: Event " << activeHmd->GetEventTypeNameFromEnum((vr::EVREventType)event.eventType) << "(" << event.eventType << ")";
#endif
}
}