From 383064999051202ff6e61258278bc08ec7e8bfd8 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Fri, 16 Dec 2016 08:46:11 -0800 Subject: [PATCH] remove debugging and profiling --- interface/src/avatar/Avatar.cpp | 3 --- libraries/animation/src/Rig.cpp | 7 ++----- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp index 908b3def8d..a79d2372c5 100644 --- a/interface/src/avatar/Avatar.cpp +++ b/interface/src/avatar/Avatar.cpp @@ -645,8 +645,6 @@ glm::quat Avatar::computeRotationFromBodyToWorldUp(float proportion) const { } void Avatar::fixupModelsInScene() { -#define ADEBUG -#ifdef ADEBUG _attachmentsToDelete.clear(); // check to see if when we added our models to the scene they were ready, if they were not ready, then @@ -670,7 +668,6 @@ void Avatar::fixupModelsInScene() { _attachmentsToDelete.insert(_attachmentsToDelete.end(), _attachmentsToRemove.begin(), _attachmentsToRemove.end()); _attachmentsToRemove.clear(); scene->enqueuePendingChanges(pendingChanges); -#endif // ADEBUG } bool Avatar::shouldRenderHead(const RenderArgs* renderArgs) const { diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp index c6aae824e4..b6bb8ccc8f 100644 --- a/libraries/animation/src/Rig.cpp +++ b/libraries/animation/src/Rig.cpp @@ -929,11 +929,8 @@ void Rig::updateAnimations(float deltaTime, glm::mat4 rootTransform) { buildAbsoluteRigPoses(_internalPoseSet._relativePoses, _internalPoseSet._absolutePoses); // copy internal poses to external poses - { - PerformanceTimer perfTimer("copy"); - QWriteLocker writeLock(&_externalPoseSetLock); - _externalPoseSet = _internalPoseSet; - } + QWriteLocker writeLock(&_externalPoseSetLock); + _externalPoseSet = _internalPoseSet; } void Rig::inverseKinematics(int endIndex, glm::vec3 targetPosition, const glm::quat& targetRotation, float priority,