diff --git a/src/osgWrappers/osg/State.cpp b/src/osgWrappers/osg/State.cpp index 11a011482..cf4c94469 100644 --- a/src/osgWrappers/osg/State.cpp +++ b/src/osgWrappers/osg/State.cpp @@ -40,6 +40,10 @@ END_REFLECTOR TYPE_NAME_ALIAS(std::vector< const osg::StateSet * >, osg::State::StateSetStack) +TYPE_NAME_ALIAS(std::pair< const osg::StateAttribute * COMMA osg::StateAttribute::OverrideValue >, osg::State::AttributePair) + +TYPE_NAME_ALIAS(std::vector< osg::State::AttributePair >, osg::State::AttributeVec) + BEGIN_OBJECT_REFLECTOR(osg::State) I_DeclaringFile("osg/State"); I_BaseType(osg::Referenced); @@ -627,6 +631,11 @@ BEGIN_OBJECT_REFLECTOR(osg::State) __GLint__getAttribLocation__C5_std_string_R1, "", ""); + I_Method1(osg::State::AttributeVec &, getAttributeVec, IN, const osg::StateAttribute *, attribute, + Properties::NON_VIRTUAL, + __AttributeVec_R1__getAttributeVec__C5_osg_StateAttribute_P1, + "", + ""); I_Method1(void, setFrameStamp, IN, osg::FrameStamp *, fs, Properties::NON_VIRTUAL, __void__setFrameStamp__FrameStamp_P1, @@ -884,5 +893,9 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::State::DynamicObjectRenderingCompletedCallb ""); END_REFLECTOR +STD_PAIR_REFLECTOR(std::pair< const osg::StateAttribute * COMMA osg::StateAttribute::OverrideValue >) + STD_VECTOR_REFLECTOR(std::vector< const osg::StateSet * >) +STD_VECTOR_REFLECTOR(std::vector< osg::State::AttributePair >) + diff --git a/src/osgWrappers/osgDB/Options.cpp b/src/osgWrappers/osgDB/Options.cpp index 51507c97c..43acb93ff 100644 --- a/src/osgWrappers/osgDB/Options.cpp +++ b/src/osgWrappers/osgDB/Options.cpp @@ -164,9 +164,9 @@ BEGIN_OBJECT_REFLECTOR(osgDB::Options) __void__setPluginStringData__C5_std_string_R1__C5_std_string_R1, "Sets a plugindata value PluginData with a string. ", ""); - I_Method1(std::string, getPluginStringData, IN, const std::string &, s, + I_Method1(std::string &, getPluginStringData, IN, const std::string &, s, Properties::NON_VIRTUAL, - __std_string__getPluginStringData__C5_std_string_R1, + __std_string_R1__getPluginStringData__C5_std_string_R1, "Get a string from the PluginStrData. ", ""); I_Method1(const std::string, getPluginStringData, IN, const std::string &, s, @@ -260,10 +260,6 @@ BEGIN_OBJECT_REFLECTOR(osgDB::Options) __void_P1__getPluginData__C5_std_string_R1, __void__setPluginData__C5_std_string_R1__void_P1, 0); - I_IndexedProperty(std::string, PluginStringData, - __std_string__getPluginStringData__C5_std_string_R1, - __void__setPluginStringData__C5_std_string_R1__C5_std_string_R1, - 0); I_SimpleProperty(osgDB::ReadFileCallback *, ReadFileCallback, __ReadFileCallback_P1__getReadFileCallback, __void__setReadFileCallback__ReadFileCallback_P1); diff --git a/src/osgWrappers/osgDB/ReaderWriter.cpp b/src/osgWrappers/osgDB/ReaderWriter.cpp index 3fc417041..a79d4a137 100644 --- a/src/osgWrappers/osgDB/ReaderWriter.cpp +++ b/src/osgWrappers/osgDB/ReaderWriter.cpp @@ -118,6 +118,11 @@ BEGIN_OBJECT_REFLECTOR(osgDB::ReaderWriter) __Features__supportedFeatures, "return available features ", ""); + I_Method2(bool, fileExists, IN, const std::string &, filename, IN, const osgDB::ReaderWriter::Options *, options, + Properties::VIRTUAL, + __bool__fileExists__C5_std_string_R1__C5_Options_P1, + "determine if a file exists, normally the default implementation will be approrpiate for local file access but with plugins like the libcurl based on it will return true if the file is accessible a server. ", + ""); I_MethodWithDefaults4(osgDB::ReaderWriter::ReadResult, openArchive, IN, const std::string &, x, , IN, osgDB::ReaderWriter::ArchiveStatus, x, , IN, unsigned, int, 4096, IN, const osgDB::ReaderWriter::Options *, x, NULL, Properties::VIRTUAL, __ReadResult__openArchive__C5_std_string_R1__ArchiveStatus__unsigned__C5_Options_P1, diff --git a/src/osgWrappers/osgDB/XmlParser.cpp b/src/osgWrappers/osgDB/XmlParser.cpp index 44444d3e7..da314f2fb 100644 --- a/src/osgWrappers/osgDB/XmlParser.cpp +++ b/src/osgWrappers/osgDB/XmlParser.cpp @@ -94,6 +94,11 @@ BEGIN_VALUE_REFLECTOR(osgDB::XmlNode::Input) __void__readAllDataIntoBuffer, "", ""); + I_Method0(osgDB::XmlNode::Input::size_type, currentPosition, + Properties::NON_VIRTUAL, + __size_type__currentPosition, + "", + ""); I_Method0(int, get, Properties::NON_VIRTUAL, __int__get,