mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-16 08:42:23 +00:00
Code Issues Projects Releases Wiki Activity

Remove unused defaultViewer / defaultViewPoint

Browse Source
This commit is contained in:
bzzt 2019-02-20 13:37:00 +00:00 committed by Andrei Kortunov
parent e908790584
commit 391f6faffb
7 changed files with 0 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/openmw/mwrender/renderingmanager.cpp
View File

@ -312,7 +312,6 @@ namespace MWRender
else else
mTerrain.reset(new Terrain::TerrainGrid(sceneRoot, mRootNode, mResourceSystem, mTerrainStorage, Mask_Terrain, Mask_PreCompile, Mask_Debug)); mTerrain.reset(new Terrain::TerrainGrid(sceneRoot, mRootNode, mResourceSystem, mTerrainStorage, Mask_Terrain, Mask_PreCompile, Mask_Debug));
mTerrain->setDefaultViewer(mViewer->getCamera());
mTerrain->setTargetFrameRate(Settings::Manager::getFloat("target framerate", "Cells")); mTerrain->setTargetFrameRate(Settings::Manager::getFloat("target framerate", "Cells"));
mTerrain->setWorkQueue(mWorkQueue.get()); mTerrain->setWorkQueue(mWorkQueue.get());

2
components/terrain/quadtreenode.cpp
View File

@ -154,8 +154,6 @@ ViewData* QuadTreeNode::getView(osg::NodeVisitor &nv, bool& needsUpdate)
else // INTERSECTION_VISITOR else // INTERSECTION_VISITOR
{ {
osg::Vec3f viewPoint = nv.getViewPoint(); osg::Vec3f viewPoint = nv.getViewPoint();
mViewDataMap->getDefaultViewPoint(viewPoint);
static osg::ref_ptr<osg::Object> dummyObj = new osg::DummyObject; static osg::ref_ptr<osg::Object> dummyObj = new osg::DummyObject;
vd = mViewDataMap->getViewData(dummyObj.get(), viewPoint, needsUpdate); vd = mViewDataMap->getViewData(dummyObj.get(), viewPoint, needsUpdate);
needsUpdate = true; needsUpdate = true;

5
components/terrain/quadtreeworld.cpp
View File

@ -528,11 +528,6 @@ void QuadTreeWorld::reportStats(unsigned int frameNumber, osg::Stats *stats)
stats->setAttribute(frameNumber, "Composite", mCompositeMapRenderer->getCompileSetSize()); stats->setAttribute(frameNumber, "Composite", mCompositeMapRenderer->getCompileSetSize());
} }
void QuadTreeWorld::setDefaultViewer(osg::Object *obj)
{
mViewDataMap->setDefaultViewer(obj);
}
void QuadTreeWorld::loadCell(int x, int y) void QuadTreeWorld::loadCell(int x, int y)
{ {
// fallback behavior only for undefined cells (every other is already handled in quadtree) // fallback behavior only for undefined cells (every other is already handled in quadtree)

2
components/terrain/quadtreeworld.hpp
View File

@ -42,8 +42,6 @@ namespace Terrain
void reportStats(unsigned int frameNumber, osg::Stats* stats); void reportStats(unsigned int frameNumber, osg::Stats* stats);
virtual void setDefaultViewer(osg::Object* obj);
private: private:
void ensureQuadTreeBuilt(); void ensureQuadTreeBuilt();

18
components/terrain/viewdata.cpp
View File

@ -195,22 +195,4 @@ void ViewDataMap::clear()
mViewVector.clear(); mViewVector.clear();
} }
void ViewDataMap::setDefaultViewer(osg::Object *viewer)
{
mDefaultViewer = viewer;
}
bool ViewDataMap::getDefaultViewPoint(osg::Vec3f& viewPoint)
{
Map::const_iterator found = mViews.find(mDefaultViewer);
if (found != mViews.end() && found->second->hasViewPoint())
{
viewPoint = found->second->getViewPoint();
return true;
}
else
return false;
}
} }

6
components/terrain/viewdata.hpp
View File

@ -85,10 +85,6 @@ namespace Terrain
void clear(); void clear();
void setDefaultViewer(osg::Object* viewer);
bool getDefaultViewPoint(osg::Vec3f& viewPoint);
private: private:
std::list<ViewData> mViewVector; std::list<ViewData> mViewVector;
@ -99,8 +95,6 @@ namespace Terrain
float mExpiryDelay; // time in seconds for unused view to be removed float mExpiryDelay; // time in seconds for unused view to be removed
std::deque<ViewData*> mUnusedViews; std::deque<ViewData*> mUnusedViews;
osg::ref_ptr<osg::Object> mDefaultViewer;
}; };
} }

3
components/terrain/world.hpp
View File

@ -112,9 +112,6 @@ namespace Terrain
virtual void reportStats(unsigned int frameNumber, osg::Stats* stats) {} virtual void reportStats(unsigned int frameNumber, osg::Stats* stats) {}
/// Set the default viewer (usually a Camera), used as viewpoint for any viewers that don't use their own viewpoint.
virtual void setDefaultViewer(osg::Object* obj) {}
virtual void setViewDistance(float distance) {} virtual void setViewDistance(float distance) {}
Storage* getStorage() { return mStorage; } Storage* getStorage() { return mStorage; }