From 9f729667fb064ab5d7380a103da5180a940279a6 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 9 Feb 2016 21:06:02 +0100
Subject: [PATCH] Remove debug output

---
 apps/openmw/mwworld/cellpreloader.cpp | 11 -----------
 apps/openmw/mwworld/scene.cpp         |  7 -------
 components/nifosg/controller.hpp      |  1 -
 components/resource/scenemanager.cpp  |  2 --
 4 files changed, 21 deletions(-)

diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index e72c36c68..ce9a87beb 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -54,7 +54,6 @@ namespace MWWorld
             , mKeyframeManager(keyframeManager)
             , mTerrain(terrain)
         {
-            osg::Timer timer;
             ListModelsVisitor visitor (mMeshes);
             if (cell->getState() == MWWorld::CellStore::State_Loaded)
             {
@@ -73,15 +72,11 @@ namespace MWWorld
                         mMeshes.push_back(model);
                 }
             }
-            std::cout << "listed models in " << timer.time_m() << std::endl;
         }
 
         /// Preload work to be called from the worker thread.
         virtual void doWork()
         {
-            // TODO: make CellStore::loadRefs thread safe so we can call it from here
-
-            osg::Timer preloadTimer;
             for (MeshList::const_iterator it = mMeshes.begin(); it != mMeshes.end(); ++it)
             {
                 try
@@ -89,8 +84,6 @@ namespace MWWorld
                     std::string mesh  = *it;
                     mesh = Misc::ResourceHelpers::correctActorModelPath(mesh, mSceneManager->getVFS());
 
-                    //std::cout << "preloading " << mesh << std::endl;
-
                     mPreloadedObjects.push_back(mSceneManager->cacheInstance(mesh));
                     mPreloadedObjects.push_back(mBulletShapeManager->cacheInstance(mesh));
 
@@ -127,8 +120,6 @@ namespace MWWorld
                 {
                 }
             }
-
-            std::cout << "preloaded " << mPreloadedObjects.size() << " objects in " << preloadTimer.time_m() << std::endl;
         }
 
     private:
@@ -159,11 +150,9 @@ namespace MWWorld
 
         virtual void doWork()
         {
-            osg::Timer timer;
             mResourceSystem->updateCache(mReferenceTime);
 
             mTerrain->updateCache();
-            std::cout << "cleared cache in " << timer.time_m() << std::endl;
         }
 
     private:
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 0be26c7b6..308809bd2 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -2,7 +2,6 @@
 
 #include <limits>
 #include <iostream>
-#include <osg/Timer>
 
 #include <components/loadinglistener/loadinglistener.hpp>
 #include <components/misc/resourcehelpers.hpp>
@@ -332,7 +331,6 @@ namespace MWWorld
 
     void Scene::changeCellGrid (int X, int Y)
     {
-        osg::Timer timer;
         Loading::Listener* loadingListener = MWBase::Environment::get().getWindowManager()->getLoadingScreen();
         Loading::ScopedLoad load(loadingListener);
 
@@ -416,8 +414,6 @@ namespace MWWorld
         mCellChanged = true;
 
         mPreloader->updateCache(mRendering.getReferenceTime());
-
-        std::cout << "changeCellGrid took " << timer.time_m() << std::endl;
     }
 
     void Scene::changePlayerCell(CellStore *cell, const ESM::Position &pos, bool adjustPlayerPos)
@@ -488,7 +484,6 @@ namespace MWWorld
 
     void Scene::changeToInteriorCell (const std::string& cellName, const ESM::Position& position)
     {
-        osg::Timer timer;
         CellStore *cell = MWBase::Environment::get().getWorld()->getInterior(cellName);
         bool loadcell = (mCurrentCell == NULL);
         if(!loadcell)
@@ -548,8 +543,6 @@ namespace MWWorld
         MWBase::Environment::get().getWindowManager()->changeCell(mCurrentCell);
 
         mPreloader->updateCache(mRendering.getReferenceTime());
-
-        std::cout << "change to interior took " << timer.time_m() << std::endl;
     }
 
     void Scene::changeToExteriorCell (const ESM::Position& position, bool adjustPlayerPos)
diff --git a/components/nifosg/controller.hpp b/components/nifosg/controller.hpp
index 0b633a122..ce268f587 100644
--- a/components/nifosg/controller.hpp
+++ b/components/nifosg/controller.hpp
@@ -17,7 +17,6 @@
 #include <osg/Texture2D>
 #include <osg/ref_ptr>
 
-#include <osg/Timer>
 #include <osg/StateSet>
 #include <osg/NodeCallback>
 #include <osg/Drawable>
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 5acd5f8fb..29f7076f0 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -366,8 +366,6 @@ namespace Resource
             if (mIncrementalCompileOperation)
                 mIncrementalCompileOperation->add(loaded);
 
-            //std::cout << "loading " << normalized  << std::endl;
-
             mCache->addEntryToObjectCache(normalized, loaded);
             return loaded;
         }