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

Moved t->testCancel() to end of loop.

Browse Source 
Changed a sleep() to a Yield.

Removed debugging messages.
This commit is contained in:
Robert Osfield
2003-07-23 21:18:04 +00:00
parent c55d8c7a5a
commit 70db0608a9
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/osgPlugins/txp/trPagePageManager.cpp
View File

@@ -199,11 +199,16 @@ bool OSGPageManager::ThreadLoop(PagingThread* t)
if (threadMode != ThreadFree)
throw 1;
//std::cout<<"OSGPageManager::ThreadLoop()"<<std::endl;
std::vector<osg::Group *> unhook;
std::vector <osg::Group *> nextDelete;
bool pagingActive = false;
while (!t->testCancel()) {
//bool pagingActive = false;
do
{
/* Here's how we do it:
Wait for position change
Update manager w/ position
@@ -227,6 +232,9 @@ bool OSGPageManager::ThreadLoop(PagingThread* t)
trpg2dPoint loc;
loc.x = myLocX;
loc.y = myLocY;
//std::cout<<"location "<<myLocX<<" "<<myLocY<<std::endl;
if (pageManage->SetLocation(loc) ) {
// If there were changes, process them
// Form the delete list first
@@ -272,8 +280,8 @@ bool OSGPageManager::ThreadLoop(PagingThread* t)
{
tile->GetTileLoc(x,y,lod);
osg::notify(WARN) << "Tile to load :" << x << ' ' << y << ' ' << lod << std::endl;
osg::notify(WARN) << "Position :" << loc.x << ' ' << loc.y << std::endl;
//osg::notify(WARN) << "Tile to load :" << x << ' ' << y << ' ' << lod << std::endl;
//osg::notify(WARN) << "Position :" << loc.x << ' ' << loc.y << std::endl;
LoadOneTile(tile);
// Now add this tile to the merge list
pageManage->AckLoad();
@@ -282,8 +290,12 @@ bool OSGPageManager::ThreadLoop(PagingThread* t)
}
else
sleep(10);
}
{
//sleep(10);
OpenThreads::Thread::Yield();
}
} while (!t->testCancel());
return true;
}