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

Updated OSG to use OpenThreads. Moved any references to OpenThread to

Browse Source 
OpenThreads and removed any dependency on Producer threads, Mutexes, etc.
This commit is contained in:
Don BURNS
2003-07-19 00:18:07 +00:00
parent 23fc1900ce
commit 56a13abc05
8 changed files with 29 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/osgProducer/DatabasePager
View File

@@ -19,8 +19,8 @@
#include <osg/PagedLOD>
#include <osg/Drawable>
#include <Producer/Thread>
#include <Producer/Mutex>
#include <OpenThreads/Thread>
#include <OpenThreads/Mutex>
#include <osgProducer/Export>
@@ -31,7 +31,7 @@ namespace osgProducer {
/** Database paging class which manages the loading of files in a background thread,
* and syncronizing of loaded models with the main scene graph.*/
class OSGPRODUCER_EXPORT DatabasePager : public osg::NodeVisitor::DatabaseRequestHandler, public Producer::Thread
class OSGPRODUCER_EXPORT DatabasePager : public osg::NodeVisitor::DatabaseRequestHandler, public OpenThreads::Thread
{
public :
@@ -118,17 +118,17 @@ class OSGPRODUCER_EXPORT DatabasePager : public osg::NodeVisitor::DatabaseReques
typedef std::vector< osg::ref_ptr<DatabaseRequest> > DatabaseRequestList;
DatabaseRequestList _fileRequestList;
Producer::Mutex _fileRequestListMutex;
OpenThreads::Mutex _fileRequestListMutex;
DatabaseRequestList _dataToCompileList;
Producer::Mutex _dataToCompileListMutex;
OpenThreads::Mutex _dataToCompileListMutex;
bool _deleteRemovedSubgraphsInDatabaseThread;
osg::NodeList _childrenToDeleteList;
Producer::Mutex _childrenToDeleteListMutex;
OpenThreads::Mutex _childrenToDeleteListMutex;
DatabaseRequestList _dataToMergeList;
Producer::Mutex _dataToMergeListMutex;
OpenThreads::Mutex _dataToMergeListMutex;
PagedLODList _pagedLODList;

4
include/osgProducer/KeyboardMouseCallback
View File

@@ -14,10 +14,10 @@
#ifndef OSGPRODUCER_EVENTCALLBACK
#define OSGPRODUCER_EVENTCALLBACK 1
#include <OpenThreads/Mutex>
#include <Producer/RenderSurface> // For definition of KeySymbol
#include <Producer/KeyboardMouse>
#include <Producer/Mutex>
#include <osgProducer/EventAdapter>
@@ -90,7 +90,7 @@ class OSGPRODUCER_EXPORT KeyboardMouseCallback : public Producer::KeyboardMouseC
osg::Timer_t _startTick;
osg::Timer _timer;
Producer::Mutex _eventQueueMutex;
OpenThreads::Mutex _eventQueueMutex;
EventQueue _eventQueue;
};