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

Tweak API and updated wrappers to get wrappers to build

Browse Source
This commit is contained in:
Robert Osfield
2007-02-05 14:56:41 +00:00
parent ebd68ba063
commit cfe737c552
6 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/osg/GraphicsThread.cpp
View File

@@ -213,8 +213,6 @@ void OperationsThread::removeAllOperations()
void OperationsThread::run()
{
bool contextRealizedInThisThread = false;
// make the graphics context current.
GraphicsContext* graphicsContext = dynamic_cast<GraphicsContext*>(_parent.get());
if (graphicsContext)

8
src/osgViewer/Viewer.cpp
View File

@@ -728,7 +728,7 @@ void Viewer::stopThreading()
{
osg::GraphicsContext* gc = (*citr);
OpenThreads::ScopedLock<OpenThreads::Mutex> lock( gc->getOperationsMutex() );
OpenThreads::ScopedLock<OpenThreads::Mutex> lock( *(gc->getOperationsMutex()) );
osg::GraphicsContext::OperationQueue& operations = gc->getOperationsQueue();
for(osg::GraphicsContext::OperationQueue::iterator oitr = operations.begin();
oitr != operations.end();
@@ -758,7 +758,7 @@ void Viewer::stopThreading()
{
osg::GraphicsContext* gc = (*citr);
OpenThreads::ScopedLock<OpenThreads::Mutex> lock( gc->getOperationsMutex() );
OpenThreads::ScopedLock<OpenThreads::Mutex> lock( *(gc->getOperationsMutex()) );
osg::GraphicsContext::OperationQueue& operations = gc->getOperationsQueue();
for(osg::GraphicsContext::OperationQueue::iterator oitr = operations.begin();
oitr != operations.end();
@@ -915,7 +915,7 @@ void Viewer::startThreading()
{
osg::GraphicsContext* gc = (*citr);
OpenThreads::ScopedLock<OpenThreads::Mutex> lock( gc->getOperationsMutex() );
OpenThreads::ScopedLock<OpenThreads::Mutex> lock( *(gc->getOperationsMutex()) );
osg::GraphicsContext::OperationQueue& operations = gc->getOperationsQueue();
for(osg::GraphicsContext::OperationQueue::iterator oitr = operations.begin();
oitr != operations.end();
@@ -1731,7 +1731,7 @@ void Viewer::renderingTraversals()
{
osg::GraphicsContext* gc = (*itr);
OpenThreads::ScopedLock<OpenThreads::Mutex> lock( gc->getOperationsMutex() );
OpenThreads::ScopedLock<OpenThreads::Mutex> lock( *(gc->getOperationsMutex()) );
osg::GraphicsContext::OperationQueue& operations = gc->getOperationsQueue();
for(osg::GraphicsContext::OperationQueue::iterator oitr = operations.begin();
oitr != operations.end();

10
src/osgWrappers/osg/GraphicsContext.cpp
View File

@@ -29,7 +29,7 @@ TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osg::Operation > >, osg::GraphicsContex
TYPE_NAME_ALIAS(std::list< osg::Camera * >, osg::GraphicsContext::Cameras);
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::GraphicsContext)
BEGIN_OBJECT_REFLECTOR(osg::GraphicsContext)
I_BaseType(osg::Object);
I_Method1(void, add, IN, osg::Operation *, operation,
__void__add__Operation_P1,
@@ -55,8 +55,8 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::GraphicsContext)
__OperationQueue_R1__getOperationsQueue,
"Get the operations queue, not you must use the OperationsMutex when accessing the queue. ",
"");
I_Method0(OpenThreads::Mutex &, getOperationsMutex,
__OpenThreads_Mutex_R1__getOperationsMutex,
I_Method0(OpenThreads::Mutex *, getOperationsMutex,
__OpenThreads_Mutex_P1__getOperationsMutex,
"Get the operations queue mutex. ",
"");
I_Method0(osg::Block *, getOperationsBlock,
@@ -261,8 +261,8 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::GraphicsContext)
I_SimpleProperty(osg::Block *, OperationsBlock,
__osg_Block_P1__getOperationsBlock,
0);
I_SimpleProperty(OpenThreads::Mutex &, OperationsMutex,
__OpenThreads_Mutex_R1__getOperationsMutex,
I_SimpleProperty(OpenThreads::Mutex *, OperationsMutex,
__OpenThreads_Mutex_P1__getOperationsMutex,
0);
I_SimpleProperty(osg::GraphicsContext::OperationQueue &, OperationsQueue,
__OperationQueue_R1__getOperationsQueue,