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

Updated wrappers

Browse Source
This commit is contained in:
Robert Osfield
2008-10-21 09:50:07 +00:00
parent 24eb2f6c43
commit f058fc299e
5 changed files with 59 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,7 +121,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::GraphicsContext)
Properties::NON_VIRTUAL,
__void__setClearMask__GLbitfield,
"Set the clear mask used in glClear(. ",
".). Defaults to GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT. ");
".). Defaults to 0 - so no clear is done by default by the GraphicsContext, instead the Camera's attached the GraphicsContext will do the clear. GraphicsContext::setClearMask() is useful for when the Camera's Viewports don't conver the whole context, so the context will fill in the gaps. ");
I_Method0(GLbitfield, getClearMask,
Properties::NON_VIRTUAL,
__GLbitfield__getClearMask,

4
src/osgWrappers/osg/Referenced.cpp
View File

@@ -83,6 +83,10 @@ BEGIN_OBJECT_REFLECTOR(osg::Referenced)
__void__removeObserver__Observer_P1,
"Add a Observer that is observing this object, notify the Observer when this object gets deleted. ",
"");
I_StaticMethod0(OpenThreads::Mutex *, getGlobalReferencedMutex,
__OpenThreads_Mutex_P1__getGlobalReferencedMutex_S,
"Get the optional global Referenced mutex, this can be shared between all osg::Referenced. ",
"");
I_StaticMethod1(void, setThreadSafeReferenceCounting, IN, bool, enableThreadSafeReferenceCounting,
__void__setThreadSafeReferenceCounting__bool_S,
"Set whether reference counting should be use a mutex to create thread reference counting. ",

5
src/osgWrappers/osgDB/DatabasePager.cpp
View File

@@ -488,11 +488,6 @@ BEGIN_OBJECT_REFLECTOR(osgDB::DatabasePager::DatabaseThread)
__void__run,
"Thread's run method. ",
"Must be implemented by derived classes. This is where the action happens. ");
I_Method2(osg::ref_ptr< osg::Node >, dpReadRefNodeFile, IN, const std::string &, fileName, IN, const osgDB::ReaderWriter::Options *, options,
Properties::NON_VIRTUAL,
__osg_ref_ptrT1_osg_Node___dpReadRefNodeFile__C5_std_string_R1__C5_ReaderWriter_Options_P1,
"",
"");
I_SimpleProperty(bool, Done,
__bool__getDone,
__void__setDone__bool);

43
src/osgWrappers/osgDB/Registry.cpp
View File

@@ -26,6 +26,7 @@
#include <osgDB/DatabasePager>
#include <osgDB/DotOsgWrapper>
#include <osgDB/DynamicLibrary>
#include <osgDB/FileCache>
#include <osgDB/Input>
#include <osgDB/Output>
#include <osgDB/ReaderWriter>
@@ -236,11 +237,11 @@ BEGIN_OBJECT_REFLECTOR(osgDB::Registry)
__ReaderWriter_ReadResult__openArchiveImplementation__C5_std_string_R1__ReaderWriter_ArchiveStatus__unsigned_int__C5_ReaderWriter_Options_P1,
"",
"");
I_Method2(osgDB::ReaderWriter::ReadResult, readObject, IN, const std::string &, fileName, IN, const osgDB::ReaderWriter::Options *, options,
Properties::NON_VIRTUAL,
__ReaderWriter_ReadResult__readObject__C5_std_string_R1__C5_ReaderWriter_Options_P1,
"",
"");
I_MethodWithDefaults3(osgDB::ReaderWriter::ReadResult, readObject, IN, const std::string &, fileName, , IN, const osgDB::ReaderWriter::Options *, options, , IN, bool, buildKdTreeIfRequired, true,
Properties::NON_VIRTUAL,
__ReaderWriter_ReadResult__readObject__C5_std_string_R1__C5_ReaderWriter_Options_P1__bool,
"",
"");
I_Method2(osgDB::ReaderWriter::ReadResult, readObjectImplementation, IN, const std::string &, fileName, IN, const osgDB::ReaderWriter::Options *, options,
Properties::NON_VIRTUAL,
__ReaderWriter_ReadResult__readObjectImplementation__C5_std_string_R1__C5_ReaderWriter_Options_P1,
@@ -266,11 +267,11 @@ BEGIN_OBJECT_REFLECTOR(osgDB::Registry)
__ReaderWriter_ReadResult__readHeightFieldImplementation__C5_std_string_R1__C5_ReaderWriter_Options_P1,
"",
"");
I_Method2(osgDB::ReaderWriter::ReadResult, readNode, IN, const std::string &, fileName, IN, const osgDB::ReaderWriter::Options *, options,
Properties::NON_VIRTUAL,
__ReaderWriter_ReadResult__readNode__C5_std_string_R1__C5_ReaderWriter_Options_P1,
"",
"");
I_MethodWithDefaults3(osgDB::ReaderWriter::ReadResult, readNode, IN, const std::string &, fileName, , IN, const osgDB::ReaderWriter::Options *, options, , IN, bool, buildKdTreeIfRequired, true,
Properties::NON_VIRTUAL,
__ReaderWriter_ReadResult__readNode__C5_std_string_R1__C5_ReaderWriter_Options_P1__bool,
"",
"");
I_Method2(osgDB::ReaderWriter::ReadResult, readNodeImplementation, IN, const std::string &, fileName, IN, const osgDB::ReaderWriter::Options *, options,
Properties::NON_VIRTUAL,
__ReaderWriter_ReadResult__readNodeImplementation__C5_std_string_R1__C5_ReaderWriter_Options_P1,
@@ -351,9 +352,9 @@ BEGIN_OBJECT_REFLECTOR(osgDB::Registry)
__ReaderWriter_WriteResult__writeShaderImplementation__C5_osg_Shader_R1__C5_std_string_R1__C5_ReaderWriter_Options_P1,
"",
"");
I_Method2(void, buildKdTreeIfRequired, IN, osgDB::ReaderWriter::ReadResult &, result, IN, const osgDB::ReaderWriter::Options *, options,
I_Method2(void, _buildKdTreeIfRequired, IN, osgDB::ReaderWriter::ReadResult &, result, IN, const osgDB::ReaderWriter::Options *, options,
Properties::NON_VIRTUAL,
__void__buildKdTreeIfRequired__ReaderWriter_ReadResult_R1__C5_ReaderWriter_Options_P1,
__void___buildKdTreeIfRequired__ReaderWriter_ReadResult_R1__C5_ReaderWriter_Options_P1,
"",
"");
I_Method1(void, setBuildKdTreesHint, IN, osgDB::ReaderWriter::Options::BuildKdTreesHint, hint,
@@ -376,6 +377,21 @@ BEGIN_OBJECT_REFLECTOR(osgDB::Registry)
__osg_KdTreeBuilder_P1__getKdTreeBuilder,
"Get the KdTreeBuilder visitor that is used to build KdTree on loaded models. ",
"");
I_Method1(void, setFileCache, IN, osgDB::FileCache *, fileCache,
Properties::NON_VIRTUAL,
__void__setFileCache__FileCache_P1,
"Set the FileCache that is used to manage local storage of files downloaded from the internet. ",
"");
I_Method0(osgDB::FileCache *, getFileCache,
Properties::NON_VIRTUAL,
__FileCache_P1__getFileCache,
"Get the FileCache that is used to manage local storage of files downloaded from the internet. ",
"");
I_Method0(const osgDB::FileCache *, getFileCache,
Properties::NON_VIRTUAL,
__C5_FileCache_P1__getFileCache,
"Get the const FileCache that is used to manage local storage of files downloaded from the internet. ",
"");
I_Method1(void, setAuthenticationMap, IN, osgDB::AuthenticationMap *, authenticationMap,
Properties::NON_VIRTUAL,
__void__setAuthenticationMap__AuthenticationMap_P1,
@@ -604,6 +620,9 @@ BEGIN_OBJECT_REFLECTOR(osgDB::Registry)
I_SimpleProperty(osgDB::DatabasePager *, DatabasePager,
__DatabasePager_P1__getDatabasePager,
__void__setDatabasePager__DatabasePager_P1);
I_SimpleProperty(osgDB::FileCache *, FileCache,
__FileCache_P1__getFileCache,
__void__setFileCache__FileCache_P1);
I_SimpleProperty(osg::KdTreeBuilder *, KdTreeBuilder,
__osg_KdTreeBuilder_P1__getKdTreeBuilder,
__void__setKdTreeBuilder__osg_KdTreeBuilder_P1);

38
src/osgWrappers/osgTerrain/Layer.cpp
View File

@@ -15,6 +15,7 @@
#include <osg/Image>
#include <osg/Object>
#include <osg/Shape>
#include <osg/Texture>
#include <osg/TransferFunction>
#include <osg/Vec2>
#include <osg/Vec3>
@@ -540,12 +541,6 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::ImageLayer)
__void__setModifiedCount__unsigned_int);
END_REFLECTOR
BEGIN_ENUM_REFLECTOR(osgTerrain::Layer::Filter)
I_DeclaringFile("osgTerrain/Layer");
I_EnumLabel(osgTerrain::Layer::NEAREST);
I_EnumLabel(osgTerrain::Layer::LINEAR);
END_REFLECTOR
BEGIN_OBJECT_REFLECTOR(osgTerrain::Layer)
I_DeclaringFile("osgTerrain/Layer");
I_BaseType(osg::Object);
@@ -676,15 +671,25 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::Layer)
__C5_osg_Vec4_R1__getDefaultValue,
"",
"");
I_Method1(void, setFilter, IN, osgTerrain::Layer::Filter, filter,
I_Method1(void, setMinFilter, IN, osg::Texture::FilterMode, filter,
Properties::NON_VIRTUAL,
__void__setFilter__Filter,
"Set the texture filter to use when do texture associated with this layer. ",
__void__setMinFilter__osg_Texture_FilterMode,
"Set the minification texture filter to use when do texture associated with this layer. ",
"");
I_Method0(osgTerrain::Layer::Filter, getFilter,
I_Method0(osg::Texture::FilterMode, getMinFilter,
Properties::NON_VIRTUAL,
__Filter__getFilter,
"Get the texture filter to use when do texture associated with this layer. ",
__osg_Texture_FilterMode__getMinFilter,
"Get the minification texture filter to use when do texture associated with this layer. ",
"");
I_Method1(void, setMagFilter, IN, osg::Texture::FilterMode, filter,
Properties::NON_VIRTUAL,
__void__setMagFilter__osg_Texture_FilterMode,
"Set the magniification texture filter to use when do texture associated with this layer. ",
"");
I_Method0(osg::Texture::FilterMode, getMagFilter,
Properties::NON_VIRTUAL,
__osg_Texture_FilterMode__getMagFilter,
"Get the magnification texture filter to use when do texture associated with this layer. ",
"");
I_Method0(osg::Image *, getImage,
Properties::VIRTUAL,
@@ -780,18 +785,21 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::Layer)
I_SimpleProperty(const std::string &, FileName,
__C5_std_string_R1__getFileName,
__void__setFileName__C5_std_string_R1);
I_SimpleProperty(osgTerrain::Layer::Filter, Filter,
__Filter__getFilter,
__void__setFilter__Filter);
I_SimpleProperty(osg::Image *, Image,
__osg_Image_P1__getImage,
0);
I_SimpleProperty(osgTerrain::Locator *, Locator,
__Locator_P1__getLocator,
__void__setLocator__Locator_P1);
I_SimpleProperty(osg::Texture::FilterMode, MagFilter,
__osg_Texture_FilterMode__getMagFilter,
__void__setMagFilter__osg_Texture_FilterMode);
I_SimpleProperty(unsigned int, MaxLevel,
__unsigned_int__getMaxLevel,
__void__setMaxLevel__unsigned_int);
I_SimpleProperty(osg::Texture::FilterMode, MinFilter,
__osg_Texture_FilterMode__getMinFilter,
__void__setMinFilter__osg_Texture_FilterMode);
I_SimpleProperty(unsigned int, MinLevel,
__unsigned_int__getMinLevel,
__void__setMinLevel__unsigned_int);