From bfd014203e796d807c32b1b1403d739456dd6b1c Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Wed, 7 Oct 2015 14:48:42 -0700 Subject: [PATCH] fix a bunch of warnings --- interface/src/Application.cpp | 18 ------------------ interface/src/Application.h | 1 - .../entities/src/AnimationPropertyGroup.cpp | 2 ++ .../entities/src/AtmospherePropertyGroup.cpp | 2 ++ libraries/entities/src/SkyboxPropertyGroup.cpp | 2 ++ libraries/entities/src/StagePropertyGroup.cpp | 2 ++ libraries/networking/src/udt/PacketQueue.cpp | 2 +- 7 files changed, 9 insertions(+), 20 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 70cc189ad6..e64d4a9bd5 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -4750,24 +4750,6 @@ mat4 Application::getEyeProjection(int eye) const { return _viewFrustum.getProjection(); } -mat4 Application::getEyePose(int eye) const { - if (isHMDMode()) { - auto hmdInterface = DependencyManager::get(); - float IPDScale = hmdInterface->getIPDScale(); - auto displayPlugin = getActiveDisplayPlugin(); - mat4 headPose = displayPlugin->getHeadPose(); - mat4 eyeToHead = displayPlugin->getEyeToHeadTransform((Eye)eye); - { - vec3 eyeOffset = glm::vec3(eyeToHead[3]); - // Apply IPD scaling - mat4 eyeOffsetTransform = glm::translate(mat4(), eyeOffset * -1.0f * IPDScale); - eyeToHead[3] = vec4(eyeOffset, 1.0); - } - return eyeToHead * headPose; - } - return mat4(); -} - mat4 Application::getEyeOffset(int eye) const { // FIXME invert? return getActiveDisplayPlugin()->getEyeToHeadTransform((Eye)eye); diff --git a/interface/src/Application.h b/interface/src/Application.h index ec5133b131..0b75a94232 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -198,7 +198,6 @@ public: // TODO: carry that information on the Camera as a setting bool isHMDMode() const; glm::mat4 getHMDSensorPose() const; - glm::mat4 getEyePose(int eye) const; glm::mat4 getEyeOffset(int eye) const; glm::mat4 getEyeProjection(int eye) const; diff --git a/libraries/entities/src/AnimationPropertyGroup.cpp b/libraries/entities/src/AnimationPropertyGroup.cpp index 3c22707869..48cedfbf5d 100644 --- a/libraries/entities/src/AnimationPropertyGroup.cpp +++ b/libraries/entities/src/AnimationPropertyGroup.cpp @@ -249,6 +249,8 @@ bool AnimationPropertyGroup::decodeFromEditPacket(EntityPropertyFlags& propertyF processedBytes += bytesRead; + Q_UNUSED(somethingChanged); + return true; } diff --git a/libraries/entities/src/AtmospherePropertyGroup.cpp b/libraries/entities/src/AtmospherePropertyGroup.cpp index e24dc5791b..0f0e68ce72 100644 --- a/libraries/entities/src/AtmospherePropertyGroup.cpp +++ b/libraries/entities/src/AtmospherePropertyGroup.cpp @@ -108,6 +108,8 @@ bool AtmospherePropertyGroup::decodeFromEditPacket(EntityPropertyFlags& property processedBytes += bytesRead; + Q_UNUSED(somethingChanged); + return true; } diff --git a/libraries/entities/src/SkyboxPropertyGroup.cpp b/libraries/entities/src/SkyboxPropertyGroup.cpp index d3ed82274a..b79b535d8e 100644 --- a/libraries/entities/src/SkyboxPropertyGroup.cpp +++ b/libraries/entities/src/SkyboxPropertyGroup.cpp @@ -66,6 +66,8 @@ bool SkyboxPropertyGroup::decodeFromEditPacket(EntityPropertyFlags& propertyFlag processedBytes += bytesRead; + Q_UNUSED(somethingChanged); + return true; } diff --git a/libraries/entities/src/StagePropertyGroup.cpp b/libraries/entities/src/StagePropertyGroup.cpp index bab68c7a4b..7110f0481d 100644 --- a/libraries/entities/src/StagePropertyGroup.cpp +++ b/libraries/entities/src/StagePropertyGroup.cpp @@ -121,6 +121,8 @@ bool StagePropertyGroup::decodeFromEditPacket(EntityPropertyFlags& propertyFlags processedBytes += bytesRead; + Q_UNUSED(somethingChanged); + return true; } diff --git a/libraries/networking/src/udt/PacketQueue.cpp b/libraries/networking/src/udt/PacketQueue.cpp index 1c104e1427..bc3a1796e2 100644 --- a/libraries/networking/src/udt/PacketQueue.cpp +++ b/libraries/networking/src/udt/PacketQueue.cpp @@ -55,7 +55,7 @@ PacketQueue::PacketPointer PacketQueue::takePacket() { } unsigned int PacketQueue::nextIndex() { - _currentIndex = (++_currentIndex) % _channels.size(); + _currentIndex = (_currentIndex + 1) % _channels.size(); return _currentIndex; }