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

Tweaked API to get wrappers to build

Browse Source
This commit is contained in:
Robert Osfield
2009-03-09 16:53:57 +00:00
parent f4b7a5b274
commit 99477fa422
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/osgUtil/GLObjectsVisitor
View File

@@ -14,6 +14,7 @@
#ifndef OSGUTIL_GLOBJECTSVISITOR
#define OSGUTIL_GLOBJECTSVISITOR 1
#include <OpenThreads/Mutex>
#include <osg/NodeVisitor>
#include <osg/Geode>
#include <osg/State>
@@ -223,10 +224,10 @@ class OSGUTIL_EXPORT IncrementalCompileOperation : public osg::GraphicsOperation
void add(CompileSet* compileSet, bool callBuildCompileMap=true);
OpenThreads::Mutex& getToCompiledMutex() { return _toCompileMutex; }
OpenThreads::Mutex* getToCompiledMutex() { return &_toCompileMutex; }
CompileSets& getToCompile() { return _compiled; }
OpenThreads::Mutex& getCompiledMutex() { return _compiledMutex; }
OpenThreads::Mutex* getCompiledMutex() { return &_compiledMutex; }
CompileSets& getCompiled() { return _compiled; }
protected:

16
src/osgWrappers/osgUtil/GLObjectsVisitor.cpp
View File

@@ -198,9 +198,9 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::IncrementalCompileOperation)
__void__add__CompileSet_P1__bool,
"Add a CompileSet to be compiled. ",
"");
I_Method0(OpenThreads::Mutex &, getToCompiledMutex,
I_Method0(OpenThreads::Mutex *, getToCompiledMutex,
Properties::NON_VIRTUAL,
__OpenThreads_Mutex_R1__getToCompiledMutex,
__OpenThreads_Mutex_P1__getToCompiledMutex,
"",
"");
I_Method0(osgUtil::IncrementalCompileOperation::CompileSets &, getToCompile,
@@ -208,9 +208,9 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::IncrementalCompileOperation)
__CompileSets_R1__getToCompile,
"",
"");
I_Method0(OpenThreads::Mutex &, getCompiledMutex,
I_Method0(OpenThreads::Mutex *, getCompiledMutex,
Properties::NON_VIRTUAL,
__OpenThreads_Mutex_R1__getCompiledMutex,
__OpenThreads_Mutex_P1__getCompiledMutex,
"",
"");
I_Method0(osgUtil::IncrementalCompileOperation::CompileSets &, getCompiled,
@@ -221,14 +221,14 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::IncrementalCompileOperation)
I_SimpleProperty(osgUtil::IncrementalCompileOperation::CompileSets &, Compiled,
__CompileSets_R1__getCompiled,
0);
I_SimpleProperty(OpenThreads::Mutex &, CompiledMutex,
__OpenThreads_Mutex_R1__getCompiledMutex,
I_SimpleProperty(OpenThreads::Mutex *, CompiledMutex,
__OpenThreads_Mutex_P1__getCompiledMutex,
0);
I_SimpleProperty(osgUtil::IncrementalCompileOperation::CompileSets &, ToCompile,
__CompileSets_R1__getToCompile,
0);
I_SimpleProperty(OpenThreads::Mutex &, ToCompiledMutex,
__OpenThreads_Mutex_R1__getToCompiledMutex,
I_SimpleProperty(OpenThreads::Mutex *, ToCompiledMutex,
__OpenThreads_Mutex_P1__getToCompiledMutex,
0);
END_REFLECTOR