diff --git a/src/osgWrappers/osgDB/Registry.cpp b/src/osgWrappers/osgDB/Registry.cpp index 96f91c200..876b7c6bc 100644 --- a/src/osgWrappers/osgDB/Registry.cpp +++ b/src/osgWrappers/osgDB/Registry.cpp @@ -100,6 +100,11 @@ BEGIN_OBJECT_REFLECTOR(osgDB::Registry) __bool__readPluginAliasConfigurationFile__C5_std_string_R1, "Reads a file that configures extension mappings. ", "File is ASCII text and each line contains the parameters to the addFileExtensionAlias method. Lines can be commented out with an initial '#' character. "); + I_Method2(void, addMimeTypeExtensionMapping, IN, const std::string, fromMimeType, IN, const std::string, toExt, + Properties::NON_VIRTUAL, + __void__addMimeTypeExtensionMapping__C5_std_string__C5_std_string, + "Registers a mapping of a mime-type to an extension. ", + "A process fetching data over HTTP can use this facility to determine the proper ReaderWriter to use when there is no filename extension to rely upon. "); I_Method1(void, addDotOsgWrapper, IN, osgDB::DotOsgWrapper *, wrapper, Properties::NON_VIRTUAL, __void__addDotOsgWrapper__DotOsgWrapper_P1, @@ -155,6 +160,11 @@ BEGIN_OBJECT_REFLECTOR(osgDB::Registry) __ReaderWriter_P1__getReaderWriterForExtension__C5_std_string_R1, "get a reader writer which handles specified extension. ", ""); + I_Method1(osgDB::ReaderWriter *, getReaderWriterForMimeType, IN, const std::string &, mimeType, + Properties::NON_VIRTUAL, + __ReaderWriter_P1__getReaderWriterForMimeType__C5_std_string_R1, + "gets a reader/writer that handles the extension mapped to by one of the registered mime-types. ", + ""); I_Method0(osgDB::Registry::ReaderWriterList &, getReaderWriterList, Properties::NON_VIRTUAL, __ReaderWriterList_R1__getReaderWriterList, @@ -593,10 +603,10 @@ BEGIN_OBJECT_REFLECTOR(osgDB::Registry) __ReaderWriter_ReadResult__read__C5_ReadFunctor_R1, "", ""); - I_ProtectedMethod2(osgDB::ReaderWriter::ReadResult, readImplementation, IN, const osgDB::Registry::ReadFunctor &, readFunctor, IN, bool, useObjectCache, + I_ProtectedMethod2(osgDB::ReaderWriter::ReadResult, readImplementation, IN, const osgDB::Registry::ReadFunctor &, readFunctor, IN, osgDB::ReaderWriter::Options::CacheHintOptions, cacheHint, Properties::NON_VIRTUAL, Properties::NON_CONST, - __ReaderWriter_ReadResult__readImplementation__C5_ReadFunctor_R1__bool, + __ReaderWriter_ReadResult__readImplementation__C5_ReadFunctor_R1__ReaderWriter_Options_CacheHintOptions, "", ""); I_SimpleProperty(osgDB::AuthenticationMap *, AuthenticationMap, diff --git a/src/osgWrappers/osgGA/TrackballManipulator.cpp b/src/osgWrappers/osgGA/TrackballManipulator.cpp index 657e68967..f31d19ce3 100644 --- a/src/osgWrappers/osgGA/TrackballManipulator.cpp +++ b/src/osgWrappers/osgGA/TrackballManipulator.cpp @@ -169,6 +169,16 @@ BEGIN_OBJECT_REFLECTOR(osgGA::TrackballManipulator) __float__getTrackballSize, "Get the size of the trackball. ", ""); + I_Method1(void, setAllowThrow, IN, bool, allowThrow, + Properties::NON_VIRTUAL, + __void__setAllowThrow__bool, + "Set the 'allow throw' flag. ", + "Releasing the mouse button while moving the camera results in a throw. "); + I_Method0(bool, getAllowThrow, + Properties::NON_VIRTUAL, + __bool__getAllowThrow, + "Returns true if the camera can be thrown, false otherwise. ", + "This defaults to true. "); I_ProtectedMethod0(void, flushMouseEventStack, Properties::NON_VIRTUAL, Properties::NON_CONST, @@ -211,6 +221,9 @@ BEGIN_OBJECT_REFLECTOR(osgGA::TrackballManipulator) __bool__isMouseMoving, "Check the speed at which the mouse is moving. ", "If speed is below a threshold then return false, otherwise return true. "); + I_SimpleProperty(bool, AllowThrow, + __bool__getAllowThrow, + __void__setAllowThrow__bool); I_SimpleProperty(const osg::Matrixd &, ByInverseMatrix, 0, __void__setByInverseMatrix__C5_osg_Matrixd_R1);