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

Remove non required use of WorkQueue

Browse source
This commit is contained in:
scrawl 2017-03-09 04:01:27 +01:00
parent 19d516cbda
commit 1c15686353
3 changed files with 17 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwrender/renderingmanager.cpp
View file

@ -219,7 +219,7 @@ namespace MWRender
Settings::Manager::getBool("auto use terrain specular maps", "Shaders"));
if (distantTerrain)
mTerrain.reset(new Terrain::QuadTreeWorld(mWorkQueue.get(), sceneRoot, mRootNode, mResourceSystem, mTerrainStorage, Mask_Terrain, Mask_PreCompile));
mTerrain.reset(new Terrain::QuadTreeWorld(sceneRoot, mRootNode, mResourceSystem, mTerrainStorage, Mask_Terrain, Mask_PreCompile));
else
mTerrain.reset(new Terrain::TerrainGrid(sceneRoot, mRootNode, mResourceSystem, mTerrainStorage, Mask_Terrain, Mask_PreCompile));

46
components/terrain/quadtreeworld.cpp
View file

@ -2,8 +2,6 @@
#include <osgUtil/CullVisitor>
#include <components/sceneutil/workqueue.hpp>
#include "quadtreenode.hpp"
#include "storage.hpp"
#include "viewdata.hpp"
@ -109,10 +107,10 @@ private:
QuadTreeWorld* mWorld;
};
class BuildQuadTreeItem : public SceneUtil::WorkItem
class QuadTreeBuilder
{
public:
BuildQuadTreeItem(Terrain::Storage* storage, ViewDataMap* viewDataMap, float minSize)
QuadTreeBuilder(Terrain::Storage* storage, ViewDataMap* viewDataMap, float minSize)
: mStorage(storage)
, mMinX(0.f), mMaxX(0.f), mMinY(0.f), mMaxY(0.f)
, mMinSize(minSize)
@ -120,7 +118,7 @@ public:
{
}
virtual void doWork()
void build()
{
mStorage->getBounds(mMinX, mMaxX, mMinY, mMaxY);
@ -226,9 +224,8 @@ private:
osg::ref_ptr<RootNode> mRootNode;
};
QuadTreeWorld::QuadTreeWorld(SceneUtil::WorkQueue* workQueue, osg::Group *parent, osg::Group *compileRoot, Resource::ResourceSystem *resourceSystem, Storage *storage, int nodeMask, int preCompileMask)
QuadTreeWorld::QuadTreeWorld(osg::Group *parent, osg::Group *compileRoot, Resource::ResourceSystem *resourceSystem, Storage *storage, int nodeMask, int preCompileMask)
: World(parent, compileRoot, resourceSystem, storage, nodeMask, preCompileMask)
, mWorkQueue(workQueue)
, mViewDataMap(new ViewDataMap)
, mQuadTreeBuilt(false)
{
@ -236,12 +233,7 @@ QuadTreeWorld::QuadTreeWorld(SceneUtil::WorkQueue* workQueue, osg::Group *parent
QuadTreeWorld::~QuadTreeWorld()
{
if (mWorkItem)
{
mWorkItem->abort();
mWorkItem->waitTillDone();
}
ensureQuadTreeBuilt();
mViewDataMap->clear();
}
@ -339,25 +331,17 @@ void QuadTreeWorld::accept(osg::NodeVisitor &nv)
void QuadTreeWorld::ensureQuadTreeBuilt()
{
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mQuadTreeMutex);
if (mQuadTreeBuilt)
return;
if (!mQuadTreeBuilt && !mWorkItem)
{
const float minSize = 1/4.f;
mWorkItem = new BuildQuadTreeItem(mStorage, mViewDataMap.get(), minSize);
mWorkQueue->addWorkItem(mWorkItem);
}
}
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mQuadTreeMutex);
if (mQuadTreeBuilt)
return;
mWorkItem->waitTillDone();
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mQuadTreeMutex);
mRootNode = mWorkItem->getRootNode();
mRootNode->setWorld(this);
mQuadTreeBuilt = true;
}
const float minSize = 1/4.f;
QuadTreeBuilder builder(mStorage, mViewDataMap.get(), minSize);
builder.build();
mRootNode = builder.getRootNode();
mRootNode->setWorld(this);
mQuadTreeBuilt = true;
}
void QuadTreeWorld::enable(bool enabled)

12
components/terrain/quadtreeworld.hpp
View file

@ -7,11 +7,6 @@
#include <OpenThreads/Mutex>
namespace SceneUtil
{
class WorkQueue;
}
namespace osg
{
class NodeVisitor;
@ -20,14 +15,13 @@ namespace osg
namespace Terrain
{
class RootNode;
class BuildQuadTreeItem;
class ViewDataMap;
/// @brief Terrain implementation that loads cells into a Quad Tree, with geometry LOD and texture LOD. The entire world is displayed at all times.
class QuadTreeWorld : public Terrain::World
{
public:
QuadTreeWorld(SceneUtil::WorkQueue* workQueue, osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem, Storage* storage, int nodeMask, int preCompileMask=~0);
QuadTreeWorld(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem, Storage* storage, int nodeMask, int preCompileMask=~0);
~QuadTreeWorld();
void accept(osg::NodeVisitor& nv);
@ -39,10 +33,6 @@ namespace Terrain
osg::ref_ptr<RootNode> mRootNode;
osg::ref_ptr<SceneUtil::WorkQueue> mWorkQueue;
osg::ref_ptr<BuildQuadTreeItem> mWorkItem;
osg::ref_ptr<ViewDataMap> mViewDataMap;
OpenThreads::Mutex mQuadTreeMutex;