diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 36100ea79f..4b0724a556 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -6611,8 +6611,6 @@ void Application::queryOctree(NodeType_t serverType, PacketType packetType) { bool Application::isHMDMode() const { - // qDebug() << "the hmd is visible " << getActiveDisplayPlugin()->isDisplayVisible(); - // qDebug() << "the hmd is active " << getActiveDisplayPlugin()->isHmd(); return getActiveDisplayPlugin()->isHmd(); } @@ -6692,7 +6690,6 @@ void Application::resetSensors(bool andReload) { } void Application::hmdVisibleChanged(bool visible) { - qDebug() << "hmd visible changed "; // TODO // calling start and stop will change audio input and ouput to default audio devices. // we need to add a pause/unpause functionality to AudioClient for this to work properly @@ -8250,7 +8247,7 @@ void Application::windowMinimizedChanged(bool minimized) { getActiveDisplayPlugin()->activate(); } else if (minimized && getActiveDisplayPlugin()->isActive()) { getActiveDisplayPlugin()->deactivate(); - //_minimizedWindowTimer.start(THROTTLED_SIM_FRAME_PERIOD_MS); + _minimizedWindowTimer.start(THROTTLED_SIM_FRAME_PERIOD_MS); } } diff --git a/interface/src/graphics/GraphicsEngine.cpp b/interface/src/graphics/GraphicsEngine.cpp index 6406d02ced..c2137d3d97 100644 --- a/interface/src/graphics/GraphicsEngine.cpp +++ b/interface/src/graphics/GraphicsEngine.cpp @@ -32,7 +32,6 @@ #include #include "ui/Stats.h" #include "Application.h" -#include "InterfaceLogging.h" GraphicsEngine::GraphicsEngine() { const QString SPLASH_SKYBOX { "{\"ProceduralEntity\":{ \"version\":2, \"shaderUrl\":\"qrc:///shaders/splashSkybox.frag\" } }" }; @@ -154,7 +153,7 @@ bool GraphicsEngine::shouldPaint() const { (static_cast(_renderEventHandler)->_lastTimeRendered.elapsed() < THROTTLED_SIM_FRAME_PERIOD_MS)) { return false; } - // qCDebug(interfaceapp) << "we are now throttling!!!!!"; + return true; } diff --git a/libraries/animation/src/AnimClip.cpp b/libraries/animation/src/AnimClip.cpp index be28fc93be..9dcf5822cd 100644 --- a/libraries/animation/src/AnimClip.cpp +++ b/libraries/animation/src/AnimClip.cpp @@ -110,7 +110,7 @@ void AnimClip::copyFromNetworkAnim() { for (int i = 0; i < animJointCount; i++) { int skeletonJoint = _skeleton->nameToJointIndex(animSkeleton.getJointName(i)); if (skeletonJoint == -1) { - //qCWarning(animation) << "animation contains joint =" << animSkeleton.getJointName(i) << " which is not in the skeleton"; + qCWarning(animation) << "animation contains joint =" << animSkeleton.getJointName(i) << " which is not in the skeleton"; } jointMap.push_back(skeletonJoint); } diff --git a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp index 115f3bcd3a..321bcc3fd2 100644 --- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp +++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp @@ -48,10 +48,6 @@ static const glm::mat4 IDENTITY_MATRIX; //#define LIVE_SHADER_RELOAD 1 extern glm::vec3 getPoint(float yaw, float pitch); -bool HmdDisplayPlugin::isHmd() const { - return true; -} - glm::uvec2 HmdDisplayPlugin::getRecommendedUiSize() const { return CompositorHelper::VIRTUAL_SCREEN_SIZE; } diff --git a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h index 370d77b72e..a56daaad83 100644 --- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h +++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h @@ -25,7 +25,7 @@ class HmdDisplayPlugin : public OpenGLDisplayPlugin { using Parent = OpenGLDisplayPlugin; public: ~HmdDisplayPlugin(); - bool isHmd() const override final; + bool isHmd() const override final { return true; } float getIPD() const override final { return _ipd; } glm::mat4 getEyeToHeadTransform(Eye eye) const override final; glm::mat4 getEyeProjection(Eye eye, const glm::mat4& baseProjection) const override; diff --git a/plugins/oculus/src/OculusBaseDisplayPlugin.cpp b/plugins/oculus/src/OculusBaseDisplayPlugin.cpp index b3212b63f8..f10aba7920 100644 --- a/plugins/oculus/src/OculusBaseDisplayPlugin.cpp +++ b/plugins/oculus/src/OculusBaseDisplayPlugin.cpp @@ -39,7 +39,6 @@ bool OculusBaseDisplayPlugin::beginFrameRender(uint32_t frameIndex) { } if (ovr::hmdMounted(status) != _hmdMounted) { _hmdMounted = !_hmdMounted; - qCDebug(oculusLog) << "changed the hmd status" << _hmdMounted; emit hmdMountedChanged(); } if (ovr::isVisible(status) != _visible) { diff --git a/plugins/openvr/src/OpenVrDisplayPlugin.cpp b/plugins/openvr/src/OpenVrDisplayPlugin.cpp index 633cb13441..11d941dcd0 100644 --- a/plugins/openvr/src/OpenVrDisplayPlugin.cpp +++ b/plugins/openvr/src/OpenVrDisplayPlugin.cpp @@ -668,22 +668,9 @@ void OpenVrDisplayPlugin::hmdPresent() { void OpenVrDisplayPlugin::postPreview() { PROFILE_RANGE_EX(render, __FUNCTION__, 0xff00ff00, (uint64_t)_currentFrame->frameIndex) - PoseData nextRender, nextSim; + PoseData nextRender, nextSim; nextRender.frameIndex = presentCount(); - _hmdActivityLevel = _system->GetTrackedDeviceActivityLevel(vr::k_unTrackedDeviceIndex_Hmd); - switch (_hmdActivityLevel) { - case vr::EDeviceActivityLevel::k_EDeviceActivityLevel_Unknown: qDebug() << "unkown hmd activity "; - break; - case vr::EDeviceActivityLevel::k_EDeviceActivityLevel_Idle: qDebug() << "no activity 10 secs "; - break; - //case vr::EDeviceActivityLevel::k_EDeviceActivityLevel_UserInteraction: qDebug() << "activity "; - // break; - case vr::EDeviceActivityLevel::k_EDeviceActivityLevel_UserInteraction_Timeout: qDebug() << "idle for 0.5 secs "; - break; - case vr::EDeviceActivityLevel::k_EDeviceActivityLevel_Standby: qDebug() << "idle for 5 secs "; - break; - } if (!_threadedSubmit) { vr::VRCompositor()->WaitGetPoses(nextRender.vrPoses, vr::k_unMaxTrackedDeviceCount, nextSim.vrPoses, vr::k_unMaxTrackedDeviceCount); @@ -697,14 +684,12 @@ void OpenVrDisplayPlugin::postPreview() { } if (isHmdMounted() != _hmdMounted) { - qDebug() << "changed hmd status " << isHmdMounted(); _hmdMounted = !_hmdMounted; emit hmdMountedChanged(); } } bool OpenVrDisplayPlugin::isHmdMounted() const { - // return _hmdActivityLevel == vr::k_EDeviceActivityLevel_UserInteraction; return isHeadInHeadset(); } diff --git a/plugins/openvr/src/OpenVrDisplayPlugin.h b/plugins/openvr/src/OpenVrDisplayPlugin.h index 1ec8716cb5..265f328920 100644 --- a/plugins/openvr/src/OpenVrDisplayPlugin.h +++ b/plugins/openvr/src/OpenVrDisplayPlugin.h @@ -79,7 +79,6 @@ protected: private: vr::IVRSystem* _system { nullptr }; - std::atomic _hmdActivityLevel { vr::k_EDeviceActivityLevel_Unknown }; std::atomic _keyboardSupressionCount{ 0 }; vr::HmdMatrix34_t _lastGoodHMDPose; diff --git a/plugins/openvr/src/OpenVrHelpers.cpp b/plugins/openvr/src/OpenVrHelpers.cpp index 1475e63218..3f0b54ad44 100644 --- a/plugins/openvr/src/OpenVrHelpers.cpp +++ b/plugins/openvr/src/OpenVrHelpers.cpp @@ -125,7 +125,7 @@ vr::IVRSystem* acquireOpenVrSystem() { } if (activeHmd) { #if DEV_BUILD - //qCDebug(displayplugins) << "OpenVR: incrementing refcount"; + qCDebug(displayplugins) << "OpenVR: incrementing refcount"; #endif ++refCount; } @@ -274,15 +274,6 @@ void handleOpenVrEvents() { DependencyManager::get()->unfocusWindows(); break; - case vr::VREvent_TrackedDeviceUserInteractionStarted: - qDebug() << "Put on the headset"; - //hmdMountedChanged(); - break; - - case vr::VREvent_TrackedDeviceUserInteractionEnded: - qDebug() << "Took off the headset"; - break; - default: break; } @@ -453,15 +444,6 @@ void showMinSpecWarning() { } break; - case vr::VREvent_TrackedDeviceUserInteractionStarted: - qDebug() << "Put on the headset2"; - //hmdMountedChanged(); - break; - - case vr::VREvent_TrackedDeviceUserInteractionEnded: - qDebug() << "Took off the headset2"; - break; - default: break; }