From 552b69bb1c6aefc0cf7303da62f70a14e99e2c4f Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Thu, 1 Jun 2017 13:47:19 -0700 Subject: [PATCH] cleanups --- interface/src/avatar/MyAvatar.cpp | 1 + interface/src/scripting/HMDScriptingInterface.cpp | 3 +-- .../src/display-plugins/hmd/DebugHmdDisplayPlugin.h | 1 + plugins/hifiKinect/src/KinectPlugin.cpp | 10 +--------- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 5723751631..ef2e53cbb9 100755 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -1889,6 +1889,7 @@ void MyAvatar::updateOrientation(float deltaTime) { // these angles will be in radians // ... so they need to be converted to degrees before we do math... glm::vec3 euler = glm::eulerAngles(localOrientation) * DEGREES_PER_RADIAN; + Head* head = getHead(); head->setBaseYaw(YAW(euler)); head->setBasePitch(PITCH(euler)); diff --git a/interface/src/scripting/HMDScriptingInterface.cpp b/interface/src/scripting/HMDScriptingInterface.cpp index 1227f46eb6..883a6e758e 100644 --- a/interface/src/scripting/HMDScriptingInterface.cpp +++ b/interface/src/scripting/HMDScriptingInterface.cpp @@ -122,8 +122,7 @@ bool HMDScriptingInterface::getHUDLookAtPosition3D(glm::vec3& result) const { glm::mat4 HMDScriptingInterface::getWorldHMDMatrix() const { auto myAvatar = DependencyManager::get()->getMyAvatar(); - // return myAvatar->getSensorToWorldMatrix() * myAvatar->getHMDSensorMatrix(); - return myAvatar->getSensorToWorldMatrix() * myAvatar->getHeadControllerPoseInSensorFrame().getMatrix() * Matrices::Y_180; + return myAvatar->getSensorToWorldMatrix() * myAvatar->getHMDSensorMatrix(); } glm::vec3 HMDScriptingInterface::getPosition() const { diff --git a/libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.h b/libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.h index 55746e65eb..9bb82b1836 100644 --- a/libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.h +++ b/libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.h @@ -21,6 +21,7 @@ public: bool beginFrameRender(uint32_t frameIndex) override; float getTargetFrameRate() const override { return 90; } + protected: void updatePresentPose() override; void hmdPresent() override {} diff --git a/plugins/hifiKinect/src/KinectPlugin.cpp b/plugins/hifiKinect/src/KinectPlugin.cpp index 834ee1ea2e..92c578e9aa 100644 --- a/plugins/hifiKinect/src/KinectPlugin.cpp +++ b/plugins/hifiKinect/src/KinectPlugin.cpp @@ -286,15 +286,7 @@ bool KinectPlugin::isHandController() const { } bool KinectPlugin::isHeadController() const { - bool sensorAvailable = false; -#ifdef HAVE_KINECT - if (_kinectSensor) { - BOOLEAN sensorIsAvailable = FALSE; - HRESULT hr = _kinectSensor->get_IsAvailable(&sensorIsAvailable); - sensorAvailable = SUCCEEDED(hr) && (sensorIsAvailable == TRUE); - } -#endif - return _enabled && _initialized && sensorAvailable; + return isHandController(); }