teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Remove debug output

Browse source
This commit is contained in:
scrawl 2016-02-09 21:06:02 +01:00
parent 0865cea211
commit 9f729667fb
4 changed files with 0 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/openmw/mwworld/cellpreloader.cpp
View file

@ -54,7 +54,6 @@ namespace MWWorld
, mKeyframeManager(keyframeManager) , mKeyframeManager(keyframeManager)
, mTerrain(terrain) , mTerrain(terrain)
{ {
osg::Timer timer;
ListModelsVisitor visitor (mMeshes); ListModelsVisitor visitor (mMeshes);
if (cell->getState() == MWWorld::CellStore::State_Loaded) if (cell->getState() == MWWorld::CellStore::State_Loaded)
{ {
@ -73,15 +72,11 @@ namespace MWWorld
mMeshes.push_back(model); mMeshes.push_back(model);
} }
} }
std::cout << "listed models in " << timer.time_m() << std::endl;
} }
/// Preload work to be called from the worker thread. /// Preload work to be called from the worker thread.
virtual void doWork() 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) for (MeshList::const_iterator it = mMeshes.begin(); it != mMeshes.end(); ++it)
{ {
try try
@ -89,8 +84,6 @@ namespace MWWorld
std::string mesh = *it; std::string mesh = *it;
mesh = Misc::ResourceHelpers::correctActorModelPath(mesh, mSceneManager->getVFS()); mesh = Misc::ResourceHelpers::correctActorModelPath(mesh, mSceneManager->getVFS());
//std::cout << "preloading " << mesh << std::endl;
mPreloadedObjects.push_back(mSceneManager->cacheInstance(mesh)); mPreloadedObjects.push_back(mSceneManager->cacheInstance(mesh));
mPreloadedObjects.push_back(mBulletShapeManager->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: private:
@ -159,11 +150,9 @@ namespace MWWorld
virtual void doWork() virtual void doWork()
{ {
osg::Timer timer;
mResourceSystem->updateCache(mReferenceTime); mResourceSystem->updateCache(mReferenceTime);
mTerrain->updateCache(); mTerrain->updateCache();
std::cout << "cleared cache in " << timer.time_m() << std::endl;
} }
private: private:

7
apps/openmw/mwworld/scene.cpp
View file

@ -2,7 +2,6 @@
#include <limits> #include <limits>
#include <iostream> #include <iostream>
#include <osg/Timer>
#include <components/loadinglistener/loadinglistener.hpp> #include <components/loadinglistener/loadinglistener.hpp>
#include <components/misc/resourcehelpers.hpp> #include <components/misc/resourcehelpers.hpp>
@ -332,7 +331,6 @@ namespace MWWorld
void Scene::changeCellGrid (int X, int Y) void Scene::changeCellGrid (int X, int Y)
{ {
osg::Timer timer;
Loading::Listener* loadingListener = MWBase::Environment::get().getWindowManager()->getLoadingScreen(); Loading::Listener* loadingListener = MWBase::Environment::get().getWindowManager()->getLoadingScreen();
Loading::ScopedLoad load(loadingListener); Loading::ScopedLoad load(loadingListener);
@ -416,8 +414,6 @@ namespace MWWorld
mCellChanged = true; mCellChanged = true;
mPreloader->updateCache(mRendering.getReferenceTime()); mPreloader->updateCache(mRendering.getReferenceTime());
std::cout << "changeCellGrid took " << timer.time_m() << std::endl;
} }
void Scene::changePlayerCell(CellStore *cell, const ESM::Position &pos, bool adjustPlayerPos) 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) void Scene::changeToInteriorCell (const std::string& cellName, const ESM::Position& position)
{ {
osg::Timer timer;
CellStore *cell = MWBase::Environment::get().getWorld()->getInterior(cellName); CellStore *cell = MWBase::Environment::get().getWorld()->getInterior(cellName);
bool loadcell = (mCurrentCell == NULL); bool loadcell = (mCurrentCell == NULL);
if(!loadcell) if(!loadcell)
@ -548,8 +543,6 @@ namespace MWWorld
MWBase::Environment::get().getWindowManager()->changeCell(mCurrentCell); MWBase::Environment::get().getWindowManager()->changeCell(mCurrentCell);
mPreloader->updateCache(mRendering.getReferenceTime()); mPreloader->updateCache(mRendering.getReferenceTime());
std::cout << "change to interior took " << timer.time_m() << std::endl;
} }
void Scene::changeToExteriorCell (const ESM::Position& position, bool adjustPlayerPos) void Scene::changeToExteriorCell (const ESM::Position& position, bool adjustPlayerPos)

1
components/nifosg/controller.hpp
View file

@ -17,7 +17,6 @@
#include <osg/Texture2D> #include <osg/Texture2D>
#include <osg/ref_ptr> #include <osg/ref_ptr>
#include <osg/Timer>
#include <osg/StateSet> #include <osg/StateSet>
#include <osg/NodeCallback> #include <osg/NodeCallback>
#include <osg/Drawable> #include <osg/Drawable>

2
components/resource/scenemanager.cpp
View file

@ -366,8 +366,6 @@ namespace Resource
if (mIncrementalCompileOperation) if (mIncrementalCompileOperation)
mIncrementalCompileOperation->add(loaded); mIncrementalCompileOperation->add(loaded);
//std::cout << "loading " << normalized << std::endl;
mCache->addEntryToObjectCache(normalized, loaded); mCache->addEntryToObjectCache(normalized, loaded);
return loaded; return loaded;
} }