Changeset 10007

Timestamp:

04/09/09 17:55:18 (4 years ago)

Author:

robert

Message:

Updated wrappers

Location:

OpenSceneGraph/trunk/src/osgWrappers

Files:

• osgDB/Registry.cpp (modified) (3 diffs)
• osgGA/TrackballManipulator.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/src/osgWrappers/osgDB/Registry.cpp

@@ -101 +101 @@
                   "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,
@@ -155 +160 @@
                   __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,
@@ -594 +604 @@
                            "",
                            "");
-        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,
                            "",
                            "");

OpenSceneGraph/trunk/src/osgWrappers/osgGA/TrackballManipulator.cpp

@@ -170 +170 @@
                   "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,
@@ -212 +222 @@
                            "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,