From 5e82b9c43371ab129c9a161943963bc32009c5b4 Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Thu, 24 Sep 2015 08:26:56 -0700 Subject: [PATCH] more warning fixes --- interface/src/ui/ApplicationOverlay.cpp | 2 -- libraries/animation/src/Rig.cpp | 6 ++++-- libraries/audio/src/AudioInjector.cpp | 1 + libraries/render-utils/src/AnimDebugDraw.cpp | 2 ++ 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/interface/src/ui/ApplicationOverlay.cpp b/interface/src/ui/ApplicationOverlay.cpp index 120f97971c..7254295c2f 100644 --- a/interface/src/ui/ApplicationOverlay.cpp +++ b/interface/src/ui/ApplicationOverlay.cpp @@ -94,8 +94,6 @@ void ApplicationOverlay::renderOverlay(RenderArgs* renderArgs) { renderArgs->_context->render(batch); - qDebug() << "ApplicationOverlay::renderOverlay() batch:" << batch.getCacheState(); - renderArgs->_batch = nullptr; // so future users of renderArgs don't try to use our batch CHECK_GL_ERROR(); diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp index 216f091f93..f1e81df64e 100644 --- a/libraries/animation/src/Rig.cpp +++ b/libraries/animation/src/Rig.cpp @@ -992,11 +992,13 @@ static AnimPose avatarToBonePose(AnimPose pose, AnimSkeleton::ConstPointer skele return rootPose * rotY180 * pose; } +#ifdef DEBUG_RENDERING static AnimPose boneToAvatarPose(AnimPose pose, AnimSkeleton::ConstPointer skeleton) { AnimPose rootPose = skeleton->getAbsoluteBindPose(skeleton->nameToJointIndex("Hips")); AnimPose rotY180(glm::vec3(1), glm::angleAxis((float)PI, glm::vec3(0.0f, 1.0f, 0.0f)), glm::vec3(0)); return (rootPose * rotY180).inverse() * pose; } +#endif static void computeHeadNeckAnimVars(AnimSkeleton::ConstPointer skeleton, const AnimPose& avatarHMDPose, glm::vec3& headPositionOut, glm::quat& headOrientationOut, @@ -1046,7 +1048,7 @@ void Rig::updateNeckJoint(int index, const HeadParameters& params) { computeHeadNeckAnimVars(_animSkeleton, avatarHMDPose, headPos, headRot, neckPos, neckRot); // debug rendering - /* +#ifdef DEBUG_RENDERING const glm::vec4 red(1.0f, 0.0f, 0.0f, 1.0f); const glm::vec4 green(0.0f, 1.0f, 0.0f, 1.0f); @@ -1059,7 +1061,7 @@ void Rig::updateNeckJoint(int index, const HeadParameters& params) { AnimPose neckPose(glm::vec3(1), neckRot, neckPos); neckPose = boneToAvatarPose(neckPose, _animSkeleton); DebugDraw::getInstance().addMyAvatarMarker("neckTarget", neckPose.rot, neckPose.trans, green); - */ +#endif _animVars.set("headPosition", headPos); _animVars.set("headRotation", headRot); diff --git a/libraries/audio/src/AudioInjector.cpp b/libraries/audio/src/AudioInjector.cpp index a3577e6c58..334c44c4c5 100644 --- a/libraries/audio/src/AudioInjector.cpp +++ b/libraries/audio/src/AudioInjector.cpp @@ -330,6 +330,7 @@ AudioInjector* AudioInjector::playSound(const QString& soundUrl, const float vol reinterpret_cast(resampled.data()), nInputFrames); + Q_UNUSED(nOutputFrames); return playSoundAndDelete(resampled, options, NULL); } diff --git a/libraries/render-utils/src/AnimDebugDraw.cpp b/libraries/render-utils/src/AnimDebugDraw.cpp index 2db9094bcb..73f7b43ddb 100644 --- a/libraries/render-utils/src/AnimDebugDraw.cpp +++ b/libraries/render-utils/src/AnimDebugDraw.cpp @@ -488,6 +488,7 @@ void AnimDebugDraw::update() { glm::quat rot = std::get<0>(iter.second); glm::vec3 pos = std::get<1>(iter.second); glm::vec4 color = std::get<2>(iter.second); // TODO: currently ignored. + Q_UNUSED(color); const float radius = POSE_RADIUS; addBone(AnimPose::identity, AnimPose(glm::vec3(1), rot, pos), radius, v); } @@ -497,6 +498,7 @@ void AnimDebugDraw::update() { glm::quat rot = std::get<0>(iter.second); glm::vec3 pos = std::get<1>(iter.second); glm::vec4 color = std::get<2>(iter.second); // TODO: currently ignored. + Q_UNUSED(color); const float radius = POSE_RADIUS; addBone(myAvatarPose, AnimPose(glm::vec3(1), rot, pos), radius, v); }