From 9428857194d6c0c7781f7709f607b0510d7a8939 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Sat, 28 Mar 2015 17:10:16 -0700 Subject: [PATCH 01/14] quiet compiler, remove extra-assignment/typo --- assignment-client/src/avatars/AvatarMixer.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp index 176fd51eea..dae6af3fc5 100644 --- a/assignment-client/src/avatars/AvatarMixer.cpp +++ b/assignment-client/src/avatars/AvatarMixer.cpp @@ -149,7 +149,8 @@ void AvatarMixer::broadcastAvatarData() { // about a given otherNode to this node // FIXME does this mean we should sort the othernodes by distance before iterating // over them? - float outputBandwidth = node->getOutboundBandwidth(); + // float outputBandwidth = + node->getOutboundBandwidth(); // this is an AGENT we have received head data from // send back a packet with other active node data to this node @@ -169,7 +170,7 @@ void AvatarMixer::broadcastAvatarData() { return true; }, [&](const SharedNodePointer& otherNode) { - AvatarMixerClientData* otherNodeData = otherNodeData = reinterpret_cast(otherNode->getLinkedData()); + AvatarMixerClientData* otherNodeData = reinterpret_cast(otherNode->getLinkedData()); MutexTryLocker lock(otherNodeData->getMutex()); if (!lock.isLocked()) { return; From 986bc71e938f8843a07bc6d8851ab648d9bb33a1 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Sat, 28 Mar 2015 17:10:26 -0700 Subject: [PATCH 02/14] quiet compiler --- interface/src/scripting/ControllerScriptingInterface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/scripting/ControllerScriptingInterface.cpp b/interface/src/scripting/ControllerScriptingInterface.cpp index 35c24346d2..7d6012c880 100644 --- a/interface/src/scripting/ControllerScriptingInterface.cpp +++ b/interface/src/scripting/ControllerScriptingInterface.cpp @@ -353,7 +353,7 @@ void InputController::update() { // TODO for now the InputController is only supporting a JointTracker from a MotionTracker MotionTracker* motionTracker = dynamic_cast< MotionTracker*> (DeviceTracker::getDevice(_deviceTrackerId)); if (motionTracker) { - if (_subTrackerId < motionTracker->numJointTrackers()) { + if ((int)_subTrackerId < motionTracker->numJointTrackers()) { const MotionTracker::JointTracker* joint = motionTracker->getJointTracker(_subTrackerId); if (joint->isActive()) { From fc1e45fc58a82c42eeb4460d5ecde11e62636419 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Sat, 28 Mar 2015 17:10:46 -0700 Subject: [PATCH 03/14] valgrind says this is used before it's initialized --- interface/src/ui/ApplicationOverlay.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/interface/src/ui/ApplicationOverlay.cpp b/interface/src/ui/ApplicationOverlay.cpp index d9adaf02e6..633eafc202 100644 --- a/interface/src/ui/ApplicationOverlay.cpp +++ b/interface/src/ui/ApplicationOverlay.cpp @@ -139,6 +139,7 @@ ApplicationOverlay::ApplicationOverlay() : _magnifier(true), _alpha(1.0f), _oculusUIRadius(1.0f), + _trailingAudioLoudness(0.0f), _crosshairTexture(0), _previousBorderWidth(-1), _previousBorderHeight(-1), From faa3ed6c292ec8b6dc682f929c49c2ead6021a11 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Sat, 28 Mar 2015 17:11:23 -0700 Subject: [PATCH 04/14] valgrind wants [] --- libraries/audio/src/AudioBuffer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/audio/src/AudioBuffer.h b/libraries/audio/src/AudioBuffer.h index 4849289743..621b7b1b8c 100644 --- a/libraries/audio/src/AudioBuffer.h +++ b/libraries/audio/src/AudioBuffer.h @@ -90,7 +90,7 @@ void AudioFrameBuffer< T >::deallocateFrames() { for (uint32_t i = 0; i < _channelCountMax; ++i) { delete _frameBuffer[i]; } - delete _frameBuffer; + delete[] _frameBuffer; } _frameBuffer = NULL; } From 78b46cff2be0bfe3e722489a7f9448a384dbbd1a Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Sat, 28 Mar 2015 17:11:36 -0700 Subject: [PATCH 05/14] quiet compiler --- libraries/audio/src/AudioFilterBank.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/audio/src/AudioFilterBank.h b/libraries/audio/src/AudioFilterBank.h index 723fa6b270..7b3b45f56b 100644 --- a/libraries/audio/src/AudioFilterBank.h +++ b/libraries/audio/src/AudioFilterBank.h @@ -88,7 +88,7 @@ public: } void loadProfile(int profileIndex) { - if (profileIndex >= 0 && profileIndex < _profileCount) { + if (profileIndex >= 0 && profileIndex < (int)_profileCount) { for (uint32_t i = 0; i < _filterCount; ++i) { FilterParameter p = _profiles[profileIndex][i]; From 96bfc5339182177f7a3fcf7f19b056adba4a022e Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Sat, 28 Mar 2015 17:11:56 -0700 Subject: [PATCH 06/14] prototype has no code and isn't used --- libraries/entities/src/EntityTree.h | 1 - 1 file changed, 1 deletion(-) diff --git a/libraries/entities/src/EntityTree.h b/libraries/entities/src/EntityTree.h index 8536e74e9a..29fecc88b4 100644 --- a/libraries/entities/src/EntityTree.h +++ b/libraries/entities/src/EntityTree.h @@ -95,7 +95,6 @@ public: void deleteEntity(const EntityItemID& entityID, bool force = false, bool ignoreWarnings = false); void deleteEntities(QSet entityIDs, bool force = false, bool ignoreWarnings = false); - void removeEntityFromSimulation(EntityItem* entity); /// \param position point of query in world-frame (meters) /// \param targetRadius radius of query (meters) From 1e166eef0f647e7b9a0f451cc7c1d86023fc467e Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Sat, 28 Mar 2015 17:12:55 -0700 Subject: [PATCH 07/14] valgrind says _ghostObject is used before it's initialized --- libraries/physics/src/CharacterController.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/physics/src/CharacterController.cpp b/libraries/physics/src/CharacterController.cpp index 09c6b5599f..ba0cfb3c80 100644 --- a/libraries/physics/src/CharacterController.cpp +++ b/libraries/physics/src/CharacterController.cpp @@ -235,7 +235,9 @@ CharacterController::CharacterController(AvatarData* avatarData) { _jumpToHoverStart = 0; setMaxSlope(btRadians(45.0f)); _lastStepUp = 0.0f; - _pendingFlags = 0; + + _pendingFlags = PENDING_FLAG_UPDATE_SHAPE; + updateShapeIfNecessary(); } CharacterController::~CharacterController() { From a47ae9212b6406f7cb8abb7a14bf9eaa146b388a Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Sat, 28 Mar 2015 17:13:31 -0700 Subject: [PATCH 08/14] quiet compiler --- libraries/render-utils/src/DeferredLightingEffect.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/render-utils/src/DeferredLightingEffect.cpp b/libraries/render-utils/src/DeferredLightingEffect.cpp index 13bf947d71..ffa84adbdf 100644 --- a/libraries/render-utils/src/DeferredLightingEffect.cpp +++ b/libraries/render-utils/src/DeferredLightingEffect.cpp @@ -134,7 +134,7 @@ void DeferredLightingEffect::addPointLight(const glm::vec3& position, float radi void DeferredLightingEffect::addSpotLight(const glm::vec3& position, float radius, const glm::vec3& color, float intensity, const glm::quat& orientation, float exponent, float cutoff) { - int lightID = _pointLights.size() + _spotLights.size() + _globalLights.size(); + unsigned int lightID = _pointLights.size() + _spotLights.size() + _globalLights.size(); if (lightID >= _allocatedLights.size()) { _allocatedLights.push_back(model::LightPointer(new model::Light())); } From 43c3c621a8e9db8359a4a3c522de5275b53f3243 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Sat, 28 Mar 2015 17:14:39 -0700 Subject: [PATCH 09/14] I can't set VHACD_ROOT_DIR and run cmake with this line. --- tools/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 5c7c306a62..ba2938aaa6 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -8,5 +8,5 @@ set_target_properties(scribe PROPERTIES FOLDER "Tools") find_package(VHACD) if(VHACD_FOUND) add_subdirectory(vhacd) -set_target_properties(vhacd PROPERTIES FOLDER "Tools") +# set_target_properties(vhacd PROPERTIES FOLDER "Tools") endif() From 2dd33e5334d771c0d8cbdf361a41d086c87e3ae4 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Sun, 29 Mar 2015 05:40:16 -0700 Subject: [PATCH 10/14] don't include build-ext in tags --- tools/refresh-tags.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/refresh-tags.sh b/tools/refresh-tags.sh index d3157fa179..e8040dac81 100755 --- a/tools/refresh-tags.sh +++ b/tools/refresh-tags.sh @@ -2,13 +2,13 @@ rm -f TAGS -find . -name *.h -print | while read I +find . -name *.h -print | grep -v build-ext |while read I do etags --append "$I" done -find . -name *.cpp -print | grep -v 'moc_' | while read I +find . -name *.cpp -print | grep -v 'moc_' | grep -v build-ext | while read I do etags --append "$I" done From 26230cf493f35cfe53b39942eee8f23b0a17f003 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Sun, 29 Mar 2015 05:40:39 -0700 Subject: [PATCH 11/14] uninitialized variable (quiet valgrind) --- libraries/shared/src/SimpleMovingAverage.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/shared/src/SimpleMovingAverage.cpp b/libraries/shared/src/SimpleMovingAverage.cpp index 64198d2a06..90a9509c91 100644 --- a/libraries/shared/src/SimpleMovingAverage.cpp +++ b/libraries/shared/src/SimpleMovingAverage.cpp @@ -14,6 +14,7 @@ SimpleMovingAverage::SimpleMovingAverage(int numSamplesToAverage) : _numSamples(0), + _lastEventTimestamp(0), _average(0.0f), _eventDeltaAverage(0.0f), WEIGHTING(1.0f / numSamplesToAverage), From 4bf86bb824a800ad31f9be54b3a8b3322b1b535a Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Sun, 29 Mar 2015 17:59:57 -0700 Subject: [PATCH 12/14] another [] needed after delete --- libraries/audio/src/AudioBuffer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/audio/src/AudioBuffer.h b/libraries/audio/src/AudioBuffer.h index 621b7b1b8c..d2f7c50c91 100644 --- a/libraries/audio/src/AudioBuffer.h +++ b/libraries/audio/src/AudioBuffer.h @@ -88,7 +88,7 @@ template< typename T > void AudioFrameBuffer< T >::deallocateFrames() { if (_frameBuffer) { for (uint32_t i = 0; i < _channelCountMax; ++i) { - delete _frameBuffer[i]; + delete[] _frameBuffer[i]; } delete[] _frameBuffer; } From 7de15cda87b779606c71cc4c7fe4d5b7a22e8a04 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Mon, 30 Mar 2015 09:30:13 -0700 Subject: [PATCH 13/14] quiet compiler --- interface/src/Application.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 99777d22bf..e9ea5bebf8 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3125,7 +3125,7 @@ void Application::renderRearViewMirror(const QRect& region, bool billboard) { int viewport[4]; glGetIntegerv(GL_VIEWPORT, viewport); - bool eyeRelativeCamera = false; + // bool eyeRelativeCamera = false; if (billboard) { _mirrorCamera.setFieldOfView(BILLBOARD_FIELD_OF_VIEW); // degees _mirrorCamera.setPosition(_myAvatar->getPosition() + From 7137b4137554605cd27d26faca9e6da8ba4f210b Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Mon, 30 Mar 2015 09:30:37 -0700 Subject: [PATCH 14/14] free these so it's easier to see other leaks in valgrind --- libraries/physics/src/PhysicsEngine.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libraries/physics/src/PhysicsEngine.cpp b/libraries/physics/src/PhysicsEngine.cpp index 9ca718e19a..f7dc90e72f 100644 --- a/libraries/physics/src/PhysicsEngine.cpp +++ b/libraries/physics/src/PhysicsEngine.cpp @@ -29,6 +29,12 @@ PhysicsEngine::PhysicsEngine(const glm::vec3& offset) PhysicsEngine::~PhysicsEngine() { // TODO: delete engine components... if we ever plan to create more than one instance + delete _collisionConfig; + delete _collisionDispatcher; + delete _broadphaseFilter; + delete _constraintSolver; + delete _dynamicsWorld; + // delete _ghostPairCallback; } // begin EntitySimulation overrides