From b0cc536f53d8410faa354d027523750dba63dc2f Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Wed, 27 May 2015 16:55:02 -0700
Subject: [PATCH] debug cleanup

---
 libraries/entities-renderer/src/EntityTreeRenderer.cpp | 10 +++-------
 libraries/render/src/render/DrawTask.cpp               |  7 -------
 libraries/render/src/render/Scene.cpp                  |  4 ----
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
index 28a913d6eb..b59ea7e7af 100644
--- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp
+++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
@@ -95,8 +95,9 @@ void EntityTreeRenderer::clear() {
     }
     OctreeRenderer::clear();
     _entityScripts.clear();
-    
-    qDebug() << "EntityTreeRenderer::clear() need to clear the scene... _viewState->getMain3DScene():" << _viewState->getMain3DScene().get();
+
+    // TODO/FIXME - this needs to be fixed... we need to clear all items out of the scene in this case.    
+    qDebug() << "EntityTreeRenderer::clear() need to clear the scene... ";
     
 }
 
@@ -1062,7 +1063,6 @@ void EntityTreeRenderer::deletingEntity(const EntityItemID& entityID) {
     _entityScripts.remove(entityID);
     
     // here's where we remove the entity payload from the scene
-    qDebug() << "deletingEntity() entityID:" << entityID << "_viewState->getMain3DScene():" << _viewState->getMain3DScene().get();
 
     render::Scene::PendingChanges pendingChanges;
     if (_entityToSceneItems.contains(entityID)) {
@@ -1076,7 +1076,6 @@ void EntityTreeRenderer::addingEntity(const EntityItemID& entityID) {
     checkAndCallPreload(entityID);
 
     // here's where we add the entity payload to the scene
-    qDebug() << "addingEntity() entityID:" << entityID << "_viewState->getMain3DScene():" << _viewState->getMain3DScene().get();
 
     render::Scene::PendingChanges pendingChanges;
     render::ItemID renderItem = _viewState->getMain3DScene()->allocateID();
@@ -1086,9 +1085,6 @@ void EntityTreeRenderer::addingEntity(const EntityItemID& entityID) {
     auto renderData = RenderableEntityItem::Pointer(new RenderableEntityItem(entity));
     auto renderPayload = render::PayloadPointer(new RenderableEntityItem::Payload(renderData));
 
-    qDebug() << "    renderItem:" << renderItem;
-    qDebug() << "    renderPayload:" << renderPayload.get();
-
     pendingChanges.resetItem(renderItem, renderPayload);
 
     _viewState->getMain3DScene()->enqueuePendingChanges(pendingChanges);
diff --git a/libraries/render/src/render/DrawTask.cpp b/libraries/render/src/render/DrawTask.cpp
index 3f56363b15..2c30d0e2f8 100755
--- a/libraries/render/src/render/DrawTask.cpp
+++ b/libraries/render/src/render/DrawTask.cpp
@@ -34,9 +34,6 @@ void DrawSceneTask::run(const SceneContextPointer& sceneContext, const RenderCon
     auto& itemBucketMap = scene->getMasterBucket();
     
     RenderArgs* args = renderContext->args;
-
-    PerformanceTimer perfTimer("DrawSceneTask::run");
-
     gpu::Batch theBatch;
 
     args->_batch = &theBatch;
@@ -45,12 +42,8 @@ void DrawSceneTask::run(const SceneContextPointer& sceneContext, const RenderCon
     auto filter = ItemFilter::Builder::opaqueShape();
     auto& opaqueShapeItems = itemBucketMap.at(filter);
 
-    qDebug() << "DrawSceneTask::run()";
-    
     for (auto id : opaqueShapeItems) {
         auto item = scene->getItem(id);
-        qDebug() << "   id:" << id;
-        qDebug() << "   item:" << item;
         item.render(args);
     }
 
diff --git a/libraries/render/src/render/Scene.cpp b/libraries/render/src/render/Scene.cpp
index 8da3119de1..8f9c5906ca 100644
--- a/libraries/render/src/render/Scene.cpp
+++ b/libraries/render/src/render/Scene.cpp
@@ -115,7 +115,6 @@ void consolidateChangeQueue(Scene::PendingChangesQueue& queue, Scene::PendingCha
 }
  
 void Scene::processPendingChangesQueue() {
-    qDebug() << "Scene::processPendingChangesQueue()...";
     _changeQueueMutex.lock();
     PendingChanges consolidatedPendingChanges;
     consolidateChangeQueue(_changeQueue, consolidatedPendingChanges);
@@ -139,12 +138,9 @@ void Scene::processPendingChangesQueue() {
 }
 
 void Scene::resetItems(const ItemIDs& ids, Payloads& payloads) {
-    qDebug() << "Scene::resetItems()...";
     auto resetID = ids.begin();
     auto resetPayload = payloads.begin();
     for (;resetID != ids.end(); resetID++, resetPayload++) {
-        qDebug() << "    resetID:" << *resetID;
-
         auto& item = _items[(*resetID)];
         auto oldKey = item.getKey();
         item.resetPayload(*resetPayload);