diff --git a/src/osgWrappers/introspection/genwrapper.conf b/src/osgWrappers/introspection/genwrapper.conf index 3d2c67f6e..b847ffeee 100644 --- a/src/osgWrappers/introspection/genwrapper.conf +++ b/src/osgWrappers/introspection/genwrapper.conf @@ -42,6 +42,12 @@ end ############################################################################# ignore file "osgDB/fstream" +ignore file "osgDB/DataTypes" +ignore file "osgDB/InputStream" +ignore file "osgDB/OutputStream" +ignore file "osgDB/StreamOperator" +ignore file "osgDB/Serializer" +ignore file "osgDB/ObjectWrapper" ignore file "osgUtil/PrintVisitor" ignore file "osgUtil/OperationArrayFunctor" @@ -286,6 +292,13 @@ suppress reflector "osgAnimation::TemplateChannel< osgAnimation::Vec3CubicBezier suppress reflector "osgAnimation::TemplateChannel< osgAnimation::Vec4CubicBezierSampler >" suppress reflector "osgAnimation::AnimationUpdateCallback" +suppress reflector "osgDB::Registry::getObjectWrapperManager" + +configure reflector "osgDB::Registry" + configure property "ObjectWrapperManager" + replace with "" + end +end ############################################################################# diff --git a/src/osgWrappers/introspection/osgDB/DotOsgWrapper.cpp b/src/osgWrappers/introspection/osgDB/DotOsgWrapper.cpp index 13f9003b8..a429a3618 100644 --- a/src/osgWrappers/introspection/osgDB/DotOsgWrapper.cpp +++ b/src/osgWrappers/introspection/osgDB/DotOsgWrapper.cpp @@ -98,3 +98,11 @@ BEGIN_OBJECT_REFLECTOR(osgDB::DotOsgWrapper) 0); END_REFLECTOR +BEGIN_VALUE_REFLECTOR(osgDB::RegisterDotOsgWrapperProxy) + I_DeclaringFile("osgDB/DotOsgWrapper"); + I_ConstructorWithDefaults6(IN, osg::Object *, proto, , IN, const std::string &, name, , IN, const std::string &, associates, , IN, osgDB::DotOsgWrapper::ReadFunc, readFunc, , IN, osgDB::DotOsgWrapper::WriteFunc, writeFunc, , IN, osgDB::DotOsgWrapper::ReadWriteMode, readWriteMode, osgDB::DotOsgWrapper::READ_AND_WRITE, + ____RegisterDotOsgWrapperProxy__osg_Object_P1__C5_std_string_R1__C5_std_string_R1__DotOsgWrapper_ReadFunc__DotOsgWrapper_WriteFunc__DotOsgWrapper_ReadWriteMode, + "", + ""); +END_REFLECTOR + diff --git a/src/osgWrappers/introspection/osgDB/Input.cpp b/src/osgWrappers/introspection/osgDB/Input.cpp index 4a53a2b66..9c3970be0 100644 --- a/src/osgWrappers/introspection/osgDB/Input.cpp +++ b/src/osgWrappers/introspection/osgDB/Input.cpp @@ -17,6 +17,12 @@ #include #include #include +#include +#include +#include +#include +#include +#include #include #include #include @@ -29,6 +35,432 @@ #undef OUT #endif +BEGIN_ENUM_REFLECTOR(osgDB::Field::FieldType) + I_DeclaringFile("osgDB/Input"); + I_EnumLabel(osgDB::Field::OPEN_BRACKET); + I_EnumLabel(osgDB::Field::CLOSE_BRACKET); + I_EnumLabel(osgDB::Field::STRING); + I_EnumLabel(osgDB::Field::WORD); + I_EnumLabel(osgDB::Field::REAL); + I_EnumLabel(osgDB::Field::INTEGER); + I_EnumLabel(osgDB::Field::BLANK); + I_EnumLabel(osgDB::Field::UNINITIALISED); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osgDB::Field) + I_DeclaringFile("osgDB/Input"); + I_Constructor0(____Field, + "", + ""); + I_Constructor1(IN, const osgDB::Field &, field, + Properties::NON_EXPLICIT, + ____Field__C5_Field_R1, + "", + ""); + I_Method0(void, reset, + Properties::NON_VIRTUAL, + __void__reset, + "", + ""); + I_Method1(void, addChar, IN, char, c, + Properties::NON_VIRTUAL, + __void__addChar__char, + "", + ""); + I_Method0(int, getNoCharacters, + Properties::NON_VIRTUAL, + __int__getNoCharacters, + "", + ""); + I_MethodWithDefaults1(void, setWithinQuotes, IN, bool, withinQuotes, true, + Properties::NON_VIRTUAL, + __void__setWithinQuotes__bool, + "", + ""); + I_Method0(bool, getWithinQuotes, + Properties::NON_VIRTUAL, + __bool__getWithinQuotes, + "", + ""); + I_Method1(void, setNoNestedBrackets, IN, int, no, + Properties::NON_VIRTUAL, + __void__setNoNestedBrackets__int, + "", + ""); + I_Method0(int, getNoNestedBrackets, + Properties::NON_VIRTUAL, + __int__getNoNestedBrackets, + "", + ""); + I_Method0(osgDB::Field::FieldType, getFieldType, + Properties::NON_VIRTUAL, + __FieldType__getFieldType, + "", + ""); + I_Method0(bool, isValid, + Properties::NON_VIRTUAL, + __bool__isValid, + "", + ""); + I_Method0(bool, isOpenBracket, + Properties::NON_VIRTUAL, + __bool__isOpenBracket, + "", + ""); + I_Method0(bool, isCloseBracket, + Properties::NON_VIRTUAL, + __bool__isCloseBracket, + "", + ""); + I_Method0(bool, isWord, + Properties::NON_VIRTUAL, + __bool__isWord, + "", + ""); + I_Method1(bool, matchWord, IN, const char *, str, + Properties::NON_VIRTUAL, + __bool__matchWord__C5_char_P1, + "", + ""); + I_Method2(bool, matchWord, IN, const char *, str, IN, int, noCharacters, + Properties::NON_VIRTUAL, + __bool__matchWord__C5_char_P1__int, + "", + ""); + I_Method0(bool, isString, + Properties::NON_VIRTUAL, + __bool__isString, + "", + ""); + I_Method1(bool, matchString, IN, const char *, str, + Properties::NON_VIRTUAL, + __bool__matchString__C5_char_P1, + "", + ""); + I_Method2(bool, matchString, IN, const char *, str, IN, int, noCharacters, + Properties::NON_VIRTUAL, + __bool__matchString__C5_char_P1__int, + "", + ""); + I_Method0(bool, isQuotedString, + Properties::NON_VIRTUAL, + __bool__isQuotedString, + "", + ""); + I_Method0(const char *, getStr, + Properties::NON_VIRTUAL, + __C5_char_P1__getStr, + "", + ""); + I_Method0(char *, takeStr, + Properties::NON_VIRTUAL, + __char_P1__takeStr, + "", + ""); + I_Method0(bool, isInt, + Properties::NON_VIRTUAL, + __bool__isInt, + "", + ""); + I_Method1(bool, matchInt, IN, int, i, + Properties::NON_VIRTUAL, + __bool__matchInt__int, + "", + ""); + I_Method1(bool, getInt, IN, int &, i, + Properties::NON_VIRTUAL, + __bool__getInt__int_R1, + "", + ""); + I_Method0(bool, isUInt, + Properties::NON_VIRTUAL, + __bool__isUInt, + "", + ""); + I_Method1(bool, matchUInt, IN, unsigned int, i, + Properties::NON_VIRTUAL, + __bool__matchUInt__unsigned_int, + "", + ""); + I_Method1(bool, getUInt, IN, unsigned int &, i, + Properties::NON_VIRTUAL, + __bool__getUInt__unsigned_int_R1, + "", + ""); + I_Method0(bool, isFloat, + Properties::NON_VIRTUAL, + __bool__isFloat, + "", + ""); + I_Method1(bool, matchFloat, IN, float, f, + Properties::NON_VIRTUAL, + __bool__matchFloat__float, + "", + ""); + I_Method1(bool, getFloat, IN, float &, f, + Properties::NON_VIRTUAL, + __bool__getFloat__float_R1, + "", + ""); + I_Method1(bool, getFloat, IN, double &, f, + Properties::NON_VIRTUAL, + __bool__getFloat__double_R1, + "", + ""); + I_StaticMethodWithDefaults2(osgDB::Field::FieldType, calculateFieldType, IN, const char *, str, , IN, bool, withinQuotes, false, + __FieldType__calculateFieldType__C5_char_P1__bool_S, + "", + ""); + I_ProtectedMethod0(void, _init, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void___init, + "", + ""); + I_ProtectedMethod0(void, _free, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void___free, + "", + ""); + I_ProtectedMethod1(void, _copy, IN, const osgDB::Field &, ic, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void___copy__C5_Field_R1, + "", + ""); + I_SimpleProperty(osgDB::Field::FieldType, FieldType, + __FieldType__getFieldType, + 0); + I_SimpleProperty(int, NoCharacters, + __int__getNoCharacters, + 0); + I_SimpleProperty(int, NoNestedBrackets, + __int__getNoNestedBrackets, + __void__setNoNestedBrackets__int); + I_SimpleProperty(const char *, Str, + __C5_char_P1__getStr, + 0); + I_SimpleProperty(bool, WithinQuotes, + __bool__getWithinQuotes, + __void__setWithinQuotes__bool); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osgDB::FieldReader) + I_DeclaringFile("osgDB/Input"); + I_Constructor0(____FieldReader, + "", + ""); + I_Constructor1(IN, const osgDB::FieldReader &, ic, + Properties::NON_EXPLICIT, + ____FieldReader__C5_FieldReader_R1, + "", + ""); + I_Method1(void, attach, IN, std::istream *, input, + Properties::NON_VIRTUAL, + __void__attach__std_istream_P1, + "", + ""); + I_Method0(void, detach, + Properties::NON_VIRTUAL, + __void__detach, + "", + ""); + I_Method0(bool, eof, + Properties::VIRTUAL, + __bool__eof, + "", + ""); + I_Method1(bool, readField, IN, osgDB::Field &, fieldPtr, + Properties::NON_VIRTUAL, + __bool__readField__Field_R1, + "", + ""); + I_Method0(void, ignoreField, + Properties::NON_VIRTUAL, + __void__ignoreField, + "", + ""); + I_Method0(int, getNoNestedBrackets, + Properties::NON_VIRTUAL, + __int__getNoNestedBrackets, + "no of unmatched `{' encountered so far in file ", + ""); + I_SimpleProperty(int, NoNestedBrackets, + __int__getNoNestedBrackets, + 0); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osgDB::FieldReaderIterator) + I_DeclaringFile("osgDB/Input"); + I_Constructor0(____FieldReaderIterator, + "", + ""); + I_Constructor1(IN, const osgDB::FieldReaderIterator &, ic, + Properties::NON_EXPLICIT, + ____FieldReaderIterator__C5_FieldReaderIterator_R1, + "", + ""); + I_Method1(void, attach, IN, std::istream *, input, + Properties::NON_VIRTUAL, + __void__attach__std_istream_P1, + "", + ""); + I_Method0(void, detach, + Properties::NON_VIRTUAL, + __void__detach, + "", + ""); + I_Method0(bool, eof, + Properties::VIRTUAL, + __bool__eof, + "", + ""); + I_Method0(osgDB::FieldReader &, getFieldReader, + Properties::NON_VIRTUAL, + __FieldReader_R1__getFieldReader, + "", + ""); + I_Method2(void, insert, IN, int, pos, IN, osgDB::Field *, field, + Properties::NON_VIRTUAL, + __void__insert__int__Field_P1, + "", + ""); + I_Method2(void, insert, IN, int, pos, IN, const char *, str, + Properties::NON_VIRTUAL, + __void__insert__int__C5_char_P1, + "", + ""); + I_Method1(osgDB::Field &, field, IN, int, pos, + Properties::NON_VIRTUAL, + __Field_R1__field__int, + "", + ""); + I_Method0(void, advanceOverCurrentFieldOrBlock, + Properties::NON_VIRTUAL, + __void__advanceOverCurrentFieldOrBlock, + "increments the iterator of the next simple field or whole block if the current field[0] is an open bracket ", + ""); + I_Method0(void, advanceToEndOfCurrentBlock, + Properties::NON_VIRTUAL, + __void__advanceToEndOfCurrentBlock, + "", + ""); + I_Method1(void, advanceToEndOfBlock, IN, int, noNestBrackets, + Properties::NON_VIRTUAL, + __void__advanceToEndOfBlock__int, + "", + ""); + I_Method1(bool, matchSequence, IN, const char *, str, + Properties::NON_VIRTUAL, + __bool__matchSequence__C5_char_P1, + "", + ""); + I_Method2(bool, readSequence, IN, const char *, keyword, IN, std::string &, value, + Properties::NON_VIRTUAL, + __bool__readSequence__C5_char_P1__std_string_R1, + "", + ""); + I_Method2(bool, readSequence, IN, const char *, keyword, IN, unsigned int &, value, + Properties::NON_VIRTUAL, + __bool__readSequence__C5_char_P1__unsigned_int_R1, + "", + ""); + I_Method2(bool, readSequence, IN, const char *, keyword, IN, int &, value, + Properties::NON_VIRTUAL, + __bool__readSequence__C5_char_P1__int_R1, + "", + ""); + I_Method2(bool, readSequence, IN, const char *, keyword, IN, float &, value, + Properties::NON_VIRTUAL, + __bool__readSequence__C5_char_P1__float_R1, + "", + ""); + I_Method2(bool, readSequence, IN, const char *, keyword, IN, osg::Vec2f &, value, + Properties::NON_VIRTUAL, + __bool__readSequence__C5_char_P1__osg_Vec2f_R1, + "", + ""); + I_Method2(bool, readSequence, IN, const char *, keyword, IN, osg::Vec3f &, value, + Properties::NON_VIRTUAL, + __bool__readSequence__C5_char_P1__osg_Vec3f_R1, + "", + ""); + I_Method2(bool, readSequence, IN, const char *, keyword, IN, osg::Vec4f &, value, + Properties::NON_VIRTUAL, + __bool__readSequence__C5_char_P1__osg_Vec4f_R1, + "", + ""); + I_Method2(bool, readSequence, IN, const char *, keyword, IN, osg::Vec2d &, value, + Properties::NON_VIRTUAL, + __bool__readSequence__C5_char_P1__osg_Vec2d_R1, + "", + ""); + I_Method2(bool, readSequence, IN, const char *, keyword, IN, osg::Vec3d &, value, + Properties::NON_VIRTUAL, + __bool__readSequence__C5_char_P1__osg_Vec3d_R1, + "", + ""); + I_Method2(bool, readSequence, IN, const char *, keyword, IN, osg::Vec4d &, value, + Properties::NON_VIRTUAL, + __bool__readSequence__C5_char_P1__osg_Vec4d_R1, + "", + ""); + I_Method1(bool, readSequence, IN, std::string &, value, + Properties::NON_VIRTUAL, + __bool__readSequence__std_string_R1, + "", + ""); + I_Method1(bool, readSequence, IN, unsigned int &, value, + Properties::NON_VIRTUAL, + __bool__readSequence__unsigned_int_R1, + "", + ""); + I_Method1(bool, readSequence, IN, int &, value, + Properties::NON_VIRTUAL, + __bool__readSequence__int_R1, + "", + ""); + I_Method1(bool, readSequence, IN, float &, value, + Properties::NON_VIRTUAL, + __bool__readSequence__float_R1, + "", + ""); + I_Method1(bool, readSequence, IN, osg::Vec2f &, value, + Properties::NON_VIRTUAL, + __bool__readSequence__osg_Vec2f_R1, + "", + ""); + I_Method1(bool, readSequence, IN, osg::Vec3f &, value, + Properties::NON_VIRTUAL, + __bool__readSequence__osg_Vec3f_R1, + "", + ""); + I_Method1(bool, readSequence, IN, osg::Vec4f &, value, + Properties::NON_VIRTUAL, + __bool__readSequence__osg_Vec4f_R1, + "", + ""); + I_Method1(bool, readSequence, IN, osg::Vec2d &, value, + Properties::NON_VIRTUAL, + __bool__readSequence__osg_Vec2d_R1, + "", + ""); + I_Method1(bool, readSequence, IN, osg::Vec3d &, value, + Properties::NON_VIRTUAL, + __bool__readSequence__osg_Vec3d_R1, + "", + ""); + I_Method1(bool, readSequence, IN, osg::Vec4d &, value, + Properties::NON_VIRTUAL, + __bool__readSequence__osg_Vec4d_R1, + "", + ""); + I_SimpleProperty(osgDB::FieldReader &, FieldReader, + __FieldReader_R1__getFieldReader, + 0); +END_REFLECTOR + TYPE_NAME_ALIAS(osg::ArgumentParser::Parameter, osgDB::Input::Parameter) BEGIN_OBJECT_REFLECTOR(osgDB::Input) diff --git a/src/osgWrappers/introspection/osgDB/Registry.cpp b/src/osgWrappers/introspection/osgDB/Registry.cpp index c68ee528a..1554a57f7 100644 --- a/src/osgWrappers/introspection/osgDB/Registry.cpp +++ b/src/osgWrappers/introspection/osgDB/Registry.cpp @@ -64,14 +64,6 @@ BEGIN_VALUE_REFLECTOR(osgDB::PluginFunctionProxy) ""); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osgDB::RegisterDotOsgWrapperProxy) - I_DeclaringFile("osgDB/Registry"); - I_ConstructorWithDefaults6(IN, osg::Object *, proto, , IN, const std::string &, name, , IN, const std::string &, associates, , IN, osgDB::DotOsgWrapper::ReadFunc, readFunc, , IN, osgDB::DotOsgWrapper::WriteFunc, writeFunc, , IN, osgDB::DotOsgWrapper::ReadWriteMode, readWriteMode, osgDB::DotOsgWrapper::READ_AND_WRITE, - ____RegisterDotOsgWrapperProxy__osg_Object_P1__C5_std_string_R1__C5_std_string_R1__DotOsgWrapper_ReadFunc__DotOsgWrapper_WriteFunc__DotOsgWrapper_ReadWriteMode, - "", - ""); -END_REFLECTOR - BEGIN_ENUM_REFLECTOR(osgDB::Registry::LoadStatus) I_DeclaringFile("osgDB/Registry"); I_EnumLabel(osgDB::Registry::NOT_LOADED); @@ -705,6 +697,7 @@ BEGIN_OBJECT_REFLECTOR(osgDB::Registry) I_SimpleProperty(const osgDB::FilePathList &, LibraryFilePathList, __C5_FilePathList_R1__getLibraryFilePathList, __void__setLibraryFilePathList__C5_FilePathList_R1); + I_SimpleProperty(osgDB::Options *, Options, __Options_P1__getOptions, __void__setOptions__Options_P1); diff --git a/src/osgWrappers/introspection/osgUtil/SceneView.cpp b/src/osgWrappers/introspection/osgUtil/SceneView.cpp index 8b343269d..8cfd91f1d 100644 --- a/src/osgWrappers/introspection/osgUtil/SceneView.cpp +++ b/src/osgWrappers/introspection/osgUtil/SceneView.cpp @@ -226,6 +226,21 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::SceneView) __C5_osg_StateSet_P1__getGlobalStateSet, "", ""); + I_Method1(void, setSecondaryStateSet, IN, osg::StateSet *, state, + Properties::NON_VIRTUAL, + __void__setSecondaryStateSet__osg_StateSet_P1, + "", + ""); + I_Method0(osg::StateSet *, getSecondaryStateSet, + Properties::NON_VIRTUAL, + __osg_StateSet_P1__getSecondaryStateSet, + "", + ""); + I_Method0(const osg::StateSet *, getSecondaryStateSet, + Properties::NON_VIRTUAL, + __C5_osg_StateSet_P1__getSecondaryStateSet, + "", + ""); I_Method1(void, setLocalStateSet, IN, osg::StateSet *, state, Properties::NON_VIRTUAL, __void__setLocalStateSet__osg_StateSet_P1, @@ -889,6 +904,9 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::SceneView) 0, 0, 0); + I_SimpleProperty(osg::StateSet *, SecondaryStateSet, + __osg_StateSet_P1__getSecondaryStateSet, + __void__setSecondaryStateSet__osg_StateSet_P1); I_SimpleProperty(osg::State *, State, __osg_State_P1__getState, __void__setState__osg_State_P1);