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

Build fix.

Browse Source
This commit is contained in:
Robert Osfield 2004-01-20 10:02:45 +00:00
parent 8dd9d163fc
commit 2f194ad5a0
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgPlugins/txp/TXPPagedLOD.cpp
View File

@ -28,6 +28,10 @@ TXPPagedLOD::~TXPPagedLOD()
void TXPPagedLOD::traverse(osg::NodeVisitor& nv) void TXPPagedLOD::traverse(osg::NodeVisitor& nv)
{ {
// PagedLOD::traverse(nv);
//
// return;
double timeStamp = nv.getFrameStamp()?nv.getFrameStamp()->getReferenceTime():0.0; double timeStamp = nv.getFrameStamp()?nv.getFrameStamp()->getReferenceTime():0.0;
bool updateTimeStamp = nv.getVisitorType()==osg::NodeVisitor::CULL_VISITOR; bool updateTimeStamp = nv.getVisitorType()==osg::NodeVisitor::CULL_VISITOR;

26
src/osgPlugins/txp/TileMapper.cpp
View File

@ -13,7 +13,7 @@ osg::PagedLOD* TileMapper::getPagedLOD(int x, int y, int lod)
{ {
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex); OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
TileMap::iterator itr = _tileMap.find(TileTriple(x,y,lod)); TileMap::iterator itr = _tileMap.find(TileTriple(x,y,lod));
if (itr!=_tileMap.end()) return itr->second.get(); if (itr!=_tileMap.end()) return itr->second;
else return 0; else return 0;
} }
@ -32,17 +32,17 @@ void TileMapper::removePagedLOD(int x, int y, int lod)
void TileMapper::prunePagedLOD() void TileMapper::prunePagedLOD()
{ {
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex); // OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
for(TileMap::iterator itr = _tileMap.begin(); // for(TileMap::iterator itr = _tileMap.begin();
itr!=_tileMap.end(); // itr!=_tileMap.end();
++itr) // ++itr)
{ // {
if (itr->second.valid() && itr->second->referenceCount()==1) // if (itr->second.valid() && itr->second->referenceCount()==1)
{ // {
TileMap::iterator eitr = itr; // TileMap::iterator eitr = itr;
--itr; // --itr;
_tileMap.erase(eitr); // _tileMap.erase(eitr);
} // }
} // }
//std::cout<<"_tileMap.size()="<<_tileMap.size()<<std::endl; //std::cout<<"_tileMap.size()="<<_tileMap.size()<<std::endl;
} }