FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Introduced mutex into Terrain node to manage the tile system data structures

Browse Source
This commit is contained in:
Robert Osfield
2008-03-28 15:31:46 +00:00
parent 49accb1635
commit 3f81a994b7
3 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/osgTerrain/Terrain.cpp
View File

@@ -12,6 +12,7 @@
*/
#include <osgTerrain/Terrain>
#include <OpenThreads/ScopedLock>
using namespace osg;
using namespace osgTerrain;
@@ -20,8 +21,16 @@ Terrain::Terrain()
{
}
Terrain::Terrain(const Terrain& ts, const osg::CopyOp& copyop):
osg::Group(ts,copyop)
{
}
Terrain::~Terrain()
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
for(TerrainTileSet::iterator itr = _terrainTileSet.begin();
itr != _terrainTileSet.end();
++itr)
@@ -33,10 +42,6 @@ Terrain::~Terrain()
_terrainTileMap.clear();
}
Terrain::Terrain(const Terrain& ts, const osg::CopyOp& copyop)
{
}
void Terrain::traverse(osg::NodeVisitor& nv)
{
Group::traverse(nv);
@@ -44,6 +49,8 @@ void Terrain::traverse(osg::NodeVisitor& nv)
TerrainTile* Terrain::getTile(const TileID& tileID)
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
TerrainTileMap::iterator itr = _terrainTileMap.find(tileID);
if (itr != _terrainTileMap.end()) return 0;
@@ -52,15 +59,20 @@ TerrainTile* Terrain::getTile(const TileID& tileID)
const TerrainTile* Terrain::getTile(const TileID& tileID) const
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
TerrainTileMap::const_iterator itr = _terrainTileMap.find(tileID);
if (itr != _terrainTileMap.end()) return 0;
return itr->second;
}
static unsigned int s_maxNumTiles = 0;
void Terrain::registerTerrainTile(TerrainTile* tile)
{
if (!tile) return;
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
if (tile->getTileID().valid())
{
@@ -69,13 +81,17 @@ void Terrain::registerTerrainTile(TerrainTile* tile)
_terrainTileSet.insert(tile);
osg::notify(osg::INFO)<<"Terrain::registerTerrainTile "<<tile<<" total number of tile "<<_terrainTileSet.size()<<std::endl;
if (_terrainTileSet.size() > s_maxNumTiles) s_maxNumTiles = _terrainTileSet.size();
// osg::notify(osg::NOTICE)<<"Terrain::registerTerrainTile "<<tile<<" total number of tile "<<_terrainTileSet.size()<<" max = "<<s_maxNumTiles<<std::endl;
}
void Terrain::unregisterTerrainTile(TerrainTile* tile)
{
if (!tile) return;
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
if (tile->getTileID().valid())
{
_terrainTileMap.erase(tile->getTileID());
@@ -83,5 +99,5 @@ void Terrain::unregisterTerrainTile(TerrainTile* tile)
_terrainTileSet.erase(tile);
osg::notify(osg::INFO)<<"Terrain::unregisterTerrainTile "<<tile<<" total number of tile "<<_terrainTileSet.size()<<std::endl;
// osg::notify(osg::NOTICE)<<"Terrain::unregisterTerrainTile "<<tile<<" total number of tile "<<_terrainTileSet.size()<<" max = "<<s_maxNumTiles<<std::endl;
}