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

Convert GraphicsThread/GraphicsOperation to more generic OperationsThread/Operation.

Browse Source 
This paves the way to running cull traversals in seperate threads.

Updated wrappers
This commit is contained in:
Robert Osfield
2007-02-02 22:30:36 +00:00
parent bee545b82d
commit 69da91620f
28 changed files with 439 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/osg/GraphicsContext.cpp
View File

@@ -140,6 +140,15 @@ GraphicsContext::GraphicsContext():
_operationsBlock = new Block;
}
GraphicsContext::GraphicsContext(const GraphicsContext&, const osg::CopyOp&):
_clearColor(osg::Vec4(0.0f,0.0f,0.0f,1.0f)),
_clearMask(0),
_threadOfLastMakeCurrent(0)
{
setThreadSafeRefUnref(true);
_operationsBlock = new Block;
}
GraphicsContext::~GraphicsContext()
{
close(false);
@@ -298,11 +307,11 @@ void GraphicsContext::createGraphicsThread()
{
if (!_graphicsThread)
{
setGraphicsThread(new GraphicsThread);
setGraphicsThread(new OperationsThread);
}
}
void GraphicsContext::setGraphicsThread(GraphicsThread* gt)
void GraphicsContext::setGraphicsThread(OperationsThread* gt)
{
if (_graphicsThread==gt) return;
@@ -310,18 +319,18 @@ void GraphicsContext::setGraphicsThread(GraphicsThread* gt)
{
// need to kill the thread in some way...
_graphicsThread->cancel();
_graphicsThread->_graphicsContext = 0;
_graphicsThread->setParent(0);
}
_graphicsThread = gt;
if (_graphicsThread.valid())
{
_graphicsThread->_graphicsContext = this;
_graphicsThread->setParent(this);
}
}
void GraphicsContext::add(GraphicsOperation* operation)
void GraphicsContext::add(Operation* operation)
{
osg::notify(osg::INFO)<<"Doing add"<<std::endl;
@@ -334,7 +343,7 @@ void GraphicsContext::add(GraphicsOperation* operation)
_operationsBlock->set(true);
}
void GraphicsContext::remove(GraphicsOperation* operation)
void GraphicsContext::remove(Operation* operation)
{
osg::notify(osg::INFO)<<"Doing remove operation"<<std::endl;