Changeset 10916

Timestamp:

01/05/10 12:15:17 (3 years ago)

Author:

robert

Message:

Updated wrappers

Location:

OpenSceneGraph/trunk/src/osgWrappers

Files:

• osgAnimation/RigTransformHardware.cpp (added)
• osgAnimation/RigTransformSoftware.cpp (added)
• osgAnimation/Skinning.cpp (deleted)
• osgDB/ReaderWriter.cpp (modified) (1 diff)
• osgGA/KeySwitchMatrixManipulator.cpp (modified) (2 diffs)
• osgGA/MatrixManipulator.cpp (modified) (2 diffs)
• osgGA/SphericalManipulator.cpp (modified) (1 diff)
• osgGA/TerrainManipulator.cpp (modified) (2 diffs)
• osgGA/TrackballManipulator.cpp (modified) (1 diff)

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

@@ -234 +234 @@
                               "",
                               "");
+        I_Method2(void, supportsProtocol, IN, const std::string &, fmt, IN, const std::string &, description,
+                  Properties::NON_VIRTUAL,
+                  __void__supportsProtocol__C5_std_string_R1__C5_std_string_R1,
+                  "Specify fmt string as a supported protocol. ",
+                  "Please note, this method should usually only be used internally by subclasses of ReaderWriter, Only in special cases will a ReaderWriter implementation be able to handle a protocol format that is wasn't original designed for. To know whether it's safe to inject a new protocol format to an existing ReaderWriter you will need to review the source code and dependencies of that ReaderWriter. ");
+        I_Method2(void, supportsExtension, IN, const std::string &, ext, IN, const std::string &, description,
+                  Properties::NON_VIRTUAL,
+                  __void__supportsExtension__C5_std_string_R1__C5_std_string_R1,
+                  "Specify ext string as a supported file extension. ",
+                  "Please note, this method should usually only be used internally by subclasses of ReaderWriter. Only in special cases will a ReaderWriter implementation be able to handle a file extension that is wasn't original designed for. To know whether it's safe to inject a new file extension to an existing ReaderWriter you will need to review the the source code and dependencies of that ReaderWriter. ");
+        I_Method2(void, supportsOption, IN, const std::string &, opt, IN, const std::string &, description,
+                  Properties::NON_VIRTUAL,
+                  __void__supportsOption__C5_std_string_R1__C5_std_string_R1,
+                  "Specify option string as a supported option string. ",
+                  "Please note, this should usually only be used internally by subclasses of ReaderWriter. ");
         I_StaticMethod1(osgDB::ReaderWriter::FeatureList, featureAsString, IN, osgDB::ReaderWriter::Features, feature,
                         __FeatureList__featureAsString__Features_S,
                         "return feature as string ",
                         "");
-        I_ProtectedMethod2(void, supportsProtocol, IN, const std::string &, fmt, IN, const std::string &, description,
-                           Properties::NON_VIRTUAL,
-                           Properties::NON_CONST,
-                           __void__supportsProtocol__C5_std_string_R1__C5_std_string_R1,
-                           "",
-                           "");
-        I_ProtectedMethod2(void, supportsExtension, IN, const std::string &, fmt, IN, const std::string &, description,
-                           Properties::NON_VIRTUAL,
-                           Properties::NON_CONST,
-                           __void__supportsExtension__C5_std_string_R1__C5_std_string_R1,
-                           "",
-                           "");
-        I_ProtectedMethod2(void, supportsOption, IN, const std::string &, fmt, IN, const std::string &, description,
-                           Properties::NON_VIRTUAL,
-                           Properties::NON_CONST,
-                           __void__supportsOption__C5_std_string_R1__C5_std_string_R1,
-                           "",
-                           "");
 END_REFLECTOR
 

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

@@ -144 +144 @@
                   "Get the FusionDistanceValue. ",
                   "Used by SceneView for setting up stereo convergence. ");
+        I_Method1(void, setDistance, IN, double, distance,
+                  Properties::NON_VIRTUAL,
+                  __void__setDistance__double,
+                  "Set the distance property. ",
+                  "");
+        I_Method0(double, getDistance,
+                  Properties::VIRTUAL,
+                  __double__getDistance,
+                  "Get the distance property. ",
+                  "");
         I_Method1(void, setNode, IN, osg::Node *, x,
                   Properties::VIRTUAL,
@@ -209 +219 @@
                          __MatrixManipulator_P1__getCurrentMatrixManipulator, 
                          0);
+        I_SimpleProperty(double, Distance, 
+                         __double__getDistance, 
+                         __void__setDistance__double);
         I_SimpleProperty(osgUtil::SceneView::FusionDistanceMode, FusionDistanceMode, 
                          __osgUtil_SceneView_FusionDistanceMode__getFusionDistanceMode, 

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

@@ -111 +111 @@
                   "Get the FusionDistanceValue. ",
                   "Used by SceneView for setting up stereo convergence. ");
+        I_Method1(void, setDistance, IN, double, x,
+                  Properties::NON_VIRTUAL,
+                  __void__setDistance__double,
+                  "Set the distance parameter (used by TrackballManipulator etc. ",
+                  ") ");
+        I_Method0(double, getDistance,
+                  Properties::VIRTUAL,
+                  __double__getDistance,
+                  "Get the distance parameter. ",
+                  "");
         I_Method1(void, setIntersectTraversalMask, IN, unsigned int, mask,
                   Properties::NON_VIRTUAL,
@@ -196 +206 @@
                          __CoordinateFrameCallback_P1__getCoordinateFrameCallback, 
                          __void__setCoordinateFrameCallback__CoordinateFrameCallback_P1);
+        I_SimpleProperty(double, Distance, 
+                         __double__getDistance, 
+                         __void__setDistance__double);
         I_SimpleProperty(osgUtil::SceneView::FusionDistanceMode, FusionDistanceMode, 
                          __osgUtil_SceneView_FusionDistanceMode__getFusionDistanceMode, 

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

@@ -138 +138 @@
                   "",
                   "");
-        I_Method1(bool, setDistance, IN, double, distance,
+        I_Method1(bool, setDistance, IN, double, x,
                   Properties::NON_VIRTUAL,
                   __bool__setDistance__double,
-                  "",
-                  "");
+                  "Set the distance parameter (used by TrackballManipulator etc. ",
+                  ") ");
         I_Method0(double, getDistance,
-                  Properties::NON_VIRTUAL,
+                  Properties::VIRTUAL,
                   __double__getDistance,
-                  "",
+                  "Get the distance parameter. ",
                   "");
         I_Method0(double, getHomeDistance,

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

@@ -84 +84 @@
                   "Get the FusionDistanceValue. ",
                   "Used by SceneView for setting up stereo convergence. ");
+        I_Method1(void, setDistance, IN, double, distance,
+                  Properties::NON_VIRTUAL,
+                  __void__setDistance__double,
+                  "Set the distance of the trackball. ",
+                  "");
+        I_Method0(double, getDistance,
+                  Properties::VIRTUAL,
+                  __double__getDistance,
+                  "Get the distance of the trackball. ",
+                  "");
         I_Method1(void, setNode, IN, osg::Node *, x,
                   Properties::VIRTUAL,
@@ -179 +189 @@
                          0, 
                          __void__setByMatrix__C5_osg_Matrixd_R1);
+        I_SimpleProperty(double, Distance, 
+                         __double__getDistance, 
+                         __void__setDistance__double);
         I_SimpleProperty(osgUtil::SceneView::FusionDistanceMode, FusionDistanceMode, 
                          __osgUtil_SceneView_FusionDistanceMode__getFusionDistanceMode, 

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

@@ -156 +156 @@
                   "");
         I_Method0(double, getDistance,
-                  Properties::NON_VIRTUAL,
+                  Properties::VIRTUAL,
                   __double__getDistance,
                   "Get the distance of the trackball. ",