From 75152abe2cebd662a7d190aebff05d47ecbbf8fa Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 16 Jan 2014 09:52:29 -0800 Subject: [PATCH] fix unused variable warnings and constructor ordering --- interface/src/avatar/Avatar.cpp | 1 - interface/src/devices/Webcam.cpp | 3 ++- libraries/particles/src/ParticleCollisionSystem.cpp | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp index 2eb85dbea2..4f5bd3b94d 100644 --- a/interface/src/avatar/Avatar.cpp +++ b/interface/src/avatar/Avatar.cpp @@ -360,7 +360,6 @@ bool Avatar::findSphereCollision(const glm::vec3& sphereCenter, float sphereRadi const HandData* handData = getHandData(); if (handData) { - int jointIndices[2] = { _skeletonModel.getLeftHandJointIndex(), _skeletonModel.getRightHandJointIndex() }; for (int i = 0; i < 2; i++) { const PalmData* palm = handData->getPalm(i); if (palm) { diff --git a/interface/src/devices/Webcam.cpp b/interface/src/devices/Webcam.cpp index f6a49a9407..79e5c109cb 100644 --- a/interface/src/devices/Webcam.cpp +++ b/interface/src/devices/Webcam.cpp @@ -40,7 +40,8 @@ int matMetaType = qRegisterMetaType("cv::Mat"); int rotatedRectMetaType = qRegisterMetaType("cv::RotatedRect"); #endif //def HAVE_LIBVPX -Webcam::Webcam() : _enabled(false), _active(false), _colorTextureID(0), _depthTextureID(0), _skeletonTrackingOn(false), _grabber(NULL) { +Webcam::Webcam() : _grabber(NULL), _enabled(false), _active(false), _colorTextureID(0), _depthTextureID(0), + _skeletonTrackingOn(false) { // the grabber simply runs as fast as possible #ifdef HAVE_LIBVPX _grabber = new FrameGrabber(); diff --git a/libraries/particles/src/ParticleCollisionSystem.cpp b/libraries/particles/src/ParticleCollisionSystem.cpp index a57475b4db..ed62da8791 100644 --- a/libraries/particles/src/ParticleCollisionSystem.cpp +++ b/libraries/particles/src/ParticleCollisionSystem.cpp @@ -149,7 +149,6 @@ void ParticleCollisionSystem::updateCollisionWithAvatars(Particle* particle) { const float DAMPING = 0.0f; const float COLLISION_FREQUENCY = 0.5f; glm::vec3 penetration; - const PalmData* collidingPalm = NULL; // first check the selfAvatar if set... if (_selfAvatar) {