Creating the 2.6.1 tag release.

svn merge -r 8852:8853 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk .

From Robert Osfield, "Introduced Geometry::containsSharedArrays() and Geometry::duplicateSharedArrays() to
support a fix to the osgUtil::Simplifier that couldn't handle shared arrays"

CMakeLists.txt

@@ -25,8 +25,12 @@ PROJECT(OpenSceneGraph)
 
 SET(OPENSCENEGRAPH_MAJOR_VERSION 2)
 SET(OPENSCENEGRAPH_MINOR_VERSION 6)
-SET(OPENSCENEGRAPH_PATCH_VERSION 0)
-SET(OPENSCENEGRAPH_SOVERSION 44)
+SET(OPENSCENEGRAPH_PATCH_VERSION 1)
+SET(OPENSCENEGRAPH_SOVERSION 48)
+
+# set to 0 when not a release candidate, non zero means that any generated 
+# svn tags will be treated as release candidates of given number
+SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 0)
 
 SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION})
 
@@ -81,6 +85,64 @@ IF(CMAKE_SYSTEM MATCHES IRIX)
     SET(CMAKE_THREAD_LIBS_INIT "" CACHE INTERNAL "")
 ENDIF(CMAKE_SYSTEM MATCHES IRIX)
 
+OPTION(OSG_MAINTAINER "Enable OpenSceneGraph maintainer build methods, such as making svn branches, tags, updating ChangeLog." OFF)
+IF (OSG_MAINTAINER)
+
+    SET(OPENSCENEGRAPH_SVN "trunk")
+    #SET(OPENSCENEGRAPH_SVN "branches")
+    SET(OPENSCENEGRAPH_BRANCH OpenSceneGraph-${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION})
+
+    #
+    # Provide target for tagging a release
+    #
+    SET(SVNCOMMAND svn)
+    SET(SVNTRUNKDIR     http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk)
+    SET(SVNTAGDIR       http://www.openscenegraph.org/svn/osg/OpenSceneGraph/tags)
+    SET(SVNBRANCHDIR    http://www.openscenegraph.org/svn/osg/OpenSceneGraph/branch)
+
+    IF   (OPENSCENEGRAPH_SVN STREQUAL "trunk")
+        SET(SVNSOURCEDIR ${SVNTRUNKDIR})
+    ELSE (OPENSCENEGRAPH_SVN STREQUAL "trunk")
+        SET(SVNSOURCEDIR ${SVNBRANCH_DIR}/${OPENSCENEGRAPH_BRANCH})
+    ENDIF(OPENSCENEGRAPH_SVN STREQUAL "trunk")
+
+
+    IF   (OPENSCENEGRAPH_RELEASE_CANDIDATE EQUAL 0)
+        SET(RELEASE_NAME OpenSceneGraph-${OPENSCENEGRAPH_VERSION})
+    ELSE (OPENSCENEGRAPH_RELEASE_CANDIDATE EQUAL 0)
+        SET(RELEASE_NAME OpenSceneGraph-${OPENSCENEGRAPH_VERSION}-rc${OPENSCENEGRAPH_RELEASE_CANDIDATE})
+    ENDIF(OPENSCENEGRAPH_RELEASE_CANDIDATE EQUAL 0)
+
+
+    ADD_CUSTOM_TARGET(tag-test
+        COMMAND echo ${SVNCOMMAND} copy ${SVNSOURCEDIR} ${SVNTAGDIR}/${RELEASE_NAME} -m "Release ${RELEASE_NAME}"
+    )
+
+    ADD_CUSTOM_TARGET(tag-run
+        COMMAND ${SVNCOMMAND} copy ${SVNSOURCEDIR} ${SVNTAGDIR}/${RELEASE_NAME} -m "Release ${RELEASE_NAME}"
+    )
+
+    ADD_CUSTOM_TARGET(branch-test
+        COMMAND echo ${SVNCOMMAND} copy ${SVNSOURCEDIR} ${SVNBRANCHDIR}/${OPENSCENEGRAPH_BRANCH} -m "Branch ${OPENSCENEGRAPH_BRANCH}"
+    )
+
+    ADD_CUSTOM_TARGET(branch-run
+        COMMAND ${SVNCOMMAND} copy ${SVNSOURCEDIR} ${SVNBRANCHDIR}/${OPENSCENEGRAPH_BRANCH} -m "Branch ${OPENSCENEGRAPH_BRANCH}"
+    )
+
+    #
+    # Provide target for generating ChangeLog
+    #
+    SET(SVN2LOG ~/bin/svn2log.py)
+    SET(GENERATELOGS svn log -v --xml | python ${SVN2LOG} -L -H)
+
+    ADD_CUSTOM_TARGET(ChangeLog
+        COMMAND ${GENERATELOGS}
+    )
+    
+ENDIF(OSG_MAINTAINER)
+
+
 # Find OpenGL
 FIND_PACKAGE(OpenGL)
 
@@ -269,6 +331,17 @@ IF(PKG_CONFIG_FOUND)
 
 ENDIF(PKG_CONFIG_FOUND)
 
+
+#
+# Enable workaround for OpenGL driver crash with occlusion query
+#
+OPTION(OSG_FORCE_QUERY_RESULT_AVAILABLE_BEFORE_RETRIEVAL "Set to ON to build OcclussionQueryNode with a workaround for multi-threaded OpenGL driver occlussion query crash. " OFF)
+IF(OSG_FORCE_QUERY_RESULT_AVAILABLE_BEFORE_RETRIEVAL)
+    ADD_DEFINITIONS(-DFORCE_QUERY_RESULT_AVAILABLE_BEFORE_RETRIEVAL)
+ENDIF(OSG_FORCE_QUERY_RESULT_AVAILABLE_BEFORE_RETRIEVAL)
+
+
+
 #
 # Test to determine if we want the "tripledot" form of the GLU tesselator callback.
 #
@@ -551,6 +624,18 @@ IF(APPLE)
 
 ENDIF(APPLE)
 
+
+#
+# Provide target for generating wrappers
+#
+SET(GENWRAPPER genwrapper)
+
+ADD_CUSTOM_TARGET(wrappers
+    COMMAND ${GENWRAPPER} -c ${OpenSceneGraph_SOURCE_DIR}/src/osgWrappers/genwrapper.conf -t ${OpenSceneGraph_SOURCE_DIR}/src/osgWrappers/Doxyfile.template -d ${OpenSceneGraph_SOURCE_DIR} | doxygen -
+    COMMAND ${GENWRAPPER} -c ${OpenSceneGraph_SOURCE_DIR}/src/osgWrappers/genwrapper.conf -l ${OpenSceneGraph_SOURCE_DIR}
+)
+
+
 OPTION(BUILD_REF_DOCS "Build OpenSceneGraph reference documentation using doxygen (use: make DoxygenDoc)" OFF)
 
 IF(BUILD_REF_DOCS)

ChangeLog

@@ -1,3 +1,23 @@
+The following changes (and svn revision numbers) were included in the 2.6.1 release.
+
+8765 - Fix to OverlayNode from Jason Beverage.
+8775,8776 - BlendEquation support in .osg/.ive
+8791 - Fix to FLT exporter to properly export PositionAttitudeTransform nodes.
+8795 - Change OcclusionQueryNode to workaround an OpenGL implementation issue on NVIDIA devices with Linux drivers. The workaround is to wait (in a loop) until the query result is ready before we retrieve it. This workaround can be enabled in cmake but is disabled by default.
+8799, 8800 - cmake targets for wrappers and changelog
+8804 - Change AutoTransform interface to use doubles; osgTerrain wrapper modification for Layer.cpp.
+8821 - cmake 'maintainer' enhancements for tags.
+8853 - Fix to osgUtil::Simplifier to handle shared vertex arrays correctly. Changes the Geometry interface, so forces a recompile.
+8888 - Fix for uninitialized "strip texture path" option in OpenFlight exporter.
+8900 - Fix for FLT plugin user data handling.
+Modification to r8795 to sleep inside the loop that checks for availability of the occlusion query result.
+Bump OSG version number from 2.6.0 to 2.6.1.
+Update wrappers.
+
+
+
+The following changes were included in the 2.6 release.
+
 2008-08-05 10:31 +0000 [r8733]  robert:
 
 	* Updated wrappers

README.txt

@@ -15,7 +15,7 @@ subscribe to our public mailing list:
 
 Robert Osfield.
 Project Lead.
-5th August 2008.
+26th August 2008.
 
 --
 

include/osg/AutoTransform

@@ -42,26 +42,26 @@ class OSG_EXPORT AutoTransform : public Transform
         virtual AutoTransform* asAutoTransform() { return this; }
         virtual const AutoTransform* asAutoTransform() const { return this; }
 
-        inline void setPosition(const Vec3& pos) { _position = pos; _matrixDirty=true; dirtyBound(); }
-        inline const Vec3& getPosition() const { return _position; }
+        inline void setPosition(const Vec3d& pos) { _position = pos; _matrixDirty=true; dirtyBound(); }
+        inline const Vec3d& getPosition() const { return _position; }
 
 
         inline void setRotation(const Quat& quat) { _rotation = quat; _matrixDirty=true; dirtyBound(); }
         inline const Quat& getRotation() const { return _rotation; }
 
-        inline void setScale(float scale) { setScale(osg::Vec3(scale,scale,scale)); }
+        inline void setScale(double scale) { setScale(osg::Vec3(scale,scale,scale)); }
 
-        void setScale(const Vec3& scale);
-        inline const Vec3& getScale() const { return _scale; }
+        void setScale(const Vec3d& scale);
+        inline const Vec3d& getScale() const { return _scale; }
 
-        void setMinimumScale(float minimumScale) { _minimumScale = minimumScale; }
-        float getMinimumScale() const { return _minimumScale; }
+        void setMinimumScale(double minimumScale) { _minimumScale = minimumScale; }
+        double getMinimumScale() const { return _minimumScale; }
 
-        void setMaximumScale(float maximumScale) { _maximumScale = maximumScale; }
-        float getMaximumScale() const { return _maximumScale; }
+        void setMaximumScale(double maximumScale) { _maximumScale = maximumScale; }
+        double getMaximumScale() const { return _maximumScale; }
 
-        inline void setPivotPoint(const Vec3& pivot) { _pivotPoint = pivot; _matrixDirty=true; dirtyBound(); }
-        inline const Vec3& getPivotPoint() const { return _pivotPoint; }
+        inline void setPivotPoint(const Vec3d& pivot) { _pivotPoint = pivot; _matrixDirty=true; dirtyBound(); }
+        inline const Vec3d& getPivotPoint() const { return _pivotPoint; }
 
 
         void setAutoUpdateEyeMovementTolerance(float tolerance) { _autoUpdateEyeMovementTolerance = tolerance; }
@@ -98,32 +98,32 @@ class OSG_EXPORT AutoTransform : public Transform
 
         virtual ~AutoTransform() {}
 
-        Vec3                            _position;
-        Vec3                            _pivotPoint;
-        float                           _autoUpdateEyeMovementTolerance;
+        Vec3d                           _position;
+        Vec3d                           _pivotPoint;
+        double                          _autoUpdateEyeMovementTolerance;
 
         AutoRotateMode                  _autoRotateMode;
 
         bool                            _autoScaleToScreen;
 
         mutable Quat                    _rotation;
-        mutable Vec3                    _scale;
+        mutable Vec3d                   _scale;
         mutable bool                    _firstTimeToInitEyePoint;
         mutable osg::Vec3               _previousEyePoint;
         mutable osg::Vec3               _previousLocalUp;
         mutable Viewport::value_type    _previousWidth;
         mutable Viewport::value_type    _previousHeight;
-        mutable osg::Matrix             _previousProjection;
-        mutable osg::Vec3               _previousPosition;
+        mutable osg::Matrixd            _previousProjection;
+        mutable osg::Vec3d              _previousPosition;
 
-        float                           _minimumScale;
-        float                           _maximumScale;
-        float                           _autoScaleTransitionWidthRatio;
+        double                          _minimumScale;
+        double                          _maximumScale;
+        double                          _autoScaleTransitionWidthRatio;
 
         void computeMatrix() const;
 
-        mutable bool        _matrixDirty;
-        mutable osg::Matrix _cachedMatrix;
+        mutable bool                    _matrixDirty;
+        mutable osg::Matrixd            _cachedMatrix;
 };
 
 }

include/osg/Geometry

@@ -344,6 +344,12 @@ class OSG_EXPORT Geometry : public Drawable
 
         void copyToAndOptimize(Geometry& target);
 
+
+        bool containsSharedArrays() const;
+        
+        void duplicateSharedArrays();
+        
+
         void computeInternalOptimizedGeometry();
 
         void removeInternalOptimizedGeometry() { _internalOptimizedGeometry = 0; }

include/osg/Version

@@ -21,8 +21,8 @@ extern "C" {
 
 #define OPENSCENEGRAPH_MAJOR_VERSION    2
 #define OPENSCENEGRAPH_MINOR_VERSION    6
-#define OPENSCENEGRAPH_PATCH_VERSION    0
-#define OPENSCENEGRAPH_SOVERSION        44
+#define OPENSCENEGRAPH_PATCH_VERSION    1
+#define OPENSCENEGRAPH_SOVERSION        48
 
 /**
   * osgGetVersion() returns the library version number.

src/osg/AutoTransform.cpp

@@ -18,14 +18,14 @@
 using namespace osg;
 
 AutoTransform::AutoTransform():
-    _autoUpdateEyeMovementTolerance(0.0f),
+    _autoUpdateEyeMovementTolerance(0.0),
     _autoRotateMode(NO_ROTATION),
     _autoScaleToScreen(false),
-    _scale(1.0f,1.0f,1.0f),
+    _scale(1.0,1.0,1.0),
     _firstTimeToInitEyePoint(true),
-    _minimumScale(0.0f),
-    _maximumScale(FLT_MAX),
-    _autoScaleTransitionWidthRatio(0.25f),
+    _minimumScale(0.0),
+    _maximumScale(DBL_MAX),
+    _autoScaleTransitionWidthRatio(0.25),
     _matrixDirty(true)
 {
 //    setNumChildrenRequiringUpdateTraversal(1);
@@ -49,7 +49,7 @@ AutoTransform::AutoTransform(const AutoTransform& pat,const CopyOp& copyop):
 //    setNumChildrenRequiringUpdateTraversal(getNumChildrenRequiringUpdateTraversal()+1);            
 }
 
-void AutoTransform::setScale(const Vec3& scale)
+void AutoTransform::setScale(const Vec3d& scale)
 {
     _scale = scale; 
     if (_scale.x()<_minimumScale) _scale.x() = _minimumScale;
@@ -87,14 +87,14 @@ bool AutoTransform::computeWorldToLocalMatrix(Matrix& matrix,NodeVisitor*) const
     {
         matrix.postMult(osg::Matrix::translate(-_position)*
                         osg::Matrix::rotate(_rotation.inverse())*
-                        osg::Matrix::scale(1.0f/_scale.x(),1.0f/_scale.y(),1.0f/_scale.z())*
+                        osg::Matrix::scale(1.0/_scale.x(),1.0/_scale.y(),1.0/_scale.z())*
                         osg::Matrix::translate(_pivotPoint));
     }
     else // absolute
     {
         matrix = osg::Matrix::translate(-_position)*
                  osg::Matrix::rotate(_rotation.inverse())*
-                 osg::Matrix::scale(1.0f/_scale.x(),1.0f/_scale.y(),1.0f/_scale.z())*
+                 osg::Matrix::scale(1.0/_scale.x(),1.0/_scale.y(),1.0/_scale.z())*
                  osg::Matrix::translate(_pivotPoint);
     }
     return true;
@@ -138,21 +138,21 @@ void AutoTransform::accept(NodeVisitor& nv)
                     height = viewport->height();
                 }
 
-                osg::Vec3 eyePoint = cs->getEyeLocal(); 
-                osg::Vec3 localUp = cs->getUpLocal(); 
-                osg::Vec3 position = getPosition();
+                osg::Vec3d eyePoint = cs->getEyeLocal(); 
+                osg::Vec3d localUp = cs->getUpLocal(); 
+                osg::Vec3d position = getPosition();
 
                 const osg::Matrix& projection = *(cs->getProjectionMatrix());
 
                 bool doUpdate = _firstTimeToInitEyePoint;
                 if (!_firstTimeToInitEyePoint)
                 {
-                    osg::Vec3 dv = _previousEyePoint-eyePoint;
+                    osg::Vec3d dv = _previousEyePoint-eyePoint;
                     if (dv.length2()>getAutoUpdateEyeMovementTolerance()*(eyePoint-getPosition()).length2())
                     {
                         doUpdate = true;
                     }
-                    osg::Vec3 dupv = _previousLocalUp-localUp;
+                    osg::Vec3d dupv = _previousLocalUp-localUp;
                     // rotating the camera only affects ROTATE_TO_*
                     if (_autoRotateMode &&
                         dupv.length2()>getAutoUpdateEyeMovementTolerance())
@@ -179,35 +179,35 @@ void AutoTransform::accept(NodeVisitor& nv)
 
                     if (getAutoScaleToScreen())
                     {
-                        float size = 1.0f/cs->pixelSize(getPosition(),0.48f);
+                        double size = 1.0/cs->pixelSize(getPosition(),0.48);
 
-                        if (_autoScaleTransitionWidthRatio>0.0f)
+                        if (_autoScaleTransitionWidthRatio>0.0)
                         { 
-                            if (_minimumScale>0.0f)
+                            if (_minimumScale>0.0)
                             {
-                                float j = _minimumScale;
-                                float i = (_maximumScale<FLT_MAX) ? 
+                                double j = _minimumScale;
+                                double i = (_maximumScale<DBL_MAX) ? 
                                             _minimumScale+(_maximumScale-_minimumScale)*_autoScaleTransitionWidthRatio :
-                                            _minimumScale*(1.0f+_autoScaleTransitionWidthRatio);
-                                float c = 1.0f/(4.0f*(i-j));
-                                float b = 1.0f - 2.0f*c*i;
-                                float a = j + b*b / (4.0f*c);
-                                float k = -b / (2.0f*c);
+                                            _minimumScale*(1.0+_autoScaleTransitionWidthRatio);
+                                double c = 1.0/(4.0*(i-j));
+                                double b = 1.0 - 2.0*c*i;
+                                double a = j + b*b / (4.0*c);
+                                double k = -b / (2.0*c);
 
                                 if (size<k) size = _minimumScale;
                                 else if (size<i) size = a + b*size + c*(size*size);
                             }
 
-                            if (_maximumScale<FLT_MAX)
+                            if (_maximumScale<DBL_MAX)
                             {
-                                float n = _maximumScale;
-                                float m = (_minimumScale>0.0) ?
+                                double n = _maximumScale;
+                                double m = (_minimumScale>0.0) ?
                                             _maximumScale+(_minimumScale-_maximumScale)*_autoScaleTransitionWidthRatio :
-                                            _maximumScale*(1.0f-_autoScaleTransitionWidthRatio);
-                                float c = 1.0f / (4.0f*(m-n));
-                                float b = 1.0f - 2.0f*c*m;
-                                float a = n + b*b/(4.0f*c);
-                                float p = -b / (2.0f*c);
+                                            _maximumScale*(1.0-_autoScaleTransitionWidthRatio);
+                                double c = 1.0 / (4.0*(m-n));
+                                double b = 1.0 - 2.0*c*m;
+                                double a = n + b*b/(4.0*c);
+                                double p = -b / (2.0*c);
 
                                 if (size>p) size = _maximumScale;
                                 else if (size>m) size = a + b*size + c*(size*size);
@@ -230,9 +230,9 @@ void AutoTransform::accept(NodeVisitor& nv)
                     }
                     else if (_autoRotateMode==ROTATE_TO_CAMERA)
                     {
-                        osg::Vec3 PosToEye = _position - eyePoint;
+                        osg::Vec3d PosToEye = _position - eyePoint;
                         osg::Matrix lookto = osg::Matrix::lookAt(
-                            osg::Vec3(0,0,0), PosToEye, localUp);
+                            osg::Vec3d(0,0,0), PosToEye, localUp);
                         Quat q;
                         q.set(osg::Matrix::inverse(lookto));
                         setRotation(q);

src/osg/Geometry.cpp

@@ -3171,6 +3171,61 @@ void Geometry::copyToAndOptimize(Geometry& target)
     }
 }
 
+bool Geometry::containsSharedArrays() const
+{
+    unsigned int numSharedArrays = 0;
+    
+    if (getVertexArray() && getVertexArray()->referenceCount()>1) ++numSharedArrays;
+    if (getNormalArray() && getNormalArray()->referenceCount()>1) ++numSharedArrays;
+    if (getColorArray() && getColorArray()->referenceCount()>1) ++numSharedArrays;
+    if (getSecondaryColorArray() && getSecondaryColorArray()->referenceCount()>1) ++numSharedArrays;
+    if (getFogCoordArray() && getFogCoordArray()->referenceCount()>1) ++numSharedArrays;
+
+    for(unsigned int ti=0;ti<getNumTexCoordArrays();++ti)
+    {
+        if (getTexCoordArray(ti) && getTexCoordArray(ti)->referenceCount()>1) ++numSharedArrays;
+    }
+    
+    for(unsigned int vi=0;vi<_vertexAttribList.size();++vi)
+    {
+        const ArrayData& arrayData = _vertexAttribList[vi];
+        if (arrayData.array.valid() && arrayData.array->referenceCount()>1) ++numSharedArrays;
+    }
+    return numSharedArrays!=0;
+}
+
+void Geometry::duplicateSharedArrays()
+{
+    #define DUPLICATE_IF_REQUIRED(A) \
+        if (get##A() && get##A()->referenceCount()>1) \
+        { \
+            set##A(dynamic_cast<osg::Array*>(get##A()->clone(osg::CopyOp::DEEP_COPY_ARRAYS))); \
+        }
+
+    DUPLICATE_IF_REQUIRED(VertexArray)
+    DUPLICATE_IF_REQUIRED(NormalArray)
+    DUPLICATE_IF_REQUIRED(ColorArray)
+    DUPLICATE_IF_REQUIRED(SecondaryColorArray)
+    DUPLICATE_IF_REQUIRED(FogCoordArray)
+
+    for(unsigned int ti=0;ti<getNumTexCoordArrays();++ti)
+    {
+        if (getTexCoordArray(ti) && getTexCoordArray(ti)->referenceCount()>1)
+        {
+            setTexCoordArray(ti, dynamic_cast<osg::Array*>(getTexCoordArray(ti)->clone(osg::CopyOp::DEEP_COPY_ARRAYS)));
+        }
+    }
+    
+    for(unsigned int vi=0;vi<_vertexAttribList.size();++vi)
+    {
+        ArrayData& arrayData = _vertexAttribList[vi];
+        if (arrayData.array.valid() && arrayData.array->referenceCount()>1)
+        {
+            arrayData.array = dynamic_cast<osg::Array*>(arrayData.array->clone(osg::CopyOp::DEEP_COPY_ARRAYS));
+        }
+    }
+}
+
 void Geometry::computeInternalOptimizedGeometry()
 {
     if (suitableForOptimization())

src/osgPlugins/OpenFlight/ExportOptions.cpp

@@ -105,7 +105,9 @@ ExportOptions::ExportOptions( const osgDB::ReaderWriter::Options* opt )
   : _version( VERSION_16_1 ),
     _units( METERS ),
     _validate( false ),
-    _lightingDefault( true )
+    _lightingDefault( true ),
+    _stripTextureFilePath( false )
+    
 {
     if (opt)
     {

src/osgPlugins/OpenFlight/FltExportVisitor.cpp

@@ -256,22 +256,24 @@ FltExportVisitor::apply( osg::MatrixTransform& node )
             (*m) *= *rm;
     }
 
-    std::vector< osg::Referenced* > saveUserDataList;
+    typedef std::vector< osg::ref_ptr< osg::Referenced > > UserDataList;
+    
+    UserDataList saveUserDataList( node.getNumChildren() );
+
     unsigned int idx;
-    for( idx=0; idx<node.getNumChildren(); idx++ )
+    for( idx=0; idx<node.getNumChildren(); ++idx )
     {
-        saveUserDataList.push_back( node.getChild( idx )->getUserData() );
+        saveUserDataList[ idx ] = node.getChild( idx )->getUserData();
         node.getChild( idx )->setUserData( m.get() );
     }
 
     traverse( (osg::Node&)node );
 
     // Restore saved UserData.
-    unsigned int nd = node.getNumChildren();
-    while (nd--)
-        node.getChild( nd )->setUserData(
-            saveUserDataList[ nd ] );
-
+    for( idx=0; idx< node.getNumChildren(); ++idx )
+    {
+      node.getChild( idx )->setUserData( saveUserDataList[ idx ].get() );
+    }
 }
 
 void
@@ -280,27 +282,29 @@ FltExportVisitor::apply( osg::PositionAttitudeTransform& node )
     _firstNode = false;
     ScopedStatePushPop guard( this, node.getStateSet() );
 
-    osg::ref_ptr<osg::RefMatrix> m = new osg::RefMatrix;
+    osg::ref_ptr<osg::RefMatrix> m = new osg::RefMatrix(
+        osg::Matrix::translate( -node.getPivotPoint() ) *
+        osg::Matrix::scale( node.getScale() ) *
+        osg::Matrix::rotate( node.getAttitude() ) *
+        osg::Matrix::translate( node.getPosition() ) );
 
-    const osg::Vec3d& trans = node.getPosition();
-    const osg::Quat& rot = node.getAttitude();
-    m->set(osg::Matrix::translate(trans) * osg::Matrix::rotate(rot) );
+    typedef std::vector< osg::ref_ptr< osg::Referenced > > UserDataList;
+    UserDataList saveUserDataList( node.getNumChildren() );
 
-    std::vector< osg::Referenced* > saveUserDataList;
     unsigned int idx;
-    for( idx=0; idx<node.getNumChildren(); idx++ )
+    for( idx=0; idx<node.getNumChildren(); ++idx )
     {
-        saveUserDataList.push_back( node.getChild( idx )->getUserData() );
+        saveUserDataList[ idx ] = node.getChild( idx )->getUserData();
         node.getChild( idx )->setUserData( m.get() );
     }
 
     traverse( (osg::Node&)node );
 
     // Restore saved UserData.
-    unsigned int nd = node.getNumChildren();
-    while (nd--)
-        node.getChild( nd )->setUserData(
-            saveUserDataList[ nd ] );
+    for( idx=0; idx<node.getNumChildren(); ++idx )
+    {
+        node.getChild( idx )->setUserData( saveUserDataList[ idx ].get() );
+    }
 
 }
 

src/osgPlugins/ive/BlendEquation.cpp

@@ -0,0 +1,61 @@
+/**********************************************************************
+ *
+ *    FILE:            BlendEquation.cpp
+ *
+ *    DESCRIPTION:    Read/Write osg::BlendEquation in binary format to disk.
+ *
+ *    CREATED BY:        Auto generated by iveGenerated
+ *                    and later modified by Rune Schmidt Jensen.
+ *
+ *    HISTORY:        Created 21.3.2003
+ *
+ *    Copyright 2003 VR-C
+ **********************************************************************/
+
+#include "Exception.h"
+#include "BlendEquation.h"
+#include "Object.h"
+
+using namespace ive;
+
+void BlendEquation::write(DataOutputStream* out){
+
+    // Write BlendEquation's identification.
+    out->writeInt(IVEBLENDEQUATION);
+
+    // If the osg class is inherited by any other class we should also write this to file.
+    osg::Object*  obj = dynamic_cast<osg::Object*>(this);
+    if(obj){
+        ((ive::Object*)(obj))->write(out);
+    }
+    else
+        throw Exception("BlendEquation::write(): Could not cast this osg::BlendEquation to an osg::Object.");
+    // Write BlendEquation's properties.
+
+    // Write source
+    out->writeInt(getEquation());
+}
+
+void BlendEquation::read(DataInputStream* in){
+    // Peek on BlendEquation's identification.
+    int id = in->peekInt();
+    if(id == IVEBLENDEQUATION){
+        // Read BlendEquation's identification.
+        id = in->readInt();
+        // If the osg class is inherited by any other class we should also read this from file.
+        osg::Object*  obj = dynamic_cast<osg::Object*>(this);
+        if(obj){
+            ((ive::Object*)(obj))->read(in);
+        }
+        else
+            throw Exception("BlendEquation::read(): Could not cast this osg::BlendEquation to an osg::Object.");
+        // Read BlendEquation's properties
+
+        // Read source
+        setEquation(osg::BlendEquation::Equation(in->readInt()));
+
+    }
+    else{
+        throw Exception("BlendEquation::read(): Expected BlendEquation identification.");
+    }
+}

src/osgPlugins/ive/BlendEquation.h

@@ -0,0 +1,15 @@
+#ifndef IVE_BLENDEQUATION
+#define IVE_BLENDEQUATION 1
+
+#include <osg/BlendEquation>
+#include "ReadWrite.h"
+
+namespace ive{
+class BlendEquation : public osg::BlendEquation, public ReadWrite {
+public:
+	void write(DataOutputStream* out);
+	void read(DataInputStream* in);
+};
+}
+
+#endif

src/osgPlugins/ive/CMakeLists.txt

@@ -10,6 +10,7 @@ SET(TARGET_SRC
     AzimSector.cpp
     Billboard.cpp
     BlendColor.cpp
+    BlendEquation.cpp
     BlendFunc.cpp
     BlinkSequence.cpp
     Camera.cpp

src/osgPlugins/ive/DataInputStream.cpp

@@ -21,6 +21,7 @@
 #include "BlendColor.h"
 #include "Stencil.h"
 #include "BlendFunc.h"
+#include "BlendEquation.h"
 #include "Depth.h"
 #include "Material.h"
 #include "CullFace.h"
@@ -1097,6 +1098,10 @@ osg::StateAttribute* DataInputStream::readStateAttribute()
         attribute = new osg::BlendFunc();
         ((ive::BlendFunc*)(attribute))->read(this);
     }
+    else if(attributeID == IVEBLENDEQUATION){
+        attribute = new osg::BlendEquation();
+        ((ive::BlendEquation*)(attribute))->read(this);
+    }
     else if(attributeID == IVEDEPTH){
         attribute = new osg::Depth();
         ((ive::Depth*)(attribute))->read(this);

src/osgPlugins/ive/DataOutputStream.cpp

@@ -22,6 +22,7 @@
 #include "BlendColor.h"
 #include "Stencil.h"
 #include "BlendFunc.h"
+#include "BlendEquation.h"
 #include "Material.h"
 #include "CullFace.h"
 #include "ColorMask.h"
@@ -723,6 +724,9 @@ void DataOutputStream::writeStateAttribute(const osg::StateAttribute* attribute)
         else if(dynamic_cast<const osg::BlendFunc*>(attribute)){
             ((ive::BlendFunc*)(attribute))->write(this);
         }
+        else if(dynamic_cast<const osg::BlendEquation*>(attribute)){
+            ((ive::BlendEquation*)(attribute))->write(this);
+        }
         else if(dynamic_cast<const osg::Depth*>(attribute)){
             ((ive::Depth*)(attribute))->write(this);
         }

src/osgPlugins/ive/ReadWrite.h

@@ -72,6 +72,7 @@ namespace ive {
 #define IVESTENCIL                      0x00000131
 #define IVESTENCILTWOSIDED              0x00000132
 #define IVECOLORMASK                    0x00000133
+#define IVEBLENDEQUATION                0x00000134
 #define IVELIGHTMODEL                   0x00001121
 #define IVECLIPPLANE                    0x00001122
 #define IVEFRONTFACE                    0x00001123

src/osgPlugins/osg/BlendEquation.cpp

@@ -0,0 +1,84 @@
+#include "osg/BlendEquation"
+
+#include "osgDB/Registry"
+#include "osgDB/Input"
+#include "osgDB/Output"
+
+using namespace osg;
+using namespace osgDB;
+
+// forward declare functions to use later.
+bool BlendEquation_readLocalData(Object& obj, Input& fr);
+bool BlendEquation_writeLocalData(const Object& obj, Output& fw);
+
+bool BlendEquation_matchModeStr(const char* str,int& mode);
+const char* BlendEquation_getModeStr(int value);
+
+// register the read and write functions with the osgDB::Registry.
+RegisterDotOsgWrapperProxy g_BlendEquationProxy
+(
+    new osg::BlendEquation,
+    "BlendEquation",
+    "Object StateAttribute BlendEquation",
+    &BlendEquation_readLocalData,
+    &BlendEquation_writeLocalData
+);
+
+bool BlendEquation_readLocalData(Object& obj, Input& fr)
+{
+    bool iteratorAdvanced = false;
+
+    BlendEquation& transparency = static_cast<BlendEquation&>(obj);
+
+    int mode;
+    if (fr[0].matchWord("equation") && BlendEquation_matchModeStr(fr[1].getStr(),mode))
+    {
+        transparency.setEquation(osg::BlendEquation::Equation(mode));
+        fr+=2;
+        iteratorAdvanced = true;
+    }
+
+    return iteratorAdvanced;
+}
+
+bool BlendEquation_writeLocalData(const Object& obj, Output& fw)
+{
+    const BlendEquation& transparency = static_cast<const BlendEquation&>(obj);
+
+    fw.indent() << "equation " << BlendEquation_getModeStr(transparency.getEquation()) << std::endl;
+
+    return true;
+}
+
+
+
+bool BlendEquation_matchModeStr(const char* str,int& mode)
+{
+    if (strcmp(str,"RGBA_MIN")==0)                      mode = BlendEquation::RGBA_MIN;
+    else if (strcmp(str,"RGBA_MAX")==0)                 mode = BlendEquation::RGBA_MAX;
+    else if (strcmp(str,"ALPHA_MIN")==0)                mode = BlendEquation::ALPHA_MIN;
+    else if (strcmp(str,"ALPHA_MAX")==0)                mode = BlendEquation::ALPHA_MAX;
+    else if (strcmp(str,"LOGIC_OP")==0)                 mode = BlendEquation::LOGIC_OP;
+    else if (strcmp(str,"FUNC_ADD")==0)                 mode = BlendEquation::FUNC_ADD;
+    else if (strcmp(str,"FUNC_SUBTRACT")==0)            mode = BlendEquation::FUNC_SUBTRACT;
+    else if (strcmp(str,"FUNC_REVERSE_SUBTRACT")==0)    mode = BlendEquation::FUNC_REVERSE_SUBTRACT;
+    else return false;
+    return true;
+
+}
+const char* BlendEquation_getModeStr(int value)
+{
+    switch(value)
+    {
+        case(BlendEquation::RGBA_MIN) :                 return "RGBA_MIN";
+        case(BlendEquation::RGBA_MAX) :                 return "RGBA_MAX";
+        case(BlendEquation::ALPHA_MIN) :                return "ALPHA_MIN";
+        case(BlendEquation::ALPHA_MAX) :                return "ALPHA_MAX";
+        case(BlendEquation::LOGIC_OP) :                 return "LOGIC_OP";
+        case(BlendEquation::FUNC_ADD) :                 return "FUNC_ADD";
+        case(BlendEquation::FUNC_SUBTRACT) :            return "FUNC_SUBTRACT";
+        case(BlendEquation::FUNC_REVERSE_SUBTRACT) :    return "FUNC_REVERSE_SUBTRACT";
+    }
+
+    return NULL;
+}

src/osgPlugins/osg/CMakeLists.txt

@@ -8,6 +8,7 @@ AutoTransform.cpp
 Billboard.cpp
 BlendColor.cpp
 BlendFunc.cpp
+BlendEquation.cpp
 Camera.cpp
 CameraView.cpp
 ClearNode.cpp

src/osgSim/OverlayNode.cpp

@@ -922,6 +922,12 @@ void OverlayNode::setRenderTargetImplementation(osg::Camera::RenderTargetImpleme
     _renderTargetImpl = impl;
 
     init();
+    for(OverlayDataMap::const_iterator itr = _overlayDataMap.begin();
+      itr != _overlayDataMap.end();
+      ++itr)
+    {
+      itr->second->_camera->setRenderTargetImplementation(_renderTargetImpl);
+    }
 }
 
 OverlayNode::OverlayData* OverlayNode::getOverlayData(osgUtil::CullVisitor* cv)

src/osgUtil/Simplifier.cpp

@@ -1413,6 +1413,14 @@ void EdgeCollapse::setGeometry(osg::Geometry* geometry, const Simplifier::IndexL
         osg::notify(osg::INFO)<<"EdgeCollapse::setGeometry(..): Removing attribute indices"<<std::endl;
         _geometry->copyToAndOptimize(*_geometry);
     }
+    
+    // check to see if vertex attributes indices exists, if so expand them to remove them
+    if (_geometry->containsSharedArrays())
+    {
+        // removing coord indices
+        osg::notify(osg::INFO)<<"EdgeCollapse::setGeometry(..): Duplicate shared arrays"<<std::endl;
+        _geometry->duplicateSharedArrays();
+    }
 
     unsigned int numVertices = geometry->getVertexArray()->getNumElements();
         

src/osgWrappers/Doxyfile.template

@@ -0,0 +1,235 @@
+# Doxyfile 1.4.1
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME           = "OSG Introspection Wrappers"
+PROJECT_NUMBER         = 
+OUTPUT_DIRECTORY       = "$(OUTPUT_DIR)"
+CREATE_SUBDIRS         = NO
+OUTPUT_LANGUAGE        = English
+USE_WINDOWS_ENCODING   = YES
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = YES
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
+ALWAYS_DETAILED_SEC    = NO
+INLINE_INHERITED_MEMB  = NO
+FULL_PATH_NAMES        = YES
+STRIP_FROM_PATH        = "$(INPUT_DIR)"
+STRIP_FROM_INC_PATH    = 
+SHORT_NAMES            = NO
+JAVADOC_AUTOBRIEF      = YES
+MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP         = NO
+INHERIT_DOCS           = YES
+DISTRIBUTE_GROUP_DOC   = NO
+TAB_SIZE               = 8
+ALIASES                = 
+OPTIMIZE_OUTPUT_FOR_C  = NO
+OPTIMIZE_OUTPUT_JAVA   = NO
+SUBGROUPING            = YES
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL            = YES
+EXTRACT_PRIVATE        = YES
+EXTRACT_STATIC         = YES
+EXTRACT_LOCAL_CLASSES  = YES
+EXTRACT_LOCAL_METHODS  = NO
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = NO
+HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_IN_BODY_DOCS      = NO
+INTERNAL_DOCS          = NO
+CASE_SENSE_NAMES       = NO
+HIDE_SCOPE_NAMES       = NO
+SHOW_INCLUDE_FILES     = YES
+INLINE_INFO            = YES
+SORT_MEMBER_DOCS       = YES
+SORT_BRIEF_DOCS        = NO
+SORT_BY_SCOPE_NAME     = NO
+GENERATE_TODOLIST      = NO
+GENERATE_TESTLIST      = NO
+GENERATE_BUGLIST       = NO
+GENERATE_DEPRECATEDLIST= NO
+ENABLED_SECTIONS       = 
+MAX_INITIALIZER_LINES  = 30
+SHOW_USED_FILES        = YES
+SHOW_DIRECTORIES       = YES
+FILE_VERSION_FILTER    = 
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET                  = NO
+WARNINGS               = YES
+WARN_IF_UNDOCUMENTED   = YES
+WARN_IF_DOC_ERROR      = YES
+WARN_NO_PARAMDOC       = NO
+WARN_FORMAT            = "$file:$line: $text"
+WARN_LOGFILE           = 
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT                  = "$(INPUT_DIR)include"
+FILE_PATTERNS          = */include/*
+RECURSIVE              = YES
+EXCLUDE                = 
+EXCLUDE_SYMLINKS       = NO
+EXCLUDE_PATTERNS       = "*/include/osgIntrospection/*" "*/include/CVS/*" "*/include/osg*/CVS/*" "*.#*" "*/.svn/*"
+EXAMPLE_PATH           = 
+EXAMPLE_PATTERNS       = *
+EXAMPLE_RECURSIVE      = NO
+IMAGE_PATH             = 
+INPUT_FILTER           = 
+FILTER_PATTERNS        = 
+FILTER_SOURCE_FILES    = NO
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER         = NO
+INLINE_SOURCES         = NO
+STRIP_CODE_COMMENTS    = YES
+REFERENCED_BY_RELATION = NO
+REFERENCES_RELATION    = NO
+VERBATIM_HEADERS       = NO
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX     = NO
+COLS_IN_ALPHA_INDEX    = 5
+IGNORE_PREFIX          = 
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML          = NO
+HTML_OUTPUT            = html
+HTML_FILE_EXTENSION    = .html
+HTML_HEADER            = 
+HTML_FOOTER            = 
+HTML_STYLESHEET        = 
+HTML_ALIGN_MEMBERS     = YES
+GENERATE_HTMLHELP      = NO
+CHM_FILE               = 
+HHC_LOCATION           = 
+GENERATE_CHI           = NO
+BINARY_TOC             = NO
+TOC_EXPAND             = NO
+DISABLE_INDEX          = NO
+ENUM_VALUES_PER_LINE   = 4
+GENERATE_TREEVIEW      = NO
+TREEVIEW_WIDTH         = 250
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX         = NO
+LATEX_OUTPUT           = latex
+LATEX_CMD_NAME         = latex
+MAKEINDEX_CMD_NAME     = makeindex
+COMPACT_LATEX          = NO
+PAPER_TYPE             = a4wide
+EXTRA_PACKAGES         = 
+LATEX_HEADER           = 
+PDF_HYPERLINKS         = NO
+USE_PDFLATEX           = NO
+LATEX_BATCHMODE        = NO
+LATEX_HIDE_INDICES     = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF           = NO
+RTF_OUTPUT             = rtf
+COMPACT_RTF            = NO
+RTF_HYPERLINKS         = NO
+RTF_STYLESHEET_FILE    = 
+RTF_EXTENSIONS_FILE    = 
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN           = NO
+MAN_OUTPUT             = man
+MAN_EXTENSION          = .3
+MAN_LINKS              = NO
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML           = YES
+XML_OUTPUT             = xml
+XML_SCHEMA             = 
+XML_DTD                = 
+XML_PROGRAMLISTING     = YES
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF   = NO
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD       = NO
+PERLMOD_LATEX          = NO
+PERLMOD_PRETTY         = YES
+PERLMOD_MAKEVAR_PREFIX = 
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION        = YES
+EXPAND_ONLY_PREDEF     = YES
+SEARCH_INCLUDES        = YES
+INCLUDE_PATH           = "$(INPUT_DIR)include"
+INCLUDE_FILE_PATTERNS  = 
+EXPAND_AS_DEFINED      = META_Object \
+                         META_StateAttribute \
+                         META_Node \
+                         META_Shape \
+                         META_Technique \
+                         META_Effect
+PREDEFINED             = 
+SKIP_FUNCTION_MACROS   = YES
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references   
+#---------------------------------------------------------------------------
+TAGFILES               = 
+GENERATE_TAGFILE       = 
+ALLEXTERNALS           = NO
+EXTERNAL_GROUPS        = YES
+PERL_PATH              = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS         = NO
+HIDE_UNDOC_RELATIONS   = YES
+HAVE_DOT               = NO
+CLASS_GRAPH            = YES
+COLLABORATION_GRAPH    = YES
+GROUP_GRAPHS           = YES
+UML_LOOK               = NO
+TEMPLATE_RELATIONS     = NO
+INCLUDE_GRAPH          = YES
+INCLUDED_BY_GRAPH      = YES
+CALL_GRAPH             = NO
+GRAPHICAL_HIERARCHY    = YES
+DIRECTORY_GRAPH        = YES
+DOT_IMAGE_FORMAT       = png
+DOT_PATH               = 
+DOTFILE_DIRS           = 
+MAX_DOT_GRAPH_WIDTH    = 1024
+MAX_DOT_GRAPH_HEIGHT   = 1024
+MAX_DOT_GRAPH_DEPTH    = 1000
+DOT_TRANSPARENT        = NO
+DOT_MULTI_TARGETS      = NO
+GENERATE_LEGEND        = YES
+DOT_CLEANUP            = YES
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine   
+#---------------------------------------------------------------------------
+SEARCHENGINE           = NO

src/osgWrappers/OpenThreads/Thread.cpp

@@ -1,211 +1,211 @@
-// ***************************************************************************
-//
-//   Generated automatically by genwrapper.
-//   Please DO NOT EDIT this file!
-//
-// ***************************************************************************
-
-#include <osgIntrospection/ReflectionMacros>
-#include <osgIntrospection/TypedMethodInfo>
-#include <osgIntrospection/StaticMethodInfo>
-#include <osgIntrospection/Attributes>
-
-#include <OpenThreads/Thread>
-
-// Must undefine IN and OUT macros defined in Windows headers
-#ifdef IN
-#undef IN
-#endif
-#ifdef OUT
-#undef OUT
-#endif
-
-BEGIN_ENUM_REFLECTOR(OpenThreads::Thread::ThreadPriority)
-	I_DeclaringFile("OpenThreads/Thread");
-	I_EnumLabel(OpenThreads::Thread::THREAD_PRIORITY_MAX);
-	I_EnumLabel(OpenThreads::Thread::THREAD_PRIORITY_HIGH);
-	I_EnumLabel(OpenThreads::Thread::THREAD_PRIORITY_NOMINAL);
-	I_EnumLabel(OpenThreads::Thread::THREAD_PRIORITY_LOW);
-	I_EnumLabel(OpenThreads::Thread::THREAD_PRIORITY_MIN);
-	I_EnumLabel(OpenThreads::Thread::THREAD_PRIORITY_DEFAULT);
-END_REFLECTOR
-
-BEGIN_ENUM_REFLECTOR(OpenThreads::Thread::ThreadPolicy)
-	I_DeclaringFile("OpenThreads/Thread");
-	I_EnumLabel(OpenThreads::Thread::THREAD_SCHEDULE_FIFO);
-	I_EnumLabel(OpenThreads::Thread::THREAD_SCHEDULE_ROUND_ROBIN);
-	I_EnumLabel(OpenThreads::Thread::THREAD_SCHEDULE_TIME_SHARE);
-	I_EnumLabel(OpenThreads::Thread::THREAD_SCHEDULE_DEFAULT);
-END_REFLECTOR
-
-BEGIN_ABSTRACT_OBJECT_REFLECTOR(OpenThreads::Thread)
-	I_DeclaringFile("OpenThreads/Thread");
-	I_Constructor0(____Thread,
-	               "Constructor. ",
-	               "");
-	I_Method0(int, getThreadId,
-	          Properties::NON_VIRTUAL,
-	          __int__getThreadId,
-	          "Get a unique thread id. ",
-	          "This id is monotonically increasing.a unique thread identifier  ");
-	I_Method0(size_t, getProcessId,
-	          Properties::NON_VIRTUAL,
-	          __size_t__getProcessId,
-	          "Get the thread's process id. ",
-	          "This is the pthread_t or pid_t value depending on the threading model being used.thread process id.  ");
-	I_Method0(int, start,
-	          Properties::NON_VIRTUAL,
-	          __int__start,
-	          "Start the thread. ",
-	          "This method will configure the thread, set it's priority, and spawn it.if the stack size specified setStackSize is smaller than the smallest allowable stack size, the threads stack size will be set to the minimum allowed, and may be retrieved via the getStackSize() 0 if normal, -1 if errno set, errno code otherwise.  ");
-	I_Method0(int, startThread,
-	          Properties::NON_VIRTUAL,
-	          __int__startThread,
-	          "",
-	          "");
-	I_Method0(int, testCancel,
-	          Properties::NON_VIRTUAL,
-	          __int__testCancel,
-	          "Test the cancel state of the thread. ",
-	          "If the thread has been canceled this method will cause the thread to exit now. This method operates on the calling thread.Returns 0 if normal, -1 if called from a thread other that this. ");
-	I_Method0(int, cancel,
-	          Properties::VIRTUAL,
-	          __int__cancel,
-	          "Cancel the thread. ",
-	          "Equivalent to SIGKILL.0 if normal, -1 if errno set, errno code otherwise.  ");
-	I_Method1(int, setSchedulePriority, IN, OpenThreads::Thread::ThreadPriority, priority,
-	          Properties::NON_VIRTUAL,
-	          __int__setSchedulePriority__ThreadPriority,
-	          "Set the thread's schedule priority. ",
-	          "This is a complex method. Beware of thread priorities when using a many-to-many kernel entity implemenation (such as IRIX pthreads). If one is not carefull to manage the thread priorities, a priority inversion deadlock can easily occur (Although the OpenThreads::Mutex & OpenThreads::Barrier constructs have been designed with this senario in mind). Unless you have explicit need to set the schedule pirorites for a given task, it is best to leave them alone.some implementations (notably LinuxThreads and IRIX Sprocs) only alow you to decrease thread priorities dynamically. Thus, a lower priority thread will not allow it's priority to be raised on the fly.seting the environment variable OUTPUT_THREADLIB_SCHEDULING_INFO will output scheduling information for each thread to stdout. 0 if normal, -1 if errno set, errno code otherwise.  ");
-	I_Method0(int, getSchedulePriority,
-	          Properties::NON_VIRTUAL,
-	          __int__getSchedulePriority,
-	          "Get the thread's schedule priority (if able). ",
-	          "seting the environment variable OUTPUT_THREADLIB_SCHEDULING_INFO will output scheduling information for each thread to stdout. 0 if normal, -1 if errno set, errno code otherwise.  ");
-	I_Method1(int, setSchedulePolicy, IN, OpenThreads::Thread::ThreadPolicy, policy,
-	          Properties::NON_VIRTUAL,
-	          __int__setSchedulePolicy__ThreadPolicy,
-	          "Set the thread's scheduling policy (if able). ",
-	          "On some implementations (notably IRIX Sprocs & LinuxThreads) The policy may prohibit the use of SCHEDULE_ROUND_ROBIN and SCHEDULE_FIFO policies - due to their real-time nature, and the danger of deadlocking the machine when used as super-user. In such cases, the command is a no-op.seting the environment variable OUTPUT_THREADLIB_SCHEDULING_INFO will output scheduling information for each thread to stdout. 0 if normal, -1 if errno set, errno code otherwise.  ");
-	I_Method0(int, getSchedulePolicy,
-	          Properties::NON_VIRTUAL,
-	          __int__getSchedulePolicy,
-	          "Get the thread's policy (if able). ",
-	          "seting the environment variable OUTPUT_THREADLIB_SCHEDULING_INFO will output scheduling information for each thread to stdout. policy if normal, -1 if errno set, errno code otherwise.  ");
-	I_Method1(int, setStackSize, IN, size_t, size,
-	          Properties::NON_VIRTUAL,
-	          __int__setStackSize__size_t,
-	          "Set the thread's desired stack size (in bytes). ",
-	          "This method is an attribute of the thread and must be called *before* the start() method is invoked.a return code of 13 (EACESS) means that the thread stack size can no longer be changed. 0 if normal, -1 if errno set, errno code otherwise.  ");
-	I_Method0(size_t, getStackSize,
-	          Properties::NON_VIRTUAL,
-	          __size_t__getStackSize,
-	          "Get the thread's desired stack size. ",
-	          "the thread's stack size. 0 indicates that the stack size has either not yet been initialized, or not yet been specified by the application.  ");
-	I_Method0(void, printSchedulingInfo,
-	          Properties::NON_VIRTUAL,
-	          __void__printSchedulingInfo,
-	          "Print the thread's scheduling information to stdout. ",
-	          "");
-	I_Method0(int, detach,
-	          Properties::NON_VIRTUAL,
-	          __int__detach,
-	          "Detach the thread from the calling process. ",
-	          "0 if normal, -1 if errno set, errno code otherwise.  ");
-	I_Method0(int, join,
-	          Properties::NON_VIRTUAL,
-	          __int__join,
-	          "Join the calling process with the thread. ",
-	          "0 if normal, -1 if errno set, errno code otherwise.  ");
-	I_Method0(int, setCancelModeDisable,
-	          Properties::NON_VIRTUAL,
-	          __int__setCancelModeDisable,
-	          "Disable thread cancelation altogether. ",
-	          "Thread::cancel() has no effect.0 if normal, -1 if errno set, errno code otherwise.  ");
-	I_Method0(int, setCancelModeAsynchronous,
-	          Properties::NON_VIRTUAL,
-	          __int__setCancelModeAsynchronous,
-	          "Mark the thread to cancel aysncronously on Thread::cancel(). ",
-	          "(May not be available with process-level implementations).0 if normal, -1 if errno set, errno code otherwise.  ");
-	I_Method0(int, setCancelModeDeferred,
-	          Properties::NON_VIRTUAL,
-	          __int__setCancelModeDeferred,
-	          "Mark the thread to cancel at the earliest convenience on Thread::cancel() (This is the default). ",
-	          "0 if normal, -1 if errno set, errno code otherwise.  ");
-	I_Method0(bool, isRunning,
-	          Properties::NON_VIRTUAL,
-	          __bool__isRunning,
-	          "Query the thread's running status. ",
-	          "true if running, false if not.  ");
-	I_Method0(void, run,
-	          Properties::PURE_VIRTUAL,
-	          __void__run,
-	          "Thread's run method. ",
-	          "Must be implemented by derived classes. This is where the action happens. ");
-	I_Method0(void, cancelCleanup,
-	          Properties::VIRTUAL,
-	          __void__cancelCleanup,
-	          "Thread's cancel cleanup routine, called upon cancel(), after the cancelation has taken place, but before the thread exits completely. ",
-	          "This method should be used to repair parts of the thread's data that may have been damaged by a pre-mature cancel. No-op by default. ");
-	I_Method0(void *, getImplementation,
-	          Properties::NON_VIRTUAL,
-	          __void_P1__getImplementation,
-	          "",
-	          "");
-	I_Method1(int, setProcessorAffinity, IN, unsigned int, cpunum,
-	          Properties::NON_VIRTUAL,
-	          __int__setProcessorAffinity__unsigned_int,
-	          "Thread's processor affinity method. ",
-	          "This binds a thread to a processor whenever possible. This call must be made before start() or startThread() and has no effect after the thread has been running. In the pthreads implementation, this is only implemented on sgi, through a pthread extension. On other pthread platforms this is ignored. Returns 0 on success, implementation's error on failure, or -1 if ignored. ");
-	I_StaticMethod1(int, SetConcurrency, IN, int, concurrencyLevel,
-	                __int__SetConcurrency__int_S,
-	                "Set the concurrency level for a running application. ",
-	                "This method only has effect if the pthreads thread model is being used, and then only when that model is many-to-one (eg. irix). in other cases it is ignored. The concurrency level is only a *hint* as to the number of execution vehicles to use, the actual implementation may do anything it wants. Setting the value to 0 returns things to their default state.previous concurrency level, -1 indicates no-op.  ");
-	I_StaticMethod0(int, GetConcurrency,
-	                __int__GetConcurrency_S,
-	                "Get the concurrency level for a running application. ",
-	                "In this case, a return code of 0 means that the application is in default mode. A return code of -1 means that the application is incapable of setting an arbitrary concurrency, because it is a one-to-one execution model (sprocs, linuxThreads) ");
-	I_StaticMethod0(OpenThreads::Thread *, CurrentThread,
-	                __Thread_P1__CurrentThread_S,
-	                "Return a pointer to the current running thread. ",
-	                "");
-	I_StaticMethod0(void, Init,
-	                __void__Init_S,
-	                "Initialize Threading in a program. ",
-	                "This method must be called before you can do any threading in a program. ");
-	I_StaticMethod0(int, YieldCurrentThread,
-	                __int__YieldCurrentThread_S,
-	                "Yield the processor. ",
-	                "This method operates on the calling process. And is equivalent to calling sched_yield(). 0 if normal, -1 if errno set, errno code otherwise.  ");
-	I_StaticMethod0(OpenThreads::Thread::ThreadPriority, GetMasterPriority,
-	                __ThreadPriority__GetMasterPriority_S,
-	                "This method will return the ThreadPriority of the master process. ",
-	                "(ie, the one calling the thread->start() methods for the first time) The method will almost certainly return Thread::THREAD_PRIORITY_DEFAULT if Init() has not been called.the Thread::ThreadPriority of the master thread.  ");
-	I_StaticMethod1(int, microSleep, IN, unsigned int, microsec,
-	                __int__microSleep__unsigned_int_S,
-	                "microSleep method, equivilant to the posix usleep(microsec). ",
-	                "This is not strictly thread API but is used so often with threads. It's basically UNIX usleep. Parameter is number of microseconds we current thread to sleep. Returns 0 on succes, non-zero on failure (UNIX errno or GetLastError() will give detailed description. ");
-	I_SimpleProperty(void *, Implementation, 
-	                 __void_P1__getImplementation, 
-	                 0);
-	I_SimpleProperty(size_t, ProcessId, 
-	                 __size_t__getProcessId, 
-	                 0);
-	I_SimpleProperty(unsigned int, ProcessorAffinity, 
-	                 0, 
-	                 __int__setProcessorAffinity__unsigned_int);
-	I_SimpleProperty(OpenThreads::Thread::ThreadPolicy, SchedulePolicy, 
-	                 0, 
-	                 __int__setSchedulePolicy__ThreadPolicy);
-	I_SimpleProperty(OpenThreads::Thread::ThreadPriority, SchedulePriority, 
-	                 0, 
-	                 __int__setSchedulePriority__ThreadPriority);
-	I_SimpleProperty(size_t, StackSize, 
-	                 __size_t__getStackSize, 
-	                 __int__setStackSize__size_t);
-	I_SimpleProperty(int, ThreadId, 
-	                 __int__getThreadId, 
-	                 0);
-END_REFLECTOR
-
+// ***************************************************************************
+//
+//   Generated automatically by genwrapper.
+//   Please DO NOT EDIT this file!
+//
+// ***************************************************************************
+
+#include <osgIntrospection/ReflectionMacros>
+#include <osgIntrospection/TypedMethodInfo>
+#include <osgIntrospection/StaticMethodInfo>
+#include <osgIntrospection/Attributes>
+
+#include <OpenThreads/Thread>
+
+// Must undefine IN and OUT macros defined in Windows headers
+#ifdef IN
+#undef IN
+#endif
+#ifdef OUT
+#undef OUT
+#endif
+
+BEGIN_ENUM_REFLECTOR(OpenThreads::Thread::ThreadPriority)
+	I_DeclaringFile("OpenThreads/Thread");
+	I_EnumLabel(OpenThreads::Thread::THREAD_PRIORITY_MAX);
+	I_EnumLabel(OpenThreads::Thread::THREAD_PRIORITY_HIGH);
+	I_EnumLabel(OpenThreads::Thread::THREAD_PRIORITY_NOMINAL);
+	I_EnumLabel(OpenThreads::Thread::THREAD_PRIORITY_LOW);
+	I_EnumLabel(OpenThreads::Thread::THREAD_PRIORITY_MIN);
+	I_EnumLabel(OpenThreads::Thread::THREAD_PRIORITY_DEFAULT);
+END_REFLECTOR
+
+BEGIN_ENUM_REFLECTOR(OpenThreads::Thread::ThreadPolicy)
+	I_DeclaringFile("OpenThreads/Thread");
+	I_EnumLabel(OpenThreads::Thread::THREAD_SCHEDULE_FIFO);
+	I_EnumLabel(OpenThreads::Thread::THREAD_SCHEDULE_ROUND_ROBIN);
+	I_EnumLabel(OpenThreads::Thread::THREAD_SCHEDULE_TIME_SHARE);
+	I_EnumLabel(OpenThreads::Thread::THREAD_SCHEDULE_DEFAULT);
+END_REFLECTOR
+
+BEGIN_ABSTRACT_OBJECT_REFLECTOR(OpenThreads::Thread)
+	I_DeclaringFile("OpenThreads/Thread");
+	I_StaticMethod1(int, SetConcurrency, IN, int, concurrencyLevel,
+	                __int__SetConcurrency__int_S,
+	                "Set the concurrency level for a running application. ",
+	                "This method only has effect if the pthreads thread model is being used, and then only when that model is many-to-one (eg. irix). in other cases it is ignored. The concurrency level is only a *hint* as to the number of execution vehicles to use, the actual implementation may do anything it wants. Setting the value to 0 returns things to their default state.previous concurrency level, -1 indicates no-op.  ");
+	I_StaticMethod0(int, GetConcurrency,
+	                __int__GetConcurrency_S,
+	                "Get the concurrency level for a running application. ",
+	                "In this case, a return code of 0 means that the application is in default mode. A return code of -1 means that the application is incapable of setting an arbitrary concurrency, because it is a one-to-one execution model (sprocs, linuxThreads) ");
+	I_StaticMethod0(OpenThreads::Thread *, CurrentThread,
+	                __Thread_P1__CurrentThread_S,
+	                "Return a pointer to the current running thread. ",
+	                "");
+	I_StaticMethod0(void, Init,
+	                __void__Init_S,
+	                "Initialize Threading in a program. ",
+	                "This method must be called before you can do any threading in a program. ");
+	I_StaticMethod0(int, YieldCurrentThread,
+	                __int__YieldCurrentThread_S,
+	                "Yield the processor. ",
+	                "This method operates on the calling process. And is equivalent to calling sched_yield(). 0 if normal, -1 if errno set, errno code otherwise.  ");
+	I_StaticMethod0(OpenThreads::Thread::ThreadPriority, GetMasterPriority,
+	                __ThreadPriority__GetMasterPriority_S,
+	                "This method will return the ThreadPriority of the master process. ",
+	                "(ie, the one calling the thread->start() methods for the first time) The method will almost certainly return Thread::THREAD_PRIORITY_DEFAULT if Init() has not been called.the Thread::ThreadPriority of the master thread.  ");
+	I_StaticMethod1(int, microSleep, IN, unsigned int, microsec,
+	                __int__microSleep__unsigned_int_S,
+	                "microSleep method, equivilant to the posix usleep(microsec). ",
+	                "This is not strictly thread API but is used so often with threads. It's basically UNIX usleep. Parameter is number of microseconds we current thread to sleep. Returns 0 on succes, non-zero on failure (UNIX errno or GetLastError() will give detailed description. ");
+	I_Constructor0(____Thread,
+	               "Constructor. ",
+	               "");
+	I_Method0(int, getThreadId,
+	          Properties::NON_VIRTUAL,
+	          __int__getThreadId,
+	          "Get a unique thread id. ",
+	          "This id is monotonically increasing.a unique thread identifier  ");
+	I_Method0(size_t, getProcessId,
+	          Properties::NON_VIRTUAL,
+	          __size_t__getProcessId,
+	          "Get the thread's process id. ",
+	          "This is the pthread_t or pid_t value depending on the threading model being used.thread process id.  ");
+	I_Method0(int, start,
+	          Properties::NON_VIRTUAL,
+	          __int__start,
+	          "Start the thread. ",
+	          "This method will configure the thread, set it's priority, and spawn it.if the stack size specified setStackSize is smaller than the smallest allowable stack size, the threads stack size will be set to the minimum allowed, and may be retrieved via the getStackSize() 0 if normal, -1 if errno set, errno code otherwise.  ");
+	I_Method0(int, startThread,
+	          Properties::NON_VIRTUAL,
+	          __int__startThread,
+	          "",
+	          "");
+	I_Method0(int, testCancel,
+	          Properties::NON_VIRTUAL,
+	          __int__testCancel,
+	          "Test the cancel state of the thread. ",
+	          "If the thread has been canceled this method will cause the thread to exit now. This method operates on the calling thread.Returns 0 if normal, -1 if called from a thread other that this. ");
+	I_Method0(int, cancel,
+	          Properties::VIRTUAL,
+	          __int__cancel,
+	          "Cancel the thread. ",
+	          "Equivalent to SIGKILL.0 if normal, -1 if errno set, errno code otherwise.  ");
+	I_Method1(int, setSchedulePriority, IN, OpenThreads::Thread::ThreadPriority, priority,
+	          Properties::NON_VIRTUAL,
+	          __int__setSchedulePriority__ThreadPriority,
+	          "Set the thread's schedule priority. ",
+	          "This is a complex method. Beware of thread priorities when using a many-to-many kernel entity implemenation (such as IRIX pthreads). If one is not carefull to manage the thread priorities, a priority inversion deadlock can easily occur (Although the OpenThreads::Mutex & OpenThreads::Barrier constructs have been designed with this senario in mind). Unless you have explicit need to set the schedule pirorites for a given task, it is best to leave them alone.some implementations (notably LinuxThreads and IRIX Sprocs) only alow you to decrease thread priorities dynamically. Thus, a lower priority thread will not allow it's priority to be raised on the fly.seting the environment variable OUTPUT_THREADLIB_SCHEDULING_INFO will output scheduling information for each thread to stdout. 0 if normal, -1 if errno set, errno code otherwise.  ");
+	I_Method0(int, getSchedulePriority,
+	          Properties::NON_VIRTUAL,
+	          __int__getSchedulePriority,
+	          "Get the thread's schedule priority (if able). ",
+	          "seting the environment variable OUTPUT_THREADLIB_SCHEDULING_INFO will output scheduling information for each thread to stdout. 0 if normal, -1 if errno set, errno code otherwise.  ");
+	I_Method1(int, setSchedulePolicy, IN, OpenThreads::Thread::ThreadPolicy, policy,
+	          Properties::NON_VIRTUAL,
+	          __int__setSchedulePolicy__ThreadPolicy,
+	          "Set the thread's scheduling policy (if able). ",
+	          "On some implementations (notably IRIX Sprocs & LinuxThreads) The policy may prohibit the use of SCHEDULE_ROUND_ROBIN and SCHEDULE_FIFO policies - due to their real-time nature, and the danger of deadlocking the machine when used as super-user. In such cases, the command is a no-op.seting the environment variable OUTPUT_THREADLIB_SCHEDULING_INFO will output scheduling information for each thread to stdout. 0 if normal, -1 if errno set, errno code otherwise.  ");
+	I_Method0(int, getSchedulePolicy,
+	          Properties::NON_VIRTUAL,
+	          __int__getSchedulePolicy,
+	          "Get the thread's policy (if able). ",
+	          "seting the environment variable OUTPUT_THREADLIB_SCHEDULING_INFO will output scheduling information for each thread to stdout. policy if normal, -1 if errno set, errno code otherwise.  ");
+	I_Method1(int, setStackSize, IN, size_t, size,
+	          Properties::NON_VIRTUAL,
+	          __int__setStackSize__size_t,
+	          "Set the thread's desired stack size (in bytes). ",
+	          "This method is an attribute of the thread and must be called *before* the start() method is invoked.a return code of 13 (EACESS) means that the thread stack size can no longer be changed. 0 if normal, -1 if errno set, errno code otherwise.  ");
+	I_Method0(size_t, getStackSize,
+	          Properties::NON_VIRTUAL,
+	          __size_t__getStackSize,
+	          "Get the thread's desired stack size. ",
+	          "the thread's stack size. 0 indicates that the stack size has either not yet been initialized, or not yet been specified by the application.  ");
+	I_Method0(void, printSchedulingInfo,
+	          Properties::NON_VIRTUAL,
+	          __void__printSchedulingInfo,
+	          "Print the thread's scheduling information to stdout. ",
+	          "");
+	I_Method0(int, detach,
+	          Properties::NON_VIRTUAL,
+	          __int__detach,
+	          "Detach the thread from the calling process. ",
+	          "0 if normal, -1 if errno set, errno code otherwise.  ");
+	I_Method0(int, join,
+	          Properties::NON_VIRTUAL,
+	          __int__join,
+	          "Join the calling process with the thread. ",
+	          "0 if normal, -1 if errno set, errno code otherwise.  ");
+	I_Method0(int, setCancelModeDisable,
+	          Properties::NON_VIRTUAL,
+	          __int__setCancelModeDisable,
+	          "Disable thread cancelation altogether. ",
+	          "Thread::cancel() has no effect.0 if normal, -1 if errno set, errno code otherwise.  ");
+	I_Method0(int, setCancelModeAsynchronous,
+	          Properties::NON_VIRTUAL,
+	          __int__setCancelModeAsynchronous,
+	          "Mark the thread to cancel aysncronously on Thread::cancel(). ",
+	          "(May not be available with process-level implementations).0 if normal, -1 if errno set, errno code otherwise.  ");
+	I_Method0(int, setCancelModeDeferred,
+	          Properties::NON_VIRTUAL,
+	          __int__setCancelModeDeferred,
+	          "Mark the thread to cancel at the earliest convenience on Thread::cancel() (This is the default). ",
+	          "0 if normal, -1 if errno set, errno code otherwise.  ");
+	I_Method0(bool, isRunning,
+	          Properties::NON_VIRTUAL,
+	          __bool__isRunning,
+	          "Query the thread's running status. ",
+	          "true if running, false if not.  ");
+	I_Method0(void, run,
+	          Properties::PURE_VIRTUAL,
+	          __void__run,
+	          "Thread's run method. ",
+	          "Must be implemented by derived classes. This is where the action happens. ");
+	I_Method0(void, cancelCleanup,
+	          Properties::VIRTUAL,
+	          __void__cancelCleanup,
+	          "Thread's cancel cleanup routine, called upon cancel(), after the cancelation has taken place, but before the thread exits completely. ",
+	          "This method should be used to repair parts of the thread's data that may have been damaged by a pre-mature cancel. No-op by default. ");
+	I_Method0(void *, getImplementation,
+	          Properties::NON_VIRTUAL,
+	          __void_P1__getImplementation,
+	          "",
+	          "");
+	I_Method1(int, setProcessorAffinity, IN, unsigned int, cpunum,
+	          Properties::NON_VIRTUAL,
+	          __int__setProcessorAffinity__unsigned_int,
+	          "Thread's processor affinity method. ",
+	          "This binds a thread to a processor whenever possible. This call must be made before start() or startThread() and has no effect after the thread has been running. In the pthreads implementation, this is only implemented on sgi, through a pthread extension. On other pthread platforms this is ignored. Returns 0 on success, implementation's error on failure, or -1 if ignored. ");
+	I_SimpleProperty(void *, Implementation, 
+	                 __void_P1__getImplementation, 
+	                 0);
+	I_SimpleProperty(size_t, ProcessId, 
+	                 __size_t__getProcessId, 
+	                 0);
+	I_SimpleProperty(unsigned int, ProcessorAffinity, 
+	                 0, 
+	                 __int__setProcessorAffinity__unsigned_int);
+	I_SimpleProperty(OpenThreads::Thread::ThreadPolicy, SchedulePolicy, 
+	                 0, 
+	                 __int__setSchedulePolicy__ThreadPolicy);
+	I_SimpleProperty(OpenThreads::Thread::ThreadPriority, SchedulePriority, 
+	                 0, 
+	                 __int__setSchedulePriority__ThreadPriority);
+	I_SimpleProperty(size_t, StackSize, 
+	                 __size_t__getStackSize, 
+	                 __int__setStackSize__size_t);
+	I_SimpleProperty(int, ThreadId, 
+	                 __int__getThreadId, 
+	                 0);
+END_REFLECTOR
+

src/osgWrappers/osg/AlphaFunc.cpp

@@ -55,7 +55,7 @@ BEGIN_OBJECT_REFLECTOR(osg::AlphaFunc)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -85,7 +85,7 @@ BEGIN_OBJECT_REFLECTOR(osg::AlphaFunc)
 	          __int__compare__C5_StateAttribute_R1,
 	          "Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ",
 	          "");
-	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage,
+	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x,
 	          Properties::VIRTUAL,
 	          __bool__getModeUsage__StateAttribute_ModeUsage_R1,
 	          "Return the modes associated with this StateAttribute. ",
@@ -115,7 +115,7 @@ BEGIN_OBJECT_REFLECTOR(osg::AlphaFunc)
 	          __float__getReferenceValue,
 	          "",
 	          "");
-	I_Method1(void, apply, IN, osg::State &, state,
+	I_Method1(void, apply, IN, osg::State &, x,
 	          Properties::VIRTUAL,
 	          __void__apply__State_R1,
 	          "apply the OpenGL state attributes. ",

src/osgWrappers/osg/AnimationPath.cpp

@@ -28,8 +28,6 @@
 #undef OUT
 #endif
 
-TYPE_NAME_ALIAS(std::map< double COMMA  osg::AnimationPath::ControlPoint >, osg::AnimationPath::TimeControlPointMap)
-
 BEGIN_ENUM_REFLECTOR(osg::AnimationPath::LoopMode)
 	I_DeclaringFile("osg/AnimationPath");
 	I_EnumLabel(osg::AnimationPath::SWING);
@@ -37,6 +35,8 @@ BEGIN_ENUM_REFLECTOR(osg::AnimationPath::LoopMode)
 	I_EnumLabel(osg::AnimationPath::NO_LOOPING);
 END_REFLECTOR
 
+TYPE_NAME_ALIAS(std::map< double COMMA  osg::AnimationPath::ControlPoint >, osg::AnimationPath::TimeControlPointMap)
+
 BEGIN_OBJECT_REFLECTOR(osg::AnimationPath)
 	I_DeclaringFile("osg/AnimationPath");
 	I_VirtualBaseType(osg::Object);
@@ -52,7 +52,7 @@ BEGIN_OBJECT_REFLECTOR(osg::AnimationPath)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an object, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an object, with Object* return type. ",
@@ -288,7 +288,7 @@ BEGIN_OBJECT_REFLECTOR(osg::AnimationPathCallback)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an object, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an object, with Object* return type. ",

src/osgWrappers/osg/ApplicationUsage.cpp

@@ -20,8 +20,6 @@
 #undef OUT
 #endif
 
-TYPE_NAME_ALIAS(std::map< std::string COMMA  std::string >, osg::ApplicationUsage::UsageMap)
-
 BEGIN_ENUM_REFLECTOR(osg::ApplicationUsage::Type)
 	I_DeclaringFile("osg/ApplicationUsage");
 	I_EnumLabel(osg::ApplicationUsage::NO_HELP);
@@ -31,9 +29,15 @@ BEGIN_ENUM_REFLECTOR(osg::ApplicationUsage::Type)
 	I_EnumLabel(osg::ApplicationUsage::HELP_ALL);
 END_REFLECTOR
 
+TYPE_NAME_ALIAS(std::map< std::string COMMA  std::string >, osg::ApplicationUsage::UsageMap)
+
 BEGIN_OBJECT_REFLECTOR(osg::ApplicationUsage)
 	I_DeclaringFile("osg/ApplicationUsage");
 	I_BaseType(osg::Referenced);
+	I_StaticMethod0(osg::ApplicationUsage *, instance,
+	                __ApplicationUsage_P1__instance_S,
+	                "",
+	                "");
 	I_Constructor0(____ApplicationUsage,
 	               "",
 	               "");
@@ -162,10 +166,6 @@ BEGIN_OBJECT_REFLECTOR(osg::ApplicationUsage)
 	          __void__writeEnvironmentSettings__std_ostream_R1,
 	          "",
 	          "");
-	I_StaticMethod0(osg::ApplicationUsage *, instance,
-	                __ApplicationUsage_P1__instance_S,
-	                "",
-	                "");
 	I_SimpleProperty(const std::string &, ApplicationName, 
 	                 __C5_std_string_R1__getApplicationName, 
 	                 __void__setApplicationName__C5_std_string_R1);

src/osgWrappers/osg/ArgumentParser.cpp

@@ -21,16 +21,32 @@
 #undef OUT
 #endif
 
-TYPE_NAME_ALIAS(std::map< std::string COMMA  osg::ArgumentParser::ErrorSeverity >, osg::ArgumentParser::ErrorMessageMap)
-
 BEGIN_ENUM_REFLECTOR(osg::ArgumentParser::ErrorSeverity)
 	I_DeclaringFile("osg/ArgumentParser");
 	I_EnumLabel(osg::ArgumentParser::BENIGN);
 	I_EnumLabel(osg::ArgumentParser::CRITICAL);
 END_REFLECTOR
 
+TYPE_NAME_ALIAS(std::map< std::string COMMA  osg::ArgumentParser::ErrorSeverity >, osg::ArgumentParser::ErrorMessageMap)
+
 BEGIN_VALUE_REFLECTOR(osg::ArgumentParser)
 	I_DeclaringFile("osg/ArgumentParser");
+	I_StaticMethod1(bool, isOption, IN, const char *, str,
+	                __bool__isOption__C5_char_P1_S,
+	                "Return true if the specified string is an option in the form -option or --option. ",
+	                "");
+	I_StaticMethod1(bool, isString, IN, const char *, str,
+	                __bool__isString__C5_char_P1_S,
+	                "Return true if string is non-NULL and not an option in the form -option or --option. ",
+	                "");
+	I_StaticMethod1(bool, isNumber, IN, const char *, str,
+	                __bool__isNumber__C5_char_P1_S,
+	                "Return true if specified parameter is a number. ",
+	                "");
+	I_StaticMethod1(bool, isBool, IN, const char *, str,
+	                __bool__isBool__C5_char_P1_S,
+	                "Return true if specified parameter is a bool. ",
+	                "");
 	I_Constructor2(IN, int *, argc, IN, char **, argv,
 	               ____ArgumentParser__int_P1__char_P1P1,
 	               "",
@@ -225,22 +241,6 @@ BEGIN_VALUE_REFLECTOR(osg::ArgumentParser)
 	          __ApplicationUsage_Type__readHelpType,
 	          "This convinience method handles help requests on the command line. ",
 	          "Return the type(s) of help requested. The return value of this function is suitable for passing into getApplicationUsage()->write(). If ApplicationUsage::NO_HELP is returned then no help commandline option was found on the command line. ");
-	I_StaticMethod1(bool, isOption, IN, const char *, str,
-	                __bool__isOption__C5_char_P1_S,
-	                "Return true if the specified string is an option in the form -option or --option. ",
-	                "");
-	I_StaticMethod1(bool, isString, IN, const char *, str,
-	                __bool__isString__C5_char_P1_S,
-	                "Return true if string is non-NULL and not an option in the form -option or --option. ",
-	                "");
-	I_StaticMethod1(bool, isNumber, IN, const char *, str,
-	                __bool__isNumber__C5_char_P1_S,
-	                "Return true if specified parameter is a number. ",
-	                "");
-	I_StaticMethod1(bool, isBool, IN, const char *, str,
-	                __bool__isBool__C5_char_P1_S,
-	                "Return true if specified parameter is a bool. ",
-	                "");
 	I_SimpleProperty(std::string, ApplicationName, 
 	                 __std_string__getApplicationName, 
 	                 0);

src/osgWrappers/osg/AutoTransform.cpp

@@ -17,7 +17,7 @@
 #include <osg/NodeVisitor>
 #include <osg/Object>
 #include <osg/Quat>
-#include <osg/Vec3>
+#include <osg/Vec3d>
 
 // Must undefine IN and OUT macros defined in Windows headers
 #ifdef IN
@@ -84,14 +84,14 @@ BEGIN_OBJECT_REFLECTOR(osg::AutoTransform)
 	          __C5_AutoTransform_P1__asAutoTransform,
 	          "",
 	          "");
-	I_Method1(void, setPosition, IN, const osg::Vec3 &, pos,
+	I_Method1(void, setPosition, IN, const osg::Vec3d &, pos,
 	          Properties::NON_VIRTUAL,
-	          __void__setPosition__C5_Vec3_R1,
+	          __void__setPosition__C5_Vec3d_R1,
 	          "",
 	          "");
-	I_Method0(const osg::Vec3 &, getPosition,
+	I_Method0(const osg::Vec3d &, getPosition,
 	          Properties::NON_VIRTUAL,
-	          __C5_Vec3_R1__getPosition,
+	          __C5_Vec3d_R1__getPosition,
 	          "",
 	          "");
 	I_Method1(void, setRotation, IN, const osg::Quat &, quat,
@@ -104,49 +104,49 @@ BEGIN_OBJECT_REFLECTOR(osg::AutoTransform)
 	          __C5_Quat_R1__getRotation,
 	          "",
 	          "");
-	I_Method1(void, setScale, IN, float, scale,
+	I_Method1(void, setScale, IN, double, scale,
 	          Properties::NON_VIRTUAL,
-	          __void__setScale__float,
+	          __void__setScale__double,
 	          "",
 	          "");
-	I_Method1(void, setScale, IN, const osg::Vec3 &, scale,
+	I_Method1(void, setScale, IN, const osg::Vec3d &, scale,
 	          Properties::NON_VIRTUAL,
-	          __void__setScale__C5_Vec3_R1,
+	          __void__setScale__C5_Vec3d_R1,
 	          "",
 	          "");
-	I_Method0(const osg::Vec3 &, getScale,
+	I_Method0(const osg::Vec3d &, getScale,
 	          Properties::NON_VIRTUAL,
-	          __C5_Vec3_R1__getScale,
+	          __C5_Vec3d_R1__getScale,
 	          "",
 	          "");
-	I_Method1(void, setMinimumScale, IN, float, minimumScale,
+	I_Method1(void, setMinimumScale, IN, double, minimumScale,
 	          Properties::NON_VIRTUAL,
-	          __void__setMinimumScale__float,
+	          __void__setMinimumScale__double,
 	          "",
 	          "");
-	I_Method0(float, getMinimumScale,
+	I_Method0(double, getMinimumScale,
 	          Properties::NON_VIRTUAL,
-	          __float__getMinimumScale,
+	          __double__getMinimumScale,
 	          "",
 	          "");
-	I_Method1(void, setMaximumScale, IN, float, maximumScale,
+	I_Method1(void, setMaximumScale, IN, double, maximumScale,
 	          Properties::NON_VIRTUAL,
-	          __void__setMaximumScale__float,
+	          __void__setMaximumScale__double,
 	          "",
 	          "");
-	I_Method0(float, getMaximumScale,
+	I_Method0(double, getMaximumScale,
 	          Properties::NON_VIRTUAL,
-	          __float__getMaximumScale,
+	          __double__getMaximumScale,
 	          "",
 	          "");
-	I_Method1(void, setPivotPoint, IN, const osg::Vec3 &, pivot,
+	I_Method1(void, setPivotPoint, IN, const osg::Vec3d &, pivot,
 	          Properties::NON_VIRTUAL,
-	          __void__setPivotPoint__C5_Vec3_R1,
+	          __void__setPivotPoint__C5_Vec3d_R1,
 	          "",
 	          "");
-	I_Method0(const osg::Vec3 &, getPivotPoint,
+	I_Method0(const osg::Vec3d &, getPivotPoint,
 	          Properties::NON_VIRTUAL,
-	          __C5_Vec3_R1__getPivotPoint,
+	          __C5_Vec3d_R1__getPivotPoint,
 	          "",
 	          "");
 	I_Method1(void, setAutoUpdateEyeMovementTolerance, IN, float, tolerance,
@@ -222,23 +222,23 @@ BEGIN_OBJECT_REFLECTOR(osg::AutoTransform)
 	I_SimpleProperty(float, AutoUpdateEyeMovementTolerance, 
 	                 __float__getAutoUpdateEyeMovementTolerance, 
 	                 __void__setAutoUpdateEyeMovementTolerance__float);
-	I_SimpleProperty(float, MaximumScale, 
-	                 __float__getMaximumScale, 
-	                 __void__setMaximumScale__float);
-	I_SimpleProperty(float, MinimumScale, 
-	                 __float__getMinimumScale, 
-	                 __void__setMinimumScale__float);
-	I_SimpleProperty(const osg::Vec3 &, PivotPoint, 
-	                 __C5_Vec3_R1__getPivotPoint, 
-	                 __void__setPivotPoint__C5_Vec3_R1);
-	I_SimpleProperty(const osg::Vec3 &, Position, 
-	                 __C5_Vec3_R1__getPosition, 
-	                 __void__setPosition__C5_Vec3_R1);
+	I_SimpleProperty(double, MaximumScale, 
+	                 __double__getMaximumScale, 
+	                 __void__setMaximumScale__double);
+	I_SimpleProperty(double, MinimumScale, 
+	                 __double__getMinimumScale, 
+	                 __void__setMinimumScale__double);
+	I_SimpleProperty(const osg::Vec3d &, PivotPoint, 
+	                 __C5_Vec3d_R1__getPivotPoint, 
+	                 __void__setPivotPoint__C5_Vec3d_R1);
+	I_SimpleProperty(const osg::Vec3d &, Position, 
+	                 __C5_Vec3d_R1__getPosition, 
+	                 __void__setPosition__C5_Vec3d_R1);
 	I_SimpleProperty(const osg::Quat &, Rotation, 
 	                 __C5_Quat_R1__getRotation, 
 	                 __void__setRotation__C5_Quat_R1);
-	I_SimpleProperty(const osg::Vec3 &, Scale, 
-	                 __C5_Vec3_R1__getScale, 
-	                 __void__setScale__C5_Vec3_R1);
+	I_SimpleProperty(const osg::Vec3d &, Scale, 
+	                 __C5_Vec3d_R1__getScale, 
+	                 __void__setScale__C5_Vec3d_R1);
 END_REFLECTOR
 

src/osgWrappers/osg/Billboard.cpp

@@ -27,8 +27,6 @@
 #undef OUT
 #endif
 
-TYPE_NAME_ALIAS(std::vector< osg::Vec3 >, osg::Billboard::PositionList)
-
 BEGIN_ENUM_REFLECTOR(osg::Billboard::Mode)
 	I_DeclaringFile("osg/Billboard");
 	I_EnumLabel(osg::Billboard::POINT_ROT_EYE);
@@ -36,6 +34,8 @@ BEGIN_ENUM_REFLECTOR(osg::Billboard::Mode)
 	I_EnumLabel(osg::Billboard::AXIAL_ROT);
 END_REFLECTOR
 
+TYPE_NAME_ALIAS(std::vector< osg::Vec3 >, osg::Billboard::PositionList)
+
 BEGIN_OBJECT_REFLECTOR(osg::Billboard)
 	I_DeclaringFile("osg/Billboard");
 	I_BaseType(osg::Geode);

src/osgWrappers/osg/BlendColor.cpp

@@ -45,7 +45,7 @@ BEGIN_OBJECT_REFLECTOR(osg::BlendColor)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -75,7 +75,7 @@ BEGIN_OBJECT_REFLECTOR(osg::BlendColor)
 	          __int__compare__C5_StateAttribute_R1,
 	          "Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ",
 	          "");
-	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage,
+	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x,
 	          Properties::VIRTUAL,
 	          __bool__getModeUsage__StateAttribute_ModeUsage_R1,
 	          "Return the modes associated with this StateAttribute. ",
@@ -95,7 +95,7 @@ BEGIN_OBJECT_REFLECTOR(osg::BlendColor)
 	          __C5_osg_Vec4_R1__getConstantColor,
 	          "",
 	          "");
-	I_Method1(void, apply, IN, osg::State &, state,
+	I_Method1(void, apply, IN, osg::State &, x,
 	          Properties::VIRTUAL,
 	          __void__apply__State_R1,
 	          "apply the OpenGL state attributes. ",

src/osgWrappers/osg/BlendEquation.cpp

@@ -56,7 +56,7 @@ BEGIN_OBJECT_REFLECTOR(osg::BlendEquation)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -86,7 +86,7 @@ BEGIN_OBJECT_REFLECTOR(osg::BlendEquation)
 	          __int__compare__C5_StateAttribute_R1,
 	          "Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ",
 	          "");
-	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage,
+	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x,
 	          Properties::VIRTUAL,
 	          __bool__getModeUsage__StateAttribute_ModeUsage_R1,
 	          "Return the modes associated with this StateAttribute. ",
@@ -101,7 +101,7 @@ BEGIN_OBJECT_REFLECTOR(osg::BlendEquation)
 	          __Equation__getEquation,
 	          "",
 	          "");
-	I_Method1(void, apply, IN, osg::State &, state,
+	I_Method1(void, apply, IN, osg::State &, x,
 	          Properties::VIRTUAL,
 	          __void__apply__State_R1,
 	          "apply the OpenGL state attributes. ",

src/osgWrappers/osg/BlendFunc.cpp

@@ -66,7 +66,7 @@ BEGIN_OBJECT_REFLECTOR(osg::BlendFunc)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -96,7 +96,7 @@ BEGIN_OBJECT_REFLECTOR(osg::BlendFunc)
 	          __int__compare__C5_StateAttribute_R1,
 	          "Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ",
 	          "");
-	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage,
+	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x,
 	          Properties::VIRTUAL,
 	          __bool__getModeUsage__StateAttribute_ModeUsage_R1,
 	          "Return the modes associated with this StateAttribute. ",
@@ -171,7 +171,7 @@ BEGIN_OBJECT_REFLECTOR(osg::BlendFunc)
 	          __GLenum__getDestinationAlpha,
 	          "",
 	          "");
-	I_Method1(void, apply, IN, osg::State &, state,
+	I_Method1(void, apply, IN, osg::State &, x,
 	          Properties::VIRTUAL,
 	          __void__apply__State_R1,
 	          "apply the OpenGL state attributes. ",

src/osgWrappers/osg/BoundingBox.cpp

@@ -21,9 +21,9 @@
 #undef OUT
 #endif
 
-TYPE_NAME_ALIAS(osg::Vec3f, osg::BoundingBox::vec_type)
+TYPE_NAME_ALIAS(osg::Vec3d, osg::BoundingBox::vec_type)
 
-TYPE_NAME_ALIAS(float, osg::BoundingBox::value_type)
+TYPE_NAME_ALIAS(double, osg::BoundingBox::value_type)
 
 BEGIN_VALUE_REFLECTOR(osg::BoundingBox)
 	I_DeclaringFile("osg/BoundingBox");

src/osgWrappers/osg/BoundingSphere.cpp

@@ -23,9 +23,9 @@
 #undef OUT
 #endif
 
-TYPE_NAME_ALIAS(osg::Vec3f, osg::BoundingSphere::vec_type)
+TYPE_NAME_ALIAS(osg::Vec3d, osg::BoundingSphere::vec_type)
 
-TYPE_NAME_ALIAS(float, osg::BoundingSphere::value_type)
+TYPE_NAME_ALIAS(double, osg::BoundingSphere::value_type)
 
 BEGIN_VALUE_REFLECTOR(osg::BoundingSphere)
 	I_DeclaringFile("osg/BoundingSphere");

src/osgWrappers/osg/BufferObject.cpp

@@ -270,7 +270,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ElementBufferObject)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an object, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an object, with Object* return type. ",
@@ -355,7 +355,7 @@ BEGIN_OBJECT_REFLECTOR(osg::PixelBufferObject)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an object, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an object, with Object* return type. ",
@@ -429,7 +429,7 @@ BEGIN_OBJECT_REFLECTOR(osg::VertexBufferObject)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an object, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an object, with Object* return type. ",

src/osgWrappers/osg/Camera.cpp

@@ -43,8 +43,6 @@
 #undef OUT
 #endif
 
-TYPE_NAME_ALIAS(std::map< osg::Camera::BufferComponent COMMA  osg::Camera::Attachment >, osg::Camera::BufferAttachmentMap)
-
 BEGIN_ENUM_REFLECTOR(osg::Camera::TransformOrder)
 	I_DeclaringFile("osg/Camera");
 	I_EnumLabel(osg::Camera::PRE_MULTIPLY);
@@ -97,6 +95,8 @@ BEGIN_ENUM_REFLECTOR(osg::Camera::BufferComponent)
 	I_EnumLabel(osg::Camera::COLOR_BUFFER15);
 END_REFLECTOR
 
+TYPE_NAME_ALIAS(std::map< osg::Camera::BufferComponent COMMA  osg::Camera::Attachment >, osg::Camera::BufferAttachmentMap)
+
 BEGIN_OBJECT_REFLECTOR(osg::Camera)
 	I_DeclaringFile("osg/Camera");
 	I_BaseType(osg::Transform);
@@ -786,7 +786,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Camera::DrawCallback)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an object, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an object, with Object* return type. ",

src/osgWrappers/osg/ClampColor.cpp

@@ -43,7 +43,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ClampColor)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -103,7 +103,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ClampColor)
 	          __GLenum__getClampReadColor,
 	          "",
 	          "");
-	I_Method1(void, apply, IN, osg::State &, state,
+	I_Method1(void, apply, IN, osg::State &, x,
 	          Properties::VIRTUAL,
 	          __void__apply__State_R1,
 	          "apply the OpenGL state attributes. ",

src/osgWrappers/osg/ClipPlane.cpp

@@ -58,7 +58,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ClipPlane)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -93,7 +93,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ClipPlane)
 	          __unsigned_int__getMember,
 	          "Return the member identifier within the attribute's class type. ",
 	          "Used for light number/clip plane number etc. ");
-	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage,
+	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x,
 	          Properties::VIRTUAL,
 	          __bool__getModeUsage__StateAttribute_ModeUsage_R1,
 	          "Return the modes associated with this StateAttribute. ",

src/osgWrappers/osg/ClusterCullingCallback.cpp

@@ -53,7 +53,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ClusterCullingCallback)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an object, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an object, with Object* return type. ",

src/osgWrappers/osg/CollectOccludersVisitor.cpp

@@ -46,17 +46,17 @@ BEGIN_OBJECT_REFLECTOR(osg::CollectOccludersVisitor)
 	          __void__reset,
 	          "",
 	          "");
-	I_Method2(float, getDistanceToEyePoint, IN, const osg::Vec3 &, pos, IN, bool, withLODScale,
+	I_Method2(float, getDistanceToEyePoint, IN, const osg::Vec3 &, x, IN, bool, x,
 	          Properties::VIRTUAL,
 	          __float__getDistanceToEyePoint__C5_Vec3_R1__bool,
 	          "Get the distance from a point to the eye point, distance value in local coordinate system. ",
 	          "Note, not all NodeVisitor implement this method, it is mainly cull visitors which will implement. If the getDistanceFromEyePoint(pos) is not implemented then a default value of 0.0 is returned. ");
-	I_Method2(float, getDistanceToViewPoint, IN, const osg::Vec3 &, pos, IN, bool, withLODScale,
+	I_Method2(float, getDistanceToViewPoint, IN, const osg::Vec3 &, x, IN, bool, x,
 	          Properties::VIRTUAL,
 	          __float__getDistanceToViewPoint__C5_Vec3_R1__bool,
 	          "Get the distance from a point to the view point, distance value in local coordinate system. ",
 	          "Note, not all NodeVisitor implement this method, it is mainly cull visitors which will implement. If the getDistanceToViewPoint(pos) is not implemented then a default value of 0.0 is returned. ");
-	I_Method2(float, getDistanceFromEyePoint, IN, const osg::Vec3 &, pos, IN, bool, withLODScale,
+	I_Method2(float, getDistanceFromEyePoint, IN, const osg::Vec3 &, x, IN, bool, x,
 	          Properties::VIRTUAL,
 	          __float__getDistanceFromEyePoint__C5_Vec3_R1__bool,
 	          "Get the distance of a point from the eye point, distance value in the eye coordinate system. ",

src/osgWrappers/osg/ColorMask.cpp

@@ -43,7 +43,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ColorMask)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -118,7 +118,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ColorMask)
 	          __bool__getAlphaMask,
 	          "",
 	          "");
-	I_Method1(void, apply, IN, osg::State &, state,
+	I_Method1(void, apply, IN, osg::State &, x,
 	          Properties::VIRTUAL,
 	          __void__apply__State_R1,
 	          "apply the OpenGL state attributes. ",

src/osgWrappers/osg/ColorMatrix.cpp

@@ -40,7 +40,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ColorMatrix)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",

src/osgWrappers/osg/ConvexPlanarOccluder.cpp

@@ -40,7 +40,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ConvexPlanarOccluder)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an object, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an object, with Object* return type. ",

src/osgWrappers/osg/CoordinateSystemNode.cpp

@@ -146,7 +146,7 @@ BEGIN_OBJECT_REFLECTOR(osg::EllipsoidModel)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an object, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an object, with Object* return type. ",

src/osgWrappers/osg/CopyOp.cpp

@@ -32,8 +32,6 @@
 #undef OUT
 #endif
 
-TYPE_NAME_ALIAS(unsigned int, osg::CopyOp::CopyFlags)
-
 BEGIN_ENUM_REFLECTOR(osg::CopyOp::Options)
 	I_DeclaringFile("osg/CopyOp");
 	I_EnumLabel(osg::CopyOp::SHALLOW_COPY);
@@ -51,6 +49,8 @@ BEGIN_ENUM_REFLECTOR(osg::CopyOp::Options)
 	I_EnumLabel(osg::CopyOp::DEEP_COPY_ALL);
 END_REFLECTOR
 
+TYPE_NAME_ALIAS(unsigned int, osg::CopyOp::CopyFlags)
+
 BEGIN_VALUE_REFLECTOR(osg::CopyOp)
 	I_DeclaringFile("osg/CopyOp");
 	I_ConstructorWithDefaults1(IN, osg::CopyOp::CopyFlags, flags, osg::CopyOp::SHALLOW_COPY,

src/osgWrappers/osg/CullFace.cpp

@@ -48,7 +48,7 @@ BEGIN_OBJECT_REFLECTOR(osg::CullFace)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -78,7 +78,7 @@ BEGIN_OBJECT_REFLECTOR(osg::CullFace)
 	          __int__compare__C5_StateAttribute_R1,
 	          "return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ",
 	          "");
-	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage,
+	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x,
 	          Properties::VIRTUAL,
 	          __bool__getModeUsage__StateAttribute_ModeUsage_R1,
 	          "Return the modes associated with this StateAttribute. ",
@@ -93,7 +93,7 @@ BEGIN_OBJECT_REFLECTOR(osg::CullFace)
 	          __Mode__getMode,
 	          "",
 	          "");
-	I_Method1(void, apply, IN, osg::State &, state,
+	I_Method1(void, apply, IN, osg::State &, x,
 	          Properties::VIRTUAL,
 	          __void__apply__State_R1,
 	          "apply the OpenGL state attributes. ",

src/osgWrappers/osg/CullSettings.cpp

@@ -24,8 +24,6 @@
 #undef OUT
 #endif
 
-TYPE_NAME_ALIAS(unsigned int, osg::CullSettings::CullingMode)
-
 BEGIN_ENUM_REFLECTOR(osg::CullSettings::VariablesMask)
 	I_DeclaringFile("osg/CullSettings");
 	I_EnumLabel(osg::CullSettings::COMPUTE_NEAR_FAR_MODE);
@@ -75,6 +73,8 @@ BEGIN_ENUM_REFLECTOR(osg::CullSettings::CullingModeValues)
 	I_EnumLabel(osg::CullSettings::ENABLE_ALL_CULLING);
 END_REFLECTOR
 
+TYPE_NAME_ALIAS(unsigned int, osg::CullSettings::CullingMode)
+
 BEGIN_VALUE_REFLECTOR(osg::CullSettings)
 	I_DeclaringFile("osg/CullSettings");
 	I_Constructor0(____CullSettings,

src/osgWrappers/osg/CullingSet.cpp

@@ -30,14 +30,6 @@
 #undef OUT
 #endif
 
-TYPE_NAME_ALIAS(std::pair< osg::ref_ptr< osg::StateSet > COMMA  osg::Polytope >, osg::CullingSet::StateFrustumPair)
-
-TYPE_NAME_ALIAS(std::vector< osg::CullingSet::StateFrustumPair >, osg::CullingSet::StateFrustumList)
-
-TYPE_NAME_ALIAS(std::vector< osg::ShadowVolumeOccluder >, osg::CullingSet::OccluderList)
-
-TYPE_NAME_ALIAS(unsigned int, osg::CullingSet::Mask)
-
 BEGIN_ENUM_REFLECTOR(osg::CullingSet::MaskValues)
 	I_DeclaringFile("osg/CullingSet");
 	I_EnumLabel(osg::CullingSet::NO_CULLING);
@@ -51,6 +43,14 @@ BEGIN_ENUM_REFLECTOR(osg::CullingSet::MaskValues)
 	I_EnumLabel(osg::CullingSet::ENABLE_ALL_CULLING);
 END_REFLECTOR
 
+TYPE_NAME_ALIAS(std::pair< osg::ref_ptr< osg::StateSet > COMMA  osg::Polytope >, osg::CullingSet::StateFrustumPair)
+
+TYPE_NAME_ALIAS(std::vector< osg::CullingSet::StateFrustumPair >, osg::CullingSet::StateFrustumList)
+
+TYPE_NAME_ALIAS(std::vector< osg::ShadowVolumeOccluder >, osg::CullingSet::OccluderList)
+
+TYPE_NAME_ALIAS(unsigned int, osg::CullingSet::Mask)
+
 BEGIN_OBJECT_REFLECTOR(osg::CullingSet)
 	I_DeclaringFile("osg/CullingSet");
 	I_BaseType(osg::Referenced);

src/osgWrappers/osg/Depth.cpp

@@ -52,7 +52,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Depth)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -82,7 +82,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Depth)
 	          __int__compare__C5_StateAttribute_R1,
 	          "return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ",
 	          "");
-	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage,
+	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x,
 	          Properties::VIRTUAL,
 	          __bool__getModeUsage__StateAttribute_ModeUsage_R1,
 	          "Return the modes associated with this StateAttribute. ",
@@ -132,7 +132,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Depth)
 	          __bool__getWriteMask,
 	          "",
 	          "");
-	I_Method1(void, apply, IN, osg::State &, state,
+	I_Method1(void, apply, IN, osg::State &, x,
 	          Properties::VIRTUAL,
 	          __void__apply__State_R1,
 	          "apply the OpenGL state attributes. ",

src/osgWrappers/osg/DisplaySettings.cpp

@@ -57,6 +57,10 @@ END_REFLECTOR
 BEGIN_OBJECT_REFLECTOR(osg::DisplaySettings)
 	I_DeclaringFile("osg/DisplaySettings");
 	I_BaseType(osg::Referenced);
+	I_StaticMethod0(osg::DisplaySettings *, instance,
+	                __DisplaySettings_P1__instance_S,
+	                "Maintain a DisplaySettings singleton for objects to query at runtime. ",
+	                "");
 	I_Constructor0(____DisplaySettings,
 	               "",
 	               "");
@@ -350,10 +354,6 @@ BEGIN_OBJECT_REFLECTOR(osg::DisplaySettings)
 	          __bool__getSerializeDrawDispatch,
 	          "",
 	          "");
-	I_StaticMethod0(osg::DisplaySettings *, instance,
-	                __DisplaySettings_P1__instance_S,
-	                "Maintain a DisplaySettings singleton for objects to query at runtime. ",
-	                "");
 	I_SimpleProperty(bool, AccumBuffer, 
 	                 __bool__getAccumBuffer, 
 	                 0);

src/osgWrappers/osg/DrawPixels.cpp

@@ -41,7 +41,7 @@ BEGIN_OBJECT_REFLECTOR(osg::DrawPixels)
 	          __Object_P1__cloneType,
 	          "Clone the type of an object, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __Object_P1__clone__C5_CopyOp_R1,
 	          "Clone an object, with Object* return type. ",

src/osgWrappers/osg/Drawable.cpp

@@ -38,10 +38,6 @@
 #undef OUT
 #endif
 
-TYPE_NAME_ALIAS(std::vector< osg::Node * >, osg::Drawable::ParentList)
-
-TYPE_NAME_ALIAS(unsigned int, osg::Drawable::AttributeType)
-
 BEGIN_ENUM_REFLECTOR(osg::Drawable::AttributeTypes)
 	I_DeclaringFile("osg/Drawable");
 	I_EnumLabel(osg::Drawable::VERTICES);
@@ -63,6 +59,10 @@ BEGIN_ENUM_REFLECTOR(osg::Drawable::AttributeTypes)
 	I_EnumLabel(osg::Drawable::TEXTURE_COORDS_7);
 END_REFLECTOR
 
+TYPE_NAME_ALIAS(std::vector< osg::Node * >, osg::Drawable::ParentList)
+
+TYPE_NAME_ALIAS(unsigned int, osg::Drawable::AttributeType)
+
 BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable)
 	I_DeclaringFile("osg/Drawable");
 	I_BaseType(osg::Object);
@@ -617,7 +617,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Drawable::ComputeBoundingBoxCallback)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an object, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an object, with Object* return type. ",
@@ -741,7 +741,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Drawable::CullCallback)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an object, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an object, with Object* return type. ",
@@ -788,7 +788,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Drawable::DrawCallback)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an object, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an object, with Object* return type. ",
@@ -830,7 +830,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Drawable::EventCallback)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an object, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an object, with Object* return type. ",
@@ -1273,7 +1273,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Drawable::UpdateCallback)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an object, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an object, with Object* return type. ",

src/osgWrappers/osg/Fog.cpp

@@ -53,7 +53,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Fog)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -83,7 +83,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Fog)
 	          __int__compare__C5_StateAttribute_R1,
 	          "return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ",
 	          "");
-	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage,
+	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x,
 	          Properties::VIRTUAL,
 	          __bool__getModeUsage__StateAttribute_ModeUsage_R1,
 	          "Return the modes associated with this StateAttribute. ",
@@ -148,7 +148,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Fog)
 	          __GLint__getFogCoordinateSource,
 	          "",
 	          "");
-	I_Method1(void, apply, IN, osg::State &, state,
+	I_Method1(void, apply, IN, osg::State &, x,
 	          Properties::VIRTUAL,
 	          __void__apply__State_R1,
 	          "apply the OpenGL state attributes. ",

src/osgWrappers/osg/FragmentProgram.cpp

@@ -45,7 +45,7 @@ BEGIN_OBJECT_REFLECTOR(osg::FragmentProgram)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -75,7 +75,7 @@ BEGIN_OBJECT_REFLECTOR(osg::FragmentProgram)
 	          __int__compare__C5_osg_StateAttribute_R1,
 	          "return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ",
 	          "");
-	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage,
+	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x,
 	          Properties::VIRTUAL,
 	          __bool__getModeUsage__StateAttribute_ModeUsage_R1,
 	          "Return the modes associated with this StateAttribute. ",
@@ -145,12 +145,12 @@ BEGIN_OBJECT_REFLECTOR(osg::FragmentProgram)
 	          __void__dirtyFragmentProgramObject,
 	          "Force a recompile on next apply() of associated OpenGL vertex program objects. ",
 	          "");
-	I_Method1(void, apply, IN, osg::State &, state,
+	I_Method1(void, apply, IN, osg::State &, x,
 	          Properties::VIRTUAL,
 	          __void__apply__State_R1,
 	          "apply the OpenGL state attributes. ",
 	          "The render info for the current OpenGL context is passed in to allow the StateAttribute to obtain details on the the current context and state. ");
-	I_Method1(void, compileGLObjects, IN, osg::State &, state,
+	I_Method1(void, compileGLObjects, IN, osg::State &, x,
 	          Properties::VIRTUAL,
 	          __void__compileGLObjects__State_R1,
 	          "Default to nothing to compile - all state is applied immediately. ",

src/osgWrappers/osg/FrameBufferObject.cpp

@@ -68,6 +68,10 @@ TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglBlitFramebufferEXT)
 BEGIN_OBJECT_REFLECTOR(osg::FBOExtensions)
 	I_DeclaringFile("osg/FrameBufferObject");
 	I_BaseType(osg::Referenced);
+	I_StaticMethod2(osg::FBOExtensions *, instance, IN, unsigned, contextID, IN, bool, createIfNotInitalized,
+	                __FBOExtensions_P1__instance__unsigned__bool_S,
+	                "",
+	                "");
 	I_Method0(bool, isSupported,
 	          Properties::NON_VIRTUAL,
 	          __bool__isSupported,
@@ -83,10 +87,6 @@ BEGIN_OBJECT_REFLECTOR(osg::FBOExtensions)
 	          __bool__isMultisampleCoverageSupported,
 	          "",
 	          "");
-	I_StaticMethod2(osg::FBOExtensions *, instance, IN, unsigned, contextID, IN, bool, createIfNotInitalized,
-	                __FBOExtensions_P1__instance__unsigned__bool_S,
-	                "",
-	                "");
 	I_ProtectedConstructor1(IN, unsigned int, contextID,
 	                        Properties::NON_EXPLICIT,
 	                        ____FBOExtensions__unsigned_int,
@@ -178,12 +178,6 @@ BEGIN_VALUE_REFLECTOR(osg::FrameBufferAttachment)
 	          "");
 END_REFLECTOR
 
-TYPE_NAME_ALIAS(std::map< osg::Camera::BufferComponent COMMA  osg::FrameBufferAttachment >, osg::FrameBufferObject::AttachmentMap)
-
-TYPE_NAME_ALIAS(std::vector< GLenum >, osg::FrameBufferObject::MultipleRenderingTargets)
-
-TYPE_NAME_ALIAS(osg::Camera::BufferComponent, osg::FrameBufferObject::BufferComponent)
-
 BEGIN_ENUM_REFLECTOR(osg::FrameBufferObject::BindTarget)
 	I_DeclaringFile("osg/FrameBufferObject");
 	I_EnumLabel(osg::FrameBufferObject::READ_FRAMEBUFFER);
@@ -191,6 +185,12 @@ BEGIN_ENUM_REFLECTOR(osg::FrameBufferObject::BindTarget)
 	I_EnumLabel(osg::FrameBufferObject::READ_DRAW_FRAMEBUFFER);
 END_REFLECTOR
 
+TYPE_NAME_ALIAS(std::map< osg::Camera::BufferComponent COMMA  osg::FrameBufferAttachment >, osg::FrameBufferObject::AttachmentMap)
+
+TYPE_NAME_ALIAS(std::vector< GLenum >, osg::FrameBufferObject::MultipleRenderingTargets)
+
+TYPE_NAME_ALIAS(osg::Camera::BufferComponent, osg::FrameBufferObject::BufferComponent)
+
 BEGIN_OBJECT_REFLECTOR(osg::FrameBufferObject)
 	I_DeclaringFile("osg/FrameBufferObject");
 	I_BaseType(osg::StateAttribute);
@@ -206,7 +206,7 @@ BEGIN_OBJECT_REFLECTOR(osg::FrameBufferObject)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -271,7 +271,7 @@ BEGIN_OBJECT_REFLECTOR(osg::FrameBufferObject)
 	          __int__compare__C5_StateAttribute_R1,
 	          "Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ",
 	          "");
-	I_Method1(void, apply, IN, osg::State &, state,
+	I_Method1(void, apply, IN, osg::State &, x,
 	          Properties::VIRTUAL,
 	          __void__apply__State_R1,
 	          "apply the OpenGL state attributes. ",
@@ -345,7 +345,7 @@ BEGIN_OBJECT_REFLECTOR(osg::RenderBuffer)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an object, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an object, with Object* return type. ",

src/osgWrappers/osg/FrontFace.cpp

@@ -47,7 +47,7 @@ BEGIN_OBJECT_REFLECTOR(osg::FrontFace)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -87,7 +87,7 @@ BEGIN_OBJECT_REFLECTOR(osg::FrontFace)
 	          __Mode__getMode,
 	          "",
 	          "");
-	I_Method1(void, apply, IN, osg::State &, state,
+	I_Method1(void, apply, IN, osg::State &, x,
 	          Properties::VIRTUAL,
 	          __void__apply__State_R1,
 	          "apply the OpenGL state attributes. ",

src/osgWrappers/osg/Geometry.cpp

@@ -28,14 +28,6 @@
 #undef OUT
 #endif
 
-TYPE_NAME_ALIAS(std::vector< osg::Geometry::ArrayData >, osg::Geometry::ArrayDataList)
-
-TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::PrimitiveSet > >, osg::Geometry::PrimitiveSetList)
-
-TYPE_NAME_ALIAS(std::vector< osg::Array * >, osg::Geometry::ArrayList)
-
-TYPE_NAME_ALIAS(std::vector< osg::DrawElements * >, osg::Geometry::DrawElementsList)
-
 BEGIN_ENUM_REFLECTOR(osg::Geometry::AttributeBinding)
 	I_DeclaringFile("osg/Geometry");
 	I_EnumLabel(osg::Geometry::BIND_OFF);
@@ -45,6 +37,14 @@ BEGIN_ENUM_REFLECTOR(osg::Geometry::AttributeBinding)
 	I_EnumLabel(osg::Geometry::BIND_PER_VERTEX);
 END_REFLECTOR
 
+TYPE_NAME_ALIAS(std::vector< osg::Geometry::ArrayData >, osg::Geometry::ArrayDataList)
+
+TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::PrimitiveSet > >, osg::Geometry::PrimitiveSetList)
+
+TYPE_NAME_ALIAS(std::vector< osg::Array * >, osg::Geometry::ArrayList)
+
+TYPE_NAME_ALIAS(std::vector< osg::DrawElements * >, osg::Geometry::DrawElementsList)
+
 BEGIN_OBJECT_REFLECTOR(osg::Geometry)
 	I_DeclaringFile("osg/Geometry");
 	I_BaseType(osg::Drawable);
@@ -60,7 +60,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Geometry)
 	          __Object_P1__cloneType,
 	          "Clone the type of an object, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __Object_P1__clone__C5_CopyOp_R1,
 	          "Clone an object, with Object* return type. ",
@@ -635,6 +635,16 @@ BEGIN_OBJECT_REFLECTOR(osg::Geometry)
 	          __void__copyToAndOptimize__Geometry_R1,
 	          "",
 	          "");
+	I_Method0(bool, containsSharedArrays,
+	          Properties::NON_VIRTUAL,
+	          __bool__containsSharedArrays,
+	          "",
+	          "");
+	I_Method0(void, duplicateSharedArrays,
+	          Properties::NON_VIRTUAL,
+	          __void__duplicateSharedArrays,
+	          "",
+	          "");
 	I_Method0(void, computeInternalOptimizedGeometry,
 	          Properties::NON_VIRTUAL,
 	          __void__computeInternalOptimizedGeometry,

src/osgWrappers/osg/GraphicsContext.cpp

@@ -37,6 +37,54 @@ TYPE_NAME_ALIAS(std::list< osg::Camera * >, osg::GraphicsContext::Cameras)
 BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::GraphicsContext)
 	I_DeclaringFile("osg/GraphicsContext");
 	I_BaseType(osg::Object);
+	I_StaticMethod1(void, setWindowingSystemInterface, IN, osg::GraphicsContext::WindowingSystemInterface *, wsInterface,
+	                __void__setWindowingSystemInterface__WindowingSystemInterface_P1_S,
+	                "Set the query the windowing system for screens and create graphics context - this functor should be supplied by the windows toolkit. ",
+	                "");
+	I_StaticMethod0(osg::GraphicsContext::WindowingSystemInterface *, getWindowingSystemInterface,
+	                __WindowingSystemInterface_P1__getWindowingSystemInterface_S,
+	                "Get the WindowingSystemInterface. ",
+	                "");
+	I_StaticMethod1(osg::GraphicsContext *, createGraphicsContext, IN, osg::GraphicsContext::Traits *, traits,
+	                __GraphicsContext_P1__createGraphicsContext__Traits_P1_S,
+	                "Create a graphics context for a specified set of traits. ",
+	                "");
+	I_StaticMethod0(unsigned int, createNewContextID,
+	                __unsigned_int__createNewContextID_S,
+	                "Create a contextID for a new graphics context, this contextID is used to set up the osg::State associate with context. ",
+	                "Automatically increments the usage count of the contextID to 1. ");
+	I_StaticMethod0(unsigned int, getMaxContextID,
+	                __unsigned_int__getMaxContextID_S,
+	                "Get the current max ContextID. ",
+	                "");
+	I_StaticMethod1(void, incrementContextIDUsageCount, IN, unsigned int, contextID,
+	                __void__incrementContextIDUsageCount__unsigned_int_S,
+	                "Increment the usage count associate with a contextID. ",
+	                "The usage count specifies how many graphics contexts a specific contextID is shared between. ");
+	I_StaticMethod1(void, decrementContextIDUsageCount, IN, unsigned int, contextID,
+	                __void__decrementContextIDUsageCount__unsigned_int_S,
+	                "Decrement the usage count associate with a contextID. ",
+	                "Once the contextID goes to 0 the contextID is then free to be reused. ");
+	I_StaticMethod0(osg::GraphicsContext::GraphicsContexts, getAllRegisteredGraphicsContexts,
+	                __GraphicsContexts__getAllRegisteredGraphicsContexts_S,
+	                "Get all the registered graphics contexts. ",
+	                "");
+	I_StaticMethod1(osg::GraphicsContext::GraphicsContexts, getRegisteredGraphicsContexts, IN, unsigned int, contextID,
+	                __GraphicsContexts__getRegisteredGraphicsContexts__unsigned_int_S,
+	                "Get all the registered graphics contexts associated with a specific contextID. ",
+	                "");
+	I_StaticMethod2(void, setCompileContext, IN, unsigned int, contextID, IN, osg::GraphicsContext *, gc,
+	                __void__setCompileContext__unsigned_int__GraphicsContext_P1_S,
+	                "Get the GraphicsContext for doing background compilation for GraphicsContexts associated with specified contextID. ",
+	                "");
+	I_StaticMethod1(osg::GraphicsContext *, getOrCreateCompileContext, IN, unsigned int, contextID,
+	                __GraphicsContext_P1__getOrCreateCompileContext__unsigned_int_S,
+	                "Get existing or create a new GraphicsContext to do background compilation for GraphicsContexts associated with specified contextID. ",
+	                "");
+	I_StaticMethod1(osg::GraphicsContext *, getCompileContext, IN, unsigned int, contextID,
+	                __GraphicsContext_P1__getCompileContext__unsigned_int_S,
+	                "Get the GraphicsContext for doing background compilation for GraphicsContexts associated with specified contextID. ",
+	                "");
 	I_Method1(void, add, IN, osg::Operation *, operation,
 	          Properties::NON_VIRTUAL,
 	          __void__add__Operation_P1,
@@ -287,54 +335,6 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::GraphicsContext)
 	          __C5_char_P1__className,
 	          "return the name of the object's class type. ",
 	          "Must be defined by derived classes. ");
-	I_StaticMethod1(void, setWindowingSystemInterface, IN, osg::GraphicsContext::WindowingSystemInterface *, wsInterface,
-	                __void__setWindowingSystemInterface__WindowingSystemInterface_P1_S,
-	                "Set the query the windowing system for screens and create graphics context - this functor should be supplied by the windows toolkit. ",
-	                "");
-	I_StaticMethod0(osg::GraphicsContext::WindowingSystemInterface *, getWindowingSystemInterface,
-	                __WindowingSystemInterface_P1__getWindowingSystemInterface_S,
-	                "Get the WindowingSystemInterface. ",
-	                "");
-	I_StaticMethod1(osg::GraphicsContext *, createGraphicsContext, IN, osg::GraphicsContext::Traits *, traits,
-	                __GraphicsContext_P1__createGraphicsContext__Traits_P1_S,
-	                "Create a graphics context for a specified set of traits. ",
-	                "");
-	I_StaticMethod0(unsigned int, createNewContextID,
-	                __unsigned_int__createNewContextID_S,
-	                "Create a contextID for a new graphics context, this contextID is used to set up the osg::State associate with context. ",
-	                "Automatically increments the usage count of the contextID to 1. ");
-	I_StaticMethod0(unsigned int, getMaxContextID,
-	                __unsigned_int__getMaxContextID_S,
-	                "Get the current max ContextID. ",
-	                "");
-	I_StaticMethod1(void, incrementContextIDUsageCount, IN, unsigned int, contextID,
-	                __void__incrementContextIDUsageCount__unsigned_int_S,
-	                "Increment the usage count associate with a contextID. ",
-	                "The usage count specifies how many graphics contexts a specific contextID is shared between. ");
-	I_StaticMethod1(void, decrementContextIDUsageCount, IN, unsigned int, contextID,
-	                __void__decrementContextIDUsageCount__unsigned_int_S,
-	                "Decrement the usage count associate with a contextID. ",
-	                "Once the contextID goes to 0 the contextID is then free to be reused. ");
-	I_StaticMethod0(osg::GraphicsContext::GraphicsContexts, getAllRegisteredGraphicsContexts,
-	                __GraphicsContexts__getAllRegisteredGraphicsContexts_S,
-	                "Get all the registered graphics contexts. ",
-	                "");
-	I_StaticMethod1(osg::GraphicsContext::GraphicsContexts, getRegisteredGraphicsContexts, IN, unsigned int, contextID,
-	                __GraphicsContexts__getRegisteredGraphicsContexts__unsigned_int_S,
-	                "Get all the registered graphics contexts associated with a specific contextID. ",
-	                "");
-	I_StaticMethod2(void, setCompileContext, IN, unsigned int, contextID, IN, osg::GraphicsContext *, gc,
-	                __void__setCompileContext__unsigned_int__GraphicsContext_P1_S,
-	                "Get the GraphicsContext for doing background compilation for GraphicsContexts associated with specified contextID. ",
-	                "");
-	I_StaticMethod1(osg::GraphicsContext *, getOrCreateCompileContext, IN, unsigned int, contextID,
-	                __GraphicsContext_P1__getOrCreateCompileContext__unsigned_int_S,
-	                "Get existing or create a new GraphicsContext to do background compilation for GraphicsContexts associated with specified contextID. ",
-	                "");
-	I_StaticMethod1(osg::GraphicsContext *, getCompileContext, IN, unsigned int, contextID,
-	                __GraphicsContext_P1__getCompileContext__unsigned_int_S,
-	                "Get the GraphicsContext for doing background compilation for GraphicsContexts associated with specified contextID. ",
-	                "");
 	I_ProtectedConstructor0(____GraphicsContext,
 	                        "",
 	                        "");

src/osgWrappers/osg/Group.cpp

@@ -76,7 +76,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Group)
 	          __C5_Group_P1__asGroup,
 	          "convert 'const this' into a const Group pointer if Node is a Group, otherwise return 0. ",
 	          "Equivalent to dynamic_cast<const Group*>(this). ");
-	I_Method1(void, traverse, IN, osg::NodeVisitor &, nv,
+	I_Method1(void, traverse, IN, osg::NodeVisitor &, x,
 	          Properties::VIRTUAL,
 	          __void__traverse__NodeVisitor_R1,
 	          "Traverse downwards : calls children's accept method with NodeVisitor. ",

src/osgWrappers/osg/Hint.cpp

@@ -1,119 +1,119 @@
-// ***************************************************************************
-//
-//   Generated automatically by genwrapper.
-//   Please DO NOT EDIT this file!
-//
-// ***************************************************************************
-
-#include <osgIntrospection/ReflectionMacros>
-#include <osgIntrospection/TypedMethodInfo>
-#include <osgIntrospection/StaticMethodInfo>
-#include <osgIntrospection/Attributes>
-
-#include <osg/CopyOp>
-#include <osg/Hint>
-#include <osg/Object>
-#include <osg/State>
-#include <osg/StateAttribute>
-
-// Must undefine IN and OUT macros defined in Windows headers
-#ifdef IN
-#undef IN
-#endif
-#ifdef OUT
-#undef OUT
-#endif
-
-BEGIN_OBJECT_REFLECTOR(osg::Hint)
-	I_DeclaringFile("osg/Hint");
-	I_BaseType(osg::StateAttribute);
-	I_Constructor0(____Hint,
-	               "",
-	               "");
-	I_Constructor2(IN, GLenum, target, IN, GLenum, mode,
-	               ____Hint__GLenum__GLenum,
-	               "",
-	               "");
-	I_ConstructorWithDefaults2(IN, const osg::Hint &, hint, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY,
-	                           ____Hint__C5_Hint_R1__C5_CopyOp_R1,
-	                           "Copy constructor using CopyOp to manage deep vs shallow copy. ",
-	                           "");
-	I_Method0(osg::Object *, cloneType,
-	          Properties::VIRTUAL,
-	          __osg_Object_P1__cloneType,
-	          "Clone the type of an attribute, with Object* return type. ",
-	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
-	          Properties::VIRTUAL,
-	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
-	          "Clone an attribute, with Object* return type. ",
-	          "Must be defined by derived classes. ");
-	I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj,
-	          Properties::VIRTUAL,
-	          __bool__isSameKindAs__C5_osg_Object_P1,
-	          "Return true if this and obj are of the same kind of object. ",
-	          "");
-	I_Method0(const char *, libraryName,
-	          Properties::VIRTUAL,
-	          __C5_char_P1__libraryName,
-	          "Return the name of the attribute's library. ",
-	          "");
-	I_Method0(const char *, className,
-	          Properties::VIRTUAL,
-	          __C5_char_P1__className,
-	          "Return the name of the attribute's class type. ",
-	          "");
-	I_Method0(osg::StateAttribute::Type, getType,
-	          Properties::VIRTUAL,
-	          __Type__getType,
-	          "Return the Type identifier of the attribute's class type. ",
-	          "");
-	I_Method1(int, compare, IN, const osg::StateAttribute &, sa,
-	          Properties::VIRTUAL,
-	          __int__compare__C5_StateAttribute_R1,
-	          "Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ",
-	          "");
-	I_Method0(unsigned int, getMember,
-	          Properties::VIRTUAL,
-	          __unsigned_int__getMember,
-	          "Return the member identifier within the attribute's class type. ",
-	          "Used for light number/clip plane number etc. ");
-	I_Method1(void, setTarget, IN, GLenum, target,
-	          Properties::NON_VIRTUAL,
-	          __void__setTarget__GLenum,
-	          "",
-	          "");
-	I_Method0(GLenum, getTarget,
-	          Properties::NON_VIRTUAL,
-	          __GLenum__getTarget,
-	          "",
-	          "");
-	I_Method1(void, setMode, IN, GLenum, mode,
-	          Properties::NON_VIRTUAL,
-	          __void__setMode__GLenum,
-	          "",
-	          "");
-	I_Method0(GLenum, getMode,
-	          Properties::NON_VIRTUAL,
-	          __GLenum__getMode,
-	          "",
-	          "");
-	I_Method1(void, apply, IN, osg::State &, state,
-	          Properties::VIRTUAL,
-	          __void__apply__State_R1,
-	          "apply the OpenGL state attributes. ",
-	          "The render info for the current OpenGL context is passed in to allow the StateAttribute to obtain details on the the current context and state. ");
-	I_SimpleProperty(unsigned int, Member, 
-	                 __unsigned_int__getMember, 
-	                 0);
-	I_SimpleProperty(GLenum, Mode, 
-	                 __GLenum__getMode, 
-	                 __void__setMode__GLenum);
-	I_SimpleProperty(GLenum, Target, 
-	                 __GLenum__getTarget, 
-	                 __void__setTarget__GLenum);
-	I_SimpleProperty(osg::StateAttribute::Type, Type, 
-	                 __Type__getType, 
-	                 0);
-END_REFLECTOR
-
+// ***************************************************************************
+//
+//   Generated automatically by genwrapper.
+//   Please DO NOT EDIT this file!
+//
+// ***************************************************************************
+
+#include <osgIntrospection/ReflectionMacros>
+#include <osgIntrospection/TypedMethodInfo>
+#include <osgIntrospection/StaticMethodInfo>
+#include <osgIntrospection/Attributes>
+
+#include <osg/CopyOp>
+#include <osg/Hint>
+#include <osg/Object>
+#include <osg/State>
+#include <osg/StateAttribute>
+
+// Must undefine IN and OUT macros defined in Windows headers
+#ifdef IN
+#undef IN
+#endif
+#ifdef OUT
+#undef OUT
+#endif
+
+BEGIN_OBJECT_REFLECTOR(osg::Hint)
+	I_DeclaringFile("osg/Hint");
+	I_BaseType(osg::StateAttribute);
+	I_Constructor0(____Hint,
+	               "",
+	               "");
+	I_Constructor2(IN, GLenum, target, IN, GLenum, mode,
+	               ____Hint__GLenum__GLenum,
+	               "",
+	               "");
+	I_ConstructorWithDefaults2(IN, const osg::Hint &, hint, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY,
+	                           ____Hint__C5_Hint_R1__C5_CopyOp_R1,
+	                           "Copy constructor using CopyOp to manage deep vs shallow copy. ",
+	                           "");
+	I_Method0(osg::Object *, cloneType,
+	          Properties::VIRTUAL,
+	          __osg_Object_P1__cloneType,
+	          "Clone the type of an attribute, with Object* return type. ",
+	          "Must be defined by derived classes. ");
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
+	          Properties::VIRTUAL,
+	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
+	          "Clone an attribute, with Object* return type. ",
+	          "Must be defined by derived classes. ");
+	I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj,
+	          Properties::VIRTUAL,
+	          __bool__isSameKindAs__C5_osg_Object_P1,
+	          "Return true if this and obj are of the same kind of object. ",
+	          "");
+	I_Method0(const char *, libraryName,
+	          Properties::VIRTUAL,
+	          __C5_char_P1__libraryName,
+	          "Return the name of the attribute's library. ",
+	          "");
+	I_Method0(const char *, className,
+	          Properties::VIRTUAL,
+	          __C5_char_P1__className,
+	          "Return the name of the attribute's class type. ",
+	          "");
+	I_Method0(osg::StateAttribute::Type, getType,
+	          Properties::VIRTUAL,
+	          __Type__getType,
+	          "Return the Type identifier of the attribute's class type. ",
+	          "");
+	I_Method1(int, compare, IN, const osg::StateAttribute &, sa,
+	          Properties::VIRTUAL,
+	          __int__compare__C5_StateAttribute_R1,
+	          "Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ",
+	          "");
+	I_Method0(unsigned int, getMember,
+	          Properties::VIRTUAL,
+	          __unsigned_int__getMember,
+	          "Return the member identifier within the attribute's class type. ",
+	          "Used for light number/clip plane number etc. ");
+	I_Method1(void, setTarget, IN, GLenum, target,
+	          Properties::NON_VIRTUAL,
+	          __void__setTarget__GLenum,
+	          "",
+	          "");
+	I_Method0(GLenum, getTarget,
+	          Properties::NON_VIRTUAL,
+	          __GLenum__getTarget,
+	          "",
+	          "");
+	I_Method1(void, setMode, IN, GLenum, mode,
+	          Properties::NON_VIRTUAL,
+	          __void__setMode__GLenum,
+	          "",
+	          "");
+	I_Method0(GLenum, getMode,
+	          Properties::NON_VIRTUAL,
+	          __GLenum__getMode,
+	          "",
+	          "");
+	I_Method1(void, apply, IN, osg::State &, x,
+	          Properties::VIRTUAL,
+	          __void__apply__State_R1,
+	          "apply the OpenGL state attributes. ",
+	          "The render info for the current OpenGL context is passed in to allow the StateAttribute to obtain details on the the current context and state. ");
+	I_SimpleProperty(unsigned int, Member, 
+	                 __unsigned_int__getMember, 
+	                 0);
+	I_SimpleProperty(GLenum, Mode, 
+	                 __GLenum__getMode, 
+	                 __void__setMode__GLenum);
+	I_SimpleProperty(GLenum, Target, 
+	                 __GLenum__getTarget, 
+	                 __void__setTarget__GLenum);
+	I_SimpleProperty(osg::StateAttribute::Type, Type, 
+	                 __Type__getType, 
+	                 0);
+END_REFLECTOR
+

src/osgWrappers/osg/Image.cpp

@@ -27,8 +27,6 @@
 #undef OUT
 #endif
 
-TYPE_NAME_ALIAS(std::vector< unsigned int >, osg::Image::MipmapDataType)
-
 BEGIN_ENUM_REFLECTOR(osg::Image::AllocationMode)
 	I_DeclaringFile("osg/Image");
 	I_EnumLabel(osg::Image::NO_DELETE);
@@ -42,6 +40,8 @@ BEGIN_ENUM_REFLECTOR(osg::Image::Origin)
 	I_EnumLabel(osg::Image::TOP_LEFT);
 END_REFLECTOR
 
+TYPE_NAME_ALIAS(std::vector< unsigned int >, osg::Image::MipmapDataType)
+
 BEGIN_OBJECT_REFLECTOR(osg::Image)
 	I_DeclaringFile("osg/Image");
 	I_BaseType(osg::Object);
@@ -57,7 +57,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Image)
 	          __Object_P1__cloneType,
 	          "Clone the type of an object, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __Object_P1__clone__C5_CopyOp_R1,
 	          "Clone an object, with Object* return type. ",

src/osgWrappers/osg/ImageSequence.cpp

@@ -1,237 +1,237 @@
-// ***************************************************************************
-//
-//   Generated automatically by genwrapper.
-//   Please DO NOT EDIT this file!
-//
-// ***************************************************************************
-
-#include <osgIntrospection/ReflectionMacros>
-#include <osgIntrospection/TypedMethodInfo>
-#include <osgIntrospection/StaticMethodInfo>
-#include <osgIntrospection/Attributes>
-
-#include <osg/CopyOp>
-#include <osg/Image>
-#include <osg/ImageSequence>
-#include <osg/NodeVisitor>
-#include <osg/Object>
-#include <osg/StateAttribute>
-
-// Must undefine IN and OUT macros defined in Windows headers
-#ifdef IN
-#undef IN
-#endif
-#ifdef OUT
-#undef OUT
-#endif
-
-TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osg::Image > >, osg::ImageSequence::Images)
-
-TYPE_NAME_ALIAS(std::list< std::string >, osg::ImageSequence::FileNames)
-
-BEGIN_ENUM_REFLECTOR(osg::ImageSequence::Mode)
-	I_DeclaringFile("osg/ImageSequence");
-	I_EnumLabel(osg::ImageSequence::PRE_LOAD_ALL_IMAGES);
-	I_EnumLabel(osg::ImageSequence::PAGE_AND_RETAIN_IMAGES);
-	I_EnumLabel(osg::ImageSequence::PAGE_AND_DISCARD_USED_IMAGES);
-END_REFLECTOR
-
-BEGIN_OBJECT_REFLECTOR(osg::ImageSequence)
-	I_DeclaringFile("osg/ImageSequence");
-	I_BaseType(osg::ImageStream);
-	I_Constructor0(____ImageSequence,
-	               "",
-	               "");
-	I_ConstructorWithDefaults2(IN, const osg::ImageSequence &, ImageSequence, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY,
-	                           ____ImageSequence__C5_ImageSequence_R1__C5_CopyOp_R1,
-	                           "Copy constructor using CopyOp to manage deep vs shallow copy. ",
-	                           "");
-	I_Method0(osg::Object *, cloneType,
-	          Properties::VIRTUAL,
-	          __Object_P1__cloneType,
-	          "Clone the type of an object, with Object* return type. ",
-	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
-	          Properties::VIRTUAL,
-	          __Object_P1__clone__C5_CopyOp_R1,
-	          "Clone an object, with Object* return type. ",
-	          "Must be defined by derived classes. ");
-	I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj,
-	          Properties::VIRTUAL,
-	          __bool__isSameKindAs__C5_Object_P1,
-	          "",
-	          "");
-	I_Method0(const char *, libraryName,
-	          Properties::VIRTUAL,
-	          __C5_char_P1__libraryName,
-	          "return the name of the object's library. ",
-	          "Must be defined by derived classes. The OpenSceneGraph convention is that the namespace of a library is the same as the library name. ");
-	I_Method0(const char *, className,
-	          Properties::VIRTUAL,
-	          __C5_char_P1__className,
-	          "return the name of the object's class type. ",
-	          "Must be defined by derived classes. ");
-	I_Method1(int, compare, IN, const osg::Image &, rhs,
-	          Properties::VIRTUAL,
-	          __int__compare__C5_Image_R1,
-	          "Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ",
-	          "");
-	I_Method1(void, setReferenceTime, IN, double, t,
-	          Properties::VIRTUAL,
-	          __void__setReferenceTime__double,
-	          "",
-	          "");
-	I_Method0(double, getReferenceTime,
-	          Properties::VIRTUAL,
-	          __double__getReferenceTime,
-	          "",
-	          "");
-	I_Method1(void, setTimeMultiplier, IN, double, tm,
-	          Properties::VIRTUAL,
-	          __void__setTimeMultiplier__double,
-	          "",
-	          "");
-	I_Method0(double, getTimeMultiplier,
-	          Properties::VIRTUAL,
-	          __double__getTimeMultiplier,
-	          "",
-	          "");
-	I_Method1(void, setMode, IN, osg::ImageSequence::Mode, mode,
-	          Properties::NON_VIRTUAL,
-	          __void__setMode__Mode,
-	          "",
-	          "");
-	I_Method0(osg::ImageSequence::Mode, getMode,
-	          Properties::NON_VIRTUAL,
-	          __Mode__getMode,
-	          "",
-	          "");
-	I_Method1(void, setDuration, IN, double, duration,
-	          Properties::NON_VIRTUAL,
-	          __void__setDuration__double,
-	          "",
-	          "");
-	I_Method0(double, getDuration,
-	          Properties::NON_VIRTUAL,
-	          __double__getDuration,
-	          "",
-	          "");
-	I_Method1(void, addImageFile, IN, const std::string &, fileName,
-	          Properties::NON_VIRTUAL,
-	          __void__addImageFile__C5_std_string_R1,
-	          "",
-	          "");
-	I_Method0(osg::ImageSequence::FileNames &, getFileNames,
-	          Properties::NON_VIRTUAL,
-	          __FileNames_R1__getFileNames,
-	          "",
-	          "");
-	I_Method0(const osg::ImageSequence::FileNames &, getFileNames,
-	          Properties::NON_VIRTUAL,
-	          __C5_FileNames_R1__getFileNames,
-	          "",
-	          "");
-	I_Method1(void, addImage, IN, osg::Image *, image,
-	          Properties::NON_VIRTUAL,
-	          __void__addImage__osg_Image_P1,
-	          "",
-	          "");
-	I_Method0(osg::ImageSequence::Images &, getImages,
-	          Properties::NON_VIRTUAL,
-	          __Images_R1__getImages,
-	          "",
-	          "");
-	I_Method0(const osg::ImageSequence::Images &, getImages,
-	          Properties::NON_VIRTUAL,
-	          __C5_Images_R1__getImages,
-	          "",
-	          "");
-	I_Method1(void, update, IN, osg::NodeVisitor *, nv,
-	          Properties::VIRTUAL,
-	          __void__update__NodeVisitor_P1,
-	          "",
-	          "");
-	I_ProtectedMethod1(void, setImageToChild, IN, const osg::Image *, image,
-	                   Properties::NON_VIRTUAL,
-	                   Properties::NON_CONST,
-	                   __void__setImageToChild__C5_osg_Image_P1,
-	                   "",
-	                   "");
-	I_ProtectedMethod0(void, computeTimePerImage,
-	                   Properties::NON_VIRTUAL,
-	                   Properties::NON_CONST,
-	                   __void__computeTimePerImage,
-	                   "",
-	                   "");
-	I_SimpleProperty(double, Duration, 
-	                 __double__getDuration, 
-	                 __void__setDuration__double);
-	I_SimpleProperty(osg::ImageSequence::FileNames &, FileNames, 
-	                 __FileNames_R1__getFileNames, 
-	                 0);
-	I_SimpleProperty(osg::ImageSequence::Images &, Images, 
-	                 __Images_R1__getImages, 
-	                 0);
-	I_SimpleProperty(osg::ImageSequence::Mode, Mode, 
-	                 __Mode__getMode, 
-	                 __void__setMode__Mode);
-	I_SimpleProperty(double, ReferenceTime, 
-	                 __double__getReferenceTime, 
-	                 __void__setReferenceTime__double);
-	I_SimpleProperty(double, TimeMultiplier, 
-	                 __double__getTimeMultiplier, 
-	                 __void__setTimeMultiplier__double);
-END_REFLECTOR
-
-BEGIN_OBJECT_REFLECTOR(osg::ImageSequence::UpdateCallback)
-	I_DeclaringFile("osg/ImageSequence");
-	I_BaseType(osg::StateAttribute::Callback);
-	I_Constructor0(____UpdateCallback,
-	               "",
-	               "");
-END_REFLECTOR
-
-BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Image >)
-	I_DeclaringFile("osg/ref_ptr");
-	I_Constructor0(____ref_ptr,
-	               "",
-	               "");
-	I_Constructor1(IN, osg::Image *, ptr,
-	               Properties::NON_EXPLICIT,
-	               ____ref_ptr__T_P1,
-	               "",
-	               "");
-	I_Constructor1(IN, const osg::ref_ptr< osg::Image > &, rp,
-	               Properties::NON_EXPLICIT,
-	               ____ref_ptr__C5_ref_ptr_R1,
-	               "",
-	               "");
-	I_Method0(osg::Image *, get,
-	          Properties::NON_VIRTUAL,
-	          __T_P1__get,
-	          "",
-	          "");
-	I_Method0(bool, valid,
-	          Properties::NON_VIRTUAL,
-	          __bool__valid,
-	          "",
-	          "");
-	I_Method0(osg::Image *, release,
-	          Properties::NON_VIRTUAL,
-	          __T_P1__release,
-	          "",
-	          "");
-	I_Method1(void, swap, IN, osg::ref_ptr< osg::Image > &, rp,
-	          Properties::NON_VIRTUAL,
-	          __void__swap__ref_ptr_R1,
-	          "",
-	          "");
-	I_SimpleProperty(osg::Image *, , 
-	                 __T_P1__get, 
-	                 0);
-END_REFLECTOR
-
-STD_LIST_REFLECTOR(std::list< osg::ref_ptr< osg::Image > >)
-
-STD_LIST_REFLECTOR(std::list< std::string >)
-
+// ***************************************************************************
+//
+//   Generated automatically by genwrapper.
+//   Please DO NOT EDIT this file!
+//
+// ***************************************************************************
+
+#include <osgIntrospection/ReflectionMacros>
+#include <osgIntrospection/TypedMethodInfo>
+#include <osgIntrospection/StaticMethodInfo>
+#include <osgIntrospection/Attributes>
+
+#include <osg/CopyOp>
+#include <osg/Image>
+#include <osg/ImageSequence>
+#include <osg/NodeVisitor>
+#include <osg/Object>
+#include <osg/StateAttribute>
+
+// Must undefine IN and OUT macros defined in Windows headers
+#ifdef IN
+#undef IN
+#endif
+#ifdef OUT
+#undef OUT
+#endif
+
+BEGIN_ENUM_REFLECTOR(osg::ImageSequence::Mode)
+	I_DeclaringFile("osg/ImageSequence");
+	I_EnumLabel(osg::ImageSequence::PRE_LOAD_ALL_IMAGES);
+	I_EnumLabel(osg::ImageSequence::PAGE_AND_RETAIN_IMAGES);
+	I_EnumLabel(osg::ImageSequence::PAGE_AND_DISCARD_USED_IMAGES);
+END_REFLECTOR
+
+TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osg::Image > >, osg::ImageSequence::Images)
+
+TYPE_NAME_ALIAS(std::list< std::string >, osg::ImageSequence::FileNames)
+
+BEGIN_OBJECT_REFLECTOR(osg::ImageSequence)
+	I_DeclaringFile("osg/ImageSequence");
+	I_BaseType(osg::ImageStream);
+	I_Constructor0(____ImageSequence,
+	               "",
+	               "");
+	I_ConstructorWithDefaults2(IN, const osg::ImageSequence &, ImageSequence, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY,
+	                           ____ImageSequence__C5_ImageSequence_R1__C5_CopyOp_R1,
+	                           "Copy constructor using CopyOp to manage deep vs shallow copy. ",
+	                           "");
+	I_Method0(osg::Object *, cloneType,
+	          Properties::VIRTUAL,
+	          __Object_P1__cloneType,
+	          "Clone the type of an object, with Object* return type. ",
+	          "Must be defined by derived classes. ");
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
+	          Properties::VIRTUAL,
+	          __Object_P1__clone__C5_CopyOp_R1,
+	          "Clone an object, with Object* return type. ",
+	          "Must be defined by derived classes. ");
+	I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj,
+	          Properties::VIRTUAL,
+	          __bool__isSameKindAs__C5_Object_P1,
+	          "",
+	          "");
+	I_Method0(const char *, libraryName,
+	          Properties::VIRTUAL,
+	          __C5_char_P1__libraryName,
+	          "return the name of the object's library. ",
+	          "Must be defined by derived classes. The OpenSceneGraph convention is that the namespace of a library is the same as the library name. ");
+	I_Method0(const char *, className,
+	          Properties::VIRTUAL,
+	          __C5_char_P1__className,
+	          "return the name of the object's class type. ",
+	          "Must be defined by derived classes. ");
+	I_Method1(int, compare, IN, const osg::Image &, rhs,
+	          Properties::VIRTUAL,
+	          __int__compare__C5_Image_R1,
+	          "Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ",
+	          "");
+	I_Method1(void, setReferenceTime, IN, double, t,
+	          Properties::VIRTUAL,
+	          __void__setReferenceTime__double,
+	          "",
+	          "");
+	I_Method0(double, getReferenceTime,
+	          Properties::VIRTUAL,
+	          __double__getReferenceTime,
+	          "",
+	          "");
+	I_Method1(void, setTimeMultiplier, IN, double, tm,
+	          Properties::VIRTUAL,
+	          __void__setTimeMultiplier__double,
+	          "",
+	          "");
+	I_Method0(double, getTimeMultiplier,
+	          Properties::VIRTUAL,
+	          __double__getTimeMultiplier,
+	          "",
+	          "");
+	I_Method1(void, setMode, IN, osg::ImageSequence::Mode, mode,
+	          Properties::NON_VIRTUAL,
+	          __void__setMode__Mode,
+	          "",
+	          "");
+	I_Method0(osg::ImageSequence::Mode, getMode,
+	          Properties::NON_VIRTUAL,
+	          __Mode__getMode,
+	          "",
+	          "");
+	I_Method1(void, setDuration, IN, double, duration,
+	          Properties::NON_VIRTUAL,
+	          __void__setDuration__double,
+	          "",
+	          "");
+	I_Method0(double, getDuration,
+	          Properties::NON_VIRTUAL,
+	          __double__getDuration,
+	          "",
+	          "");
+	I_Method1(void, addImageFile, IN, const std::string &, fileName,
+	          Properties::NON_VIRTUAL,
+	          __void__addImageFile__C5_std_string_R1,
+	          "",
+	          "");
+	I_Method0(osg::ImageSequence::FileNames &, getFileNames,
+	          Properties::NON_VIRTUAL,
+	          __FileNames_R1__getFileNames,
+	          "",
+	          "");
+	I_Method0(const osg::ImageSequence::FileNames &, getFileNames,
+	          Properties::NON_VIRTUAL,
+	          __C5_FileNames_R1__getFileNames,
+	          "",
+	          "");
+	I_Method1(void, addImage, IN, osg::Image *, image,
+	          Properties::NON_VIRTUAL,
+	          __void__addImage__osg_Image_P1,
+	          "",
+	          "");
+	I_Method0(osg::ImageSequence::Images &, getImages,
+	          Properties::NON_VIRTUAL,
+	          __Images_R1__getImages,
+	          "",
+	          "");
+	I_Method0(const osg::ImageSequence::Images &, getImages,
+	          Properties::NON_VIRTUAL,
+	          __C5_Images_R1__getImages,
+	          "",
+	          "");
+	I_Method1(void, update, IN, osg::NodeVisitor *, nv,
+	          Properties::VIRTUAL,
+	          __void__update__NodeVisitor_P1,
+	          "",
+	          "");
+	I_ProtectedMethod1(void, setImageToChild, IN, const osg::Image *, image,
+	                   Properties::NON_VIRTUAL,
+	                   Properties::NON_CONST,
+	                   __void__setImageToChild__C5_osg_Image_P1,
+	                   "",
+	                   "");
+	I_ProtectedMethod0(void, computeTimePerImage,
+	                   Properties::NON_VIRTUAL,
+	                   Properties::NON_CONST,
+	                   __void__computeTimePerImage,
+	                   "",
+	                   "");
+	I_SimpleProperty(double, Duration, 
+	                 __double__getDuration, 
+	                 __void__setDuration__double);
+	I_SimpleProperty(osg::ImageSequence::FileNames &, FileNames, 
+	                 __FileNames_R1__getFileNames, 
+	                 0);
+	I_SimpleProperty(osg::ImageSequence::Images &, Images, 
+	                 __Images_R1__getImages, 
+	                 0);
+	I_SimpleProperty(osg::ImageSequence::Mode, Mode, 
+	                 __Mode__getMode, 
+	                 __void__setMode__Mode);
+	I_SimpleProperty(double, ReferenceTime, 
+	                 __double__getReferenceTime, 
+	                 __void__setReferenceTime__double);
+	I_SimpleProperty(double, TimeMultiplier, 
+	                 __double__getTimeMultiplier, 
+	                 __void__setTimeMultiplier__double);
+END_REFLECTOR
+
+BEGIN_OBJECT_REFLECTOR(osg::ImageSequence::UpdateCallback)
+	I_DeclaringFile("osg/ImageSequence");
+	I_BaseType(osg::StateAttribute::Callback);
+	I_Constructor0(____UpdateCallback,
+	               "",
+	               "");
+END_REFLECTOR
+
+BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Image >)
+	I_DeclaringFile("osg/ref_ptr");
+	I_Constructor0(____ref_ptr,
+	               "",
+	               "");
+	I_Constructor1(IN, osg::Image *, ptr,
+	               Properties::NON_EXPLICIT,
+	               ____ref_ptr__T_P1,
+	               "",
+	               "");
+	I_Constructor1(IN, const osg::ref_ptr< osg::Image > &, rp,
+	               Properties::NON_EXPLICIT,
+	               ____ref_ptr__C5_ref_ptr_R1,
+	               "",
+	               "");
+	I_Method0(osg::Image *, get,
+	          Properties::NON_VIRTUAL,
+	          __T_P1__get,
+	          "",
+	          "");
+	I_Method0(bool, valid,
+	          Properties::NON_VIRTUAL,
+	          __bool__valid,
+	          "",
+	          "");
+	I_Method0(osg::Image *, release,
+	          Properties::NON_VIRTUAL,
+	          __T_P1__release,
+	          "",
+	          "");
+	I_Method1(void, swap, IN, osg::ref_ptr< osg::Image > &, rp,
+	          Properties::NON_VIRTUAL,
+	          __void__swap__ref_ptr_R1,
+	          "",
+	          "");
+	I_SimpleProperty(osg::Image *, , 
+	                 __T_P1__get, 
+	                 0);
+END_REFLECTOR
+
+STD_LIST_REFLECTOR(std::list< osg::ref_ptr< osg::Image > >)
+
+STD_LIST_REFLECTOR(std::list< std::string >)
+

src/osgWrappers/osg/ImageStream.cpp

@@ -52,7 +52,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ImageStream)
 	          __Object_P1__cloneType,
 	          "Clone the type of an object, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __Object_P1__clone__C5_CopyOp_R1,
 	          "Clone an object, with Object* return type. ",

src/osgWrappers/osg/KdTree.cpp

@@ -1,255 +1,255 @@
-// ***************************************************************************
-//
-//   Generated automatically by genwrapper.
-//   Please DO NOT EDIT this file!
-//
-// ***************************************************************************
-
-#include <osgIntrospection/ReflectionMacros>
-#include <osgIntrospection/TypedMethodInfo>
-#include <osgIntrospection/StaticMethodInfo>
-#include <osgIntrospection/Attributes>
-
-#include <osg/Array>
-#include <osg/CopyOp>
-#include <osg/Geode>
-#include <osg/Geometry>
-#include <osg/KdTree>
-#include <osg/Object>
-#include <osg/Shape>
-#include <osg/Vec3>
-
-// Must undefine IN and OUT macros defined in Windows headers
-#ifdef IN
-#undef IN
-#endif
-#ifdef OUT
-#undef OUT
-#endif
-
-TYPE_NAME_ALIAS(std::vector< osg::KdTree::LineSegmentIntersection >, osg::KdTree::LineSegmentIntersections)
-
-TYPE_NAME_ALIAS(int, osg::KdTree::value_type)
-
-TYPE_NAME_ALIAS(std::vector< osg::KdTree::KdNode >, osg::KdTree::KdNodeList)
-
-TYPE_NAME_ALIAS(std::vector< osg::KdTree::Triangle >, osg::KdTree::TriangleList)
-
-BEGIN_OBJECT_REFLECTOR(osg::KdTree)
-	I_DeclaringFile("osg/KdTree");
-	I_BaseType(osg::Shape);
-	I_Constructor0(____KdTree,
-	               "",
-	               "");
-	I_ConstructorWithDefaults2(IN, const osg::KdTree &, rhs, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY,
-	                           ____KdTree__C5_KdTree_R1__C5_osg_CopyOp_R1,
-	                           "",
-	                           "");
-	I_Method0(osg::Object *, cloneType,
-	          Properties::VIRTUAL,
-	          __osg_Object_P1__cloneType,
-	          "Clone the type of an attribute, with Object* return type. ",
-	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
-	          Properties::VIRTUAL,
-	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
-	          "Clone an attribute, with Object* return type. ",
-	          "Must be defined by derived classes. ");
-	I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj,
-	          Properties::VIRTUAL,
-	          __bool__isSameKindAs__C5_osg_Object_P1,
-	          "return true if this and obj are of the same kind of object. ",
-	          "");
-	I_Method0(const char *, libraryName,
-	          Properties::VIRTUAL,
-	          __C5_char_P1__libraryName,
-	          "return the name of the attribute's library. ",
-	          "");
-	I_Method0(const char *, className,
-	          Properties::VIRTUAL,
-	          __C5_char_P1__className,
-	          "return the name of the attribute's class type. ",
-	          "");
-	I_Method1(void, accept, IN, osg::ShapeVisitor &, sv,
-	          Properties::VIRTUAL,
-	          __void__accept__osg_ShapeVisitor_R1,
-	          "accept a non const shape visitor which can be used on non const shape objects. ",
-	          "Must be defined by derived classes. ");
-	I_Method1(void, accept, IN, osg::ConstShapeVisitor &, csv,
-	          Properties::VIRTUAL,
-	          __void__accept__osg_ConstShapeVisitor_R1,
-	          "accept a const shape visitor which can be used on const shape objects. ",
-	          "Must be defined by derived classes. ");
-	I_Method2(bool, build, IN, osg::KdTree::BuildOptions &, buildOptions, IN, osg::Geometry *, geometry,
-	          Properties::VIRTUAL,
-	          __bool__build__BuildOptions_R1__osg_Geometry_P1,
-	          "Build the kdtree from the specified source geometry object. ",
-	          "retun true on success. ");
-	I_Method3(bool, intersect, IN, const osg::Vec3 &, start, IN, const osg::Vec3 &, end, IN, osg::KdTree::LineSegmentIntersections &, intersections,
-	          Properties::VIRTUAL,
-	          __bool__intersect__C5_osg_Vec3_R1__C5_osg_Vec3_R1__LineSegmentIntersections_R1,
-	          "compute the intersection of a line segment and the kdtree, return true if an intersection has been found. ",
-	          "");
-	I_Method1(int, addNode, IN, const osg::KdTree::KdNode &, node,
-	          Properties::NON_VIRTUAL,
-	          __int__addNode__C5_KdNode_R1,
-	          "",
-	          "");
-	I_Method1(osg::KdTree::KdNode &, getNode, IN, int, nodeNum,
-	          Properties::NON_VIRTUAL,
-	          __KdNode_R1__getNode__int,
-	          "",
-	          "");
-	I_Method1(const osg::KdTree::KdNode &, getNode, IN, int, nodeNum,
-	          Properties::NON_VIRTUAL,
-	          __C5_KdNode_R1__getNode__int,
-	          "",
-	          "");
-	I_Method0(osg::KdTree::KdNodeList &, getNodes,
-	          Properties::NON_VIRTUAL,
-	          __KdNodeList_R1__getNodes,
-	          "",
-	          "");
-	I_Method0(const osg::KdTree::KdNodeList &, getNodes,
-	          Properties::NON_VIRTUAL,
-	          __C5_KdNodeList_R1__getNodes,
-	          "",
-	          "");
-	I_Method1(void, setVertices, IN, osg::Vec3Array *, vertices,
-	          Properties::NON_VIRTUAL,
-	          __void__setVertices__osg_Vec3Array_P1,
-	          "",
-	          "");
-	I_Method0(const osg::Vec3Array *, getVertices,
-	          Properties::NON_VIRTUAL,
-	          __C5_osg_Vec3Array_P1__getVertices,
-	          "",
-	          "");
-	I_Method1(unsigned int, addTriangle, IN, const osg::KdTree::Triangle &, tri,
-	          Properties::NON_VIRTUAL,
-	          __unsigned_int__addTriangle__C5_Triangle_R1,
-	          "",
-	          "");
-	I_Method1(osg::KdTree::Triangle &, getTriangle, IN, unsigned int, i,
-	          Properties::NON_VIRTUAL,
-	          __Triangle_R1__getTriangle__unsigned_int,
-	          "",
-	          "");
-	I_Method1(const osg::KdTree::Triangle &, getTriangle, IN, unsigned int, i,
-	          Properties::NON_VIRTUAL,
-	          __C5_Triangle_R1__getTriangle__unsigned_int,
-	          "",
-	          "");
-	I_Method0(osg::KdTree::TriangleList &, getTriangles,
-	          Properties::NON_VIRTUAL,
-	          __TriangleList_R1__getTriangles,
-	          "",
-	          "");
-	I_Method0(const osg::KdTree::TriangleList &, getTriangles,
-	          Properties::NON_VIRTUAL,
-	          __C5_TriangleList_R1__getTriangles,
-	          "",
-	          "");
-	I_SimpleProperty(osg::KdTree::KdNodeList &, Nodes, 
-	                 __KdNodeList_R1__getNodes, 
-	                 0);
-	I_SimpleProperty(osg::KdTree::TriangleList &, Triangles, 
-	                 __TriangleList_R1__getTriangles, 
-	                 0);
-	I_SimpleProperty(osg::Vec3Array *, Vertices, 
-	                 0, 
-	                 __void__setVertices__osg_Vec3Array_P1);
-END_REFLECTOR
-
-BEGIN_VALUE_REFLECTOR(osg::KdTree::BuildOptions)
-	I_DeclaringFile("osg/KdTree");
-	I_Constructor0(____BuildOptions,
-	               "",
-	               "");
-	I_PublicMemberProperty(unsigned int, _numVerticesProcessed);
-	I_PublicMemberProperty(unsigned int, _targetNumTrianglesPerLeaf);
-	I_PublicMemberProperty(unsigned int, _maxNumLevels);
-END_REFLECTOR
-
-BEGIN_VALUE_REFLECTOR(osg::KdTree::KdNode)
-	I_DeclaringFile("osg/KdTree");
-	I_Constructor0(____KdNode,
-	               "",
-	               "");
-	I_Constructor2(IN, osg::KdTree::value_type, f, IN, osg::KdTree::value_type, s,
-	               ____KdNode__value_type__value_type,
-	               "",
-	               "");
-	I_PublicMemberProperty(osg::BoundingBox, bb);
-	I_PublicMemberProperty(osg::KdTree::value_type, first);
-	I_PublicMemberProperty(osg::KdTree::value_type, second);
-END_REFLECTOR
-
-TYPE_NAME_ALIAS(std::vector< unsigned int >, osg::KdTree::LineSegmentIntersection::IndexList)
-
-TYPE_NAME_ALIAS(std::vector< double >, osg::KdTree::LineSegmentIntersection::RatioList)
-
-BEGIN_VALUE_REFLECTOR(osg::KdTree::LineSegmentIntersection)
-	I_DeclaringFile("osg/KdTree");
-	I_Constructor0(____LineSegmentIntersection,
-	               "",
-	               "");
-	I_PublicMemberProperty(double, ratio);
-	I_PublicMemberProperty(osg::Vec3d, intersectionPoint);
-	I_PublicMemberProperty(osg::Vec3, intersectionNormal);
-	I_PublicMemberProperty(unsigned int, p0);
-	I_PublicMemberProperty(unsigned int, p1);
-	I_PublicMemberProperty(unsigned int, p2);
-	I_PublicMemberProperty(float, r0);
-	I_PublicMemberProperty(float, r1);
-	I_PublicMemberProperty(float, r2);
-	I_PublicMemberProperty(unsigned int, primitiveIndex);
-END_REFLECTOR
-
-BEGIN_VALUE_REFLECTOR(osg::KdTree::Triangle)
-	I_DeclaringFile("osg/KdTree");
-	I_Constructor0(____Triangle,
-	               "",
-	               "");
-	I_Constructor3(IN, unsigned int, ip0, IN, unsigned int, ip1, IN, unsigned int, ip2,
-	               ____Triangle__unsigned_int__unsigned_int__unsigned_int,
-	               "",
-	               "");
-	I_PublicMemberProperty(unsigned int, p0);
-	I_PublicMemberProperty(unsigned int, p1);
-	I_PublicMemberProperty(unsigned int, p2);
-END_REFLECTOR
-
-BEGIN_OBJECT_REFLECTOR(osg::KdTreeBuilder)
-	I_DeclaringFile("osg/KdTree");
-	I_BaseType(osg::NodeVisitor);
-	I_Constructor0(____KdTreeBuilder,
-	               "",
-	               "");
-	I_Constructor1(IN, const osg::KdTreeBuilder &, rhs,
-	               Properties::NON_EXPLICIT,
-	               ____KdTreeBuilder__C5_KdTreeBuilder_R1,
-	               "",
-	               "");
-	I_Method0(osg::KdTreeBuilder *, clone,
-	          Properties::VIRTUAL,
-	          __KdTreeBuilder_P1__clone,
-	          "",
-	          "");
-	I_Method1(void, apply, IN, osg::Geode &, geode,
-	          Properties::VIRTUAL,
-	          __void__apply__osg_Geode_R1,
-	          "",
-	          "");
-	I_PublicMemberProperty(osg::KdTree::BuildOptions, _buildOptions);
-	I_PublicMemberProperty(osg::ref_ptr< osg::KdTree >, _kdTreePrototype);
-END_REFLECTOR
-
-STD_VECTOR_REFLECTOR(std::vector< double >)
-
-STD_VECTOR_REFLECTOR(std::vector< osg::KdTree::KdNode >)
-
-STD_VECTOR_REFLECTOR(std::vector< osg::KdTree::LineSegmentIntersection >)
-
-STD_VECTOR_REFLECTOR(std::vector< osg::KdTree::Triangle >)
-
+// ***************************************************************************
+//
+//   Generated automatically by genwrapper.
+//   Please DO NOT EDIT this file!
+//
+// ***************************************************************************
+
+#include <osgIntrospection/ReflectionMacros>
+#include <osgIntrospection/TypedMethodInfo>
+#include <osgIntrospection/StaticMethodInfo>
+#include <osgIntrospection/Attributes>
+
+#include <osg/Array>
+#include <osg/CopyOp>
+#include <osg/Geode>
+#include <osg/Geometry>
+#include <osg/KdTree>
+#include <osg/Object>
+#include <osg/Shape>
+#include <osg/Vec3>
+
+// Must undefine IN and OUT macros defined in Windows headers
+#ifdef IN
+#undef IN
+#endif
+#ifdef OUT
+#undef OUT
+#endif
+
+TYPE_NAME_ALIAS(std::vector< osg::KdTree::LineSegmentIntersection >, osg::KdTree::LineSegmentIntersections)
+
+TYPE_NAME_ALIAS(int, osg::KdTree::value_type)
+
+TYPE_NAME_ALIAS(std::vector< osg::KdTree::KdNode >, osg::KdTree::KdNodeList)
+
+TYPE_NAME_ALIAS(std::vector< osg::KdTree::Triangle >, osg::KdTree::TriangleList)
+
+BEGIN_OBJECT_REFLECTOR(osg::KdTree)
+	I_DeclaringFile("osg/KdTree");
+	I_BaseType(osg::Shape);
+	I_Constructor0(____KdTree,
+	               "",
+	               "");
+	I_ConstructorWithDefaults2(IN, const osg::KdTree &, rhs, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY,
+	                           ____KdTree__C5_KdTree_R1__C5_osg_CopyOp_R1,
+	                           "",
+	                           "");
+	I_Method0(osg::Object *, cloneType,
+	          Properties::VIRTUAL,
+	          __osg_Object_P1__cloneType,
+	          "Clone the type of an attribute, with Object* return type. ",
+	          "Must be defined by derived classes. ");
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
+	          Properties::VIRTUAL,
+	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
+	          "Clone an attribute, with Object* return type. ",
+	          "Must be defined by derived classes. ");
+	I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj,
+	          Properties::VIRTUAL,
+	          __bool__isSameKindAs__C5_osg_Object_P1,
+	          "return true if this and obj are of the same kind of object. ",
+	          "");
+	I_Method0(const char *, libraryName,
+	          Properties::VIRTUAL,
+	          __C5_char_P1__libraryName,
+	          "return the name of the attribute's library. ",
+	          "");
+	I_Method0(const char *, className,
+	          Properties::VIRTUAL,
+	          __C5_char_P1__className,
+	          "return the name of the attribute's class type. ",
+	          "");
+	I_Method1(void, accept, IN, osg::ShapeVisitor &, x,
+	          Properties::VIRTUAL,
+	          __void__accept__osg_ShapeVisitor_R1,
+	          "accept a non const shape visitor which can be used on non const shape objects. ",
+	          "Must be defined by derived classes. ");
+	I_Method1(void, accept, IN, osg::ConstShapeVisitor &, x,
+	          Properties::VIRTUAL,
+	          __void__accept__osg_ConstShapeVisitor_R1,
+	          "accept a const shape visitor which can be used on const shape objects. ",
+	          "Must be defined by derived classes. ");
+	I_Method2(bool, build, IN, osg::KdTree::BuildOptions &, buildOptions, IN, osg::Geometry *, geometry,
+	          Properties::VIRTUAL,
+	          __bool__build__BuildOptions_R1__osg_Geometry_P1,
+	          "Build the kdtree from the specified source geometry object. ",
+	          "retun true on success. ");
+	I_Method3(bool, intersect, IN, const osg::Vec3 &, start, IN, const osg::Vec3 &, end, IN, osg::KdTree::LineSegmentIntersections &, intersections,
+	          Properties::VIRTUAL,
+	          __bool__intersect__C5_osg_Vec3_R1__C5_osg_Vec3_R1__LineSegmentIntersections_R1,
+	          "compute the intersection of a line segment and the kdtree, return true if an intersection has been found. ",
+	          "");
+	I_Method1(int, addNode, IN, const osg::KdTree::KdNode &, node,
+	          Properties::NON_VIRTUAL,
+	          __int__addNode__C5_KdNode_R1,
+	          "",
+	          "");
+	I_Method1(osg::KdTree::KdNode &, getNode, IN, int, nodeNum,
+	          Properties::NON_VIRTUAL,
+	          __KdNode_R1__getNode__int,
+	          "",
+	          "");
+	I_Method1(const osg::KdTree::KdNode &, getNode, IN, int, nodeNum,
+	          Properties::NON_VIRTUAL,
+	          __C5_KdNode_R1__getNode__int,
+	          "",
+	          "");
+	I_Method0(osg::KdTree::KdNodeList &, getNodes,
+	          Properties::NON_VIRTUAL,
+	          __KdNodeList_R1__getNodes,
+	          "",
+	          "");
+	I_Method0(const osg::KdTree::KdNodeList &, getNodes,
+	          Properties::NON_VIRTUAL,
+	          __C5_KdNodeList_R1__getNodes,
+	          "",
+	          "");
+	I_Method1(void, setVertices, IN, osg::Vec3Array *, vertices,
+	          Properties::NON_VIRTUAL,
+	          __void__setVertices__osg_Vec3Array_P1,
+	          "",
+	          "");
+	I_Method0(const osg::Vec3Array *, getVertices,
+	          Properties::NON_VIRTUAL,
+	          __C5_osg_Vec3Array_P1__getVertices,
+	          "",
+	          "");
+	I_Method1(unsigned int, addTriangle, IN, const osg::KdTree::Triangle &, tri,
+	          Properties::NON_VIRTUAL,
+	          __unsigned_int__addTriangle__C5_Triangle_R1,
+	          "",
+	          "");
+	I_Method1(osg::KdTree::Triangle &, getTriangle, IN, unsigned int, i,
+	          Properties::NON_VIRTUAL,
+	          __Triangle_R1__getTriangle__unsigned_int,
+	          "",
+	          "");
+	I_Method1(const osg::KdTree::Triangle &, getTriangle, IN, unsigned int, i,
+	          Properties::NON_VIRTUAL,
+	          __C5_Triangle_R1__getTriangle__unsigned_int,
+	          "",
+	          "");
+	I_Method0(osg::KdTree::TriangleList &, getTriangles,
+	          Properties::NON_VIRTUAL,
+	          __TriangleList_R1__getTriangles,
+	          "",
+	          "");
+	I_Method0(const osg::KdTree::TriangleList &, getTriangles,
+	          Properties::NON_VIRTUAL,
+	          __C5_TriangleList_R1__getTriangles,
+	          "",
+	          "");
+	I_SimpleProperty(osg::KdTree::KdNodeList &, Nodes, 
+	                 __KdNodeList_R1__getNodes, 
+	                 0);
+	I_SimpleProperty(osg::KdTree::TriangleList &, Triangles, 
+	                 __TriangleList_R1__getTriangles, 
+	                 0);
+	I_SimpleProperty(osg::Vec3Array *, Vertices, 
+	                 0, 
+	                 __void__setVertices__osg_Vec3Array_P1);
+END_REFLECTOR
+
+BEGIN_VALUE_REFLECTOR(osg::KdTree::BuildOptions)
+	I_DeclaringFile("osg/KdTree");
+	I_Constructor0(____BuildOptions,
+	               "",
+	               "");
+	I_PublicMemberProperty(unsigned int, _numVerticesProcessed);
+	I_PublicMemberProperty(unsigned int, _targetNumTrianglesPerLeaf);
+	I_PublicMemberProperty(unsigned int, _maxNumLevels);
+END_REFLECTOR
+
+BEGIN_VALUE_REFLECTOR(osg::KdTree::KdNode)
+	I_DeclaringFile("osg/KdTree");
+	I_Constructor0(____KdNode,
+	               "",
+	               "");
+	I_Constructor2(IN, osg::KdTree::value_type, f, IN, osg::KdTree::value_type, s,
+	               ____KdNode__value_type__value_type,
+	               "",
+	               "");
+	I_PublicMemberProperty(osg::BoundingBox, bb);
+	I_PublicMemberProperty(osg::KdTree::value_type, first);
+	I_PublicMemberProperty(osg::KdTree::value_type, second);
+END_REFLECTOR
+
+TYPE_NAME_ALIAS(std::vector< unsigned int >, osg::KdTree::LineSegmentIntersection::IndexList)
+
+TYPE_NAME_ALIAS(std::vector< double >, osg::KdTree::LineSegmentIntersection::RatioList)
+
+BEGIN_VALUE_REFLECTOR(osg::KdTree::LineSegmentIntersection)
+	I_DeclaringFile("osg/KdTree");
+	I_Constructor0(____LineSegmentIntersection,
+	               "",
+	               "");
+	I_PublicMemberProperty(double, ratio);
+	I_PublicMemberProperty(osg::Vec3d, intersectionPoint);
+	I_PublicMemberProperty(osg::Vec3, intersectionNormal);
+	I_PublicMemberProperty(unsigned int, p0);
+	I_PublicMemberProperty(unsigned int, p1);
+	I_PublicMemberProperty(unsigned int, p2);
+	I_PublicMemberProperty(float, r0);
+	I_PublicMemberProperty(float, r1);
+	I_PublicMemberProperty(float, r2);
+	I_PublicMemberProperty(unsigned int, primitiveIndex);
+END_REFLECTOR
+
+BEGIN_VALUE_REFLECTOR(osg::KdTree::Triangle)
+	I_DeclaringFile("osg/KdTree");
+	I_Constructor0(____Triangle,
+	               "",
+	               "");
+	I_Constructor3(IN, unsigned int, ip0, IN, unsigned int, ip1, IN, unsigned int, ip2,
+	               ____Triangle__unsigned_int__unsigned_int__unsigned_int,
+	               "",
+	               "");
+	I_PublicMemberProperty(unsigned int, p0);
+	I_PublicMemberProperty(unsigned int, p1);
+	I_PublicMemberProperty(unsigned int, p2);
+END_REFLECTOR
+
+BEGIN_OBJECT_REFLECTOR(osg::KdTreeBuilder)
+	I_DeclaringFile("osg/KdTree");
+	I_BaseType(osg::NodeVisitor);
+	I_Constructor0(____KdTreeBuilder,
+	               "",
+	               "");
+	I_Constructor1(IN, const osg::KdTreeBuilder &, rhs,
+	               Properties::NON_EXPLICIT,
+	               ____KdTreeBuilder__C5_KdTreeBuilder_R1,
+	               "",
+	               "");
+	I_Method0(osg::KdTreeBuilder *, clone,
+	          Properties::VIRTUAL,
+	          __KdTreeBuilder_P1__clone,
+	          "",
+	          "");
+	I_Method1(void, apply, IN, osg::Geode &, geode,
+	          Properties::VIRTUAL,
+	          __void__apply__osg_Geode_R1,
+	          "",
+	          "");
+	I_PublicMemberProperty(osg::KdTree::BuildOptions, _buildOptions);
+	I_PublicMemberProperty(osg::ref_ptr< osg::KdTree >, _kdTreePrototype);
+END_REFLECTOR
+
+STD_VECTOR_REFLECTOR(std::vector< double >)
+
+STD_VECTOR_REFLECTOR(std::vector< osg::KdTree::KdNode >)
+
+STD_VECTOR_REFLECTOR(std::vector< osg::KdTree::LineSegmentIntersection >)
+
+STD_VECTOR_REFLECTOR(std::vector< osg::KdTree::Triangle >)
+

src/osgWrappers/osg/LOD.cpp

@@ -25,14 +25,6 @@
 #undef OUT
 #endif
 
-TYPE_NAME_ALIAS(osg::BoundingSphere::vec_type, osg::LOD::vec_type)
-
-TYPE_NAME_ALIAS(osg::BoundingSphere::value_type, osg::LOD::value_type)
-
-TYPE_NAME_ALIAS(std::pair< float COMMA  float >, osg::LOD::MinMaxPair)
-
-TYPE_NAME_ALIAS(std::vector< osg::LOD::MinMaxPair >, osg::LOD::RangeList)
-
 BEGIN_ENUM_REFLECTOR(osg::LOD::CenterMode)
 	I_DeclaringFile("osg/LOD");
 	I_EnumLabel(osg::LOD::USE_BOUNDING_SPHERE_CENTER);
@@ -45,6 +37,14 @@ BEGIN_ENUM_REFLECTOR(osg::LOD::RangeMode)
 	I_EnumLabel(osg::LOD::PIXEL_SIZE_ON_SCREEN);
 END_REFLECTOR
 
+TYPE_NAME_ALIAS(osg::BoundingSphere::vec_type, osg::LOD::vec_type)
+
+TYPE_NAME_ALIAS(osg::BoundingSphere::value_type, osg::LOD::value_type)
+
+TYPE_NAME_ALIAS(std::pair< float COMMA  float >, osg::LOD::MinMaxPair)
+
+TYPE_NAME_ALIAS(std::vector< osg::LOD::MinMaxPair >, osg::LOD::RangeList)
+
 BEGIN_OBJECT_REFLECTOR(osg::LOD)
 	I_DeclaringFile("osg/LOD");
 	I_BaseType(osg::Group);
@@ -85,7 +85,7 @@ BEGIN_OBJECT_REFLECTOR(osg::LOD)
 	          __void__accept__osg_NodeVisitor_R1,
 	          "Visitor Pattern : calls the apply method of a NodeVisitor with this node's type. ",
 	          "");
-	I_Method1(void, traverse, IN, osg::NodeVisitor &, nv,
+	I_Method1(void, traverse, IN, osg::NodeVisitor &, x,
 	          Properties::VIRTUAL,
 	          __void__traverse__NodeVisitor_R1,
 	          "Traverse downwards : calls children's accept method with NodeVisitor. ",

src/osgWrappers/osg/Light.cpp

@@ -46,7 +46,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Light)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -81,7 +81,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Light)
 	          __unsigned_int__getMember,
 	          "Return the member identifier within the attribute's class type. ",
 	          "Used for light number/clip plane number etc. ");
-	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage,
+	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x,
 	          Properties::VIRTUAL,
 	          __bool__getModeUsage__StateAttribute_ModeUsage_R1,
 	          "Return the modes associated with this StateAttribute. ",

src/osgWrappers/osg/LightModel.cpp

@@ -46,7 +46,7 @@ BEGIN_OBJECT_REFLECTOR(osg::LightModel)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -116,7 +116,7 @@ BEGIN_OBJECT_REFLECTOR(osg::LightModel)
 	          __bool__getTwoSided,
 	          "",
 	          "");
-	I_Method1(void, apply, IN, osg::State &, state,
+	I_Method1(void, apply, IN, osg::State &, x,
 	          Properties::VIRTUAL,
 	          __void__apply__State_R1,
 	          "apply the OpenGL state attributes. ",

src/osgWrappers/osg/LineStipple.cpp

@@ -43,7 +43,7 @@ BEGIN_OBJECT_REFLECTOR(osg::LineStipple)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -73,7 +73,7 @@ BEGIN_OBJECT_REFLECTOR(osg::LineStipple)
 	          __int__compare__C5_StateAttribute_R1,
 	          "return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ",
 	          "");
-	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage,
+	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x,
 	          Properties::VIRTUAL,
 	          __bool__getModeUsage__StateAttribute_ModeUsage_R1,
 	          "Return the modes associated with this StateAttribute. ",
@@ -98,7 +98,7 @@ BEGIN_OBJECT_REFLECTOR(osg::LineStipple)
 	          __GLushort__getPattern,
 	          "",
 	          "");
-	I_Method1(void, apply, IN, osg::State &, state,
+	I_Method1(void, apply, IN, osg::State &, x,
 	          Properties::VIRTUAL,
 	          __void__apply__State_R1,
 	          "apply the OpenGL state attributes. ",

src/osgWrappers/osg/LineWidth.cpp

@@ -41,7 +41,7 @@ BEGIN_OBJECT_REFLECTOR(osg::LineWidth)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -81,7 +81,7 @@ BEGIN_OBJECT_REFLECTOR(osg::LineWidth)
 	          __float__getWidth,
 	          "",
 	          "");
-	I_Method1(void, apply, IN, osg::State &, state,
+	I_Method1(void, apply, IN, osg::State &, x,
 	          Properties::VIRTUAL,
 	          __void__apply__State_R1,
 	          "apply the OpenGL state attributes. ",

src/osgWrappers/osg/LogicOp.cpp

@@ -64,7 +64,7 @@ BEGIN_OBJECT_REFLECTOR(osg::LogicOp)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -94,7 +94,7 @@ BEGIN_OBJECT_REFLECTOR(osg::LogicOp)
 	          __int__compare__C5_StateAttribute_R1,
 	          "Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ",
 	          "");
-	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage,
+	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x,
 	          Properties::VIRTUAL,
 	          __bool__getModeUsage__StateAttribute_ModeUsage_R1,
 	          "Return the modes associated with this StateAttribute. ",
@@ -109,7 +109,7 @@ BEGIN_OBJECT_REFLECTOR(osg::LogicOp)
 	          __Opcode__getOpcode,
 	          "",
 	          "");
-	I_Method1(void, apply, IN, osg::State &, state,
+	I_Method1(void, apply, IN, osg::State &, x,
 	          Properties::VIRTUAL,
 	          __void__apply__State_R1,
 	          "apply the OpenGL state attributes. ",

src/osgWrappers/osg/Material.cpp

@@ -57,7 +57,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Material)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -92,7 +92,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Material)
 	          __bool__getModeUsage__StateAttribute_ModeUsage_R1,
 	          "Return the modes associated with this StateAttribute. ",
 	          "");
-	I_Method1(void, apply, IN, osg::State &, state,
+	I_Method1(void, apply, IN, osg::State &, x,
 	          Properties::VIRTUAL,
 	          __void__apply__State_R1,
 	          "apply the OpenGL state attributes. ",

src/osgWrappers/osg/Multisample.cpp

@@ -46,7 +46,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Multisample)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -111,7 +111,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Multisample)
 	          __Mode__getHint,
 	          "",
 	          "");
-	I_Method1(void, apply, IN, osg::State &, state,
+	I_Method1(void, apply, IN, osg::State &, x,
 	          Properties::VIRTUAL,
 	          __void__apply__State_R1,
 	          "apply the OpenGL state attributes. ",

src/osgWrappers/osg/Node.cpp

@@ -448,7 +448,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Node::ComputeBoundingSphereCallback)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an object, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an object, with Object* return type. ",

src/osgWrappers/osg/NodeCallback.cpp

@@ -39,7 +39,7 @@ BEGIN_OBJECT_REFLECTOR(osg::NodeCallback)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an object, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an object, with Object* return type. ",

src/osgWrappers/osg/OcclusionQueryNode.cpp

@@ -1,206 +1,206 @@
-// ***************************************************************************
-//
-//   Generated automatically by genwrapper.
-//   Please DO NOT EDIT this file!
-//
-// ***************************************************************************
-
-#include <osgIntrospection/ReflectionMacros>
-#include <osgIntrospection/TypedMethodInfo>
-#include <osgIntrospection/StaticMethodInfo>
-#include <osgIntrospection/Attributes>
-
-#include <osg/BoundingSphere>
-#include <osg/Camera>
-#include <osg/CopyOp>
-#include <osg/NodeVisitor>
-#include <osg/Object>
-#include <osg/OcclusionQueryNode>
-#include <osg/State>
-#include <osg/StateSet>
-
-// Must undefine IN and OUT macros defined in Windows headers
-#ifdef IN
-#undef IN
-#endif
-#ifdef OUT
-#undef OUT
-#endif
-
-BEGIN_OBJECT_REFLECTOR(osg::OcclusionQueryNode)
-	I_DeclaringFile("osg/OcclusionQueryNode");
-	I_BaseType(osg::Group);
-	I_Constructor0(____OcclusionQueryNode,
-	               "",
-	               "");
-	I_ConstructorWithDefaults2(IN, const osg::OcclusionQueryNode &, oqn, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY,
-	                           ____OcclusionQueryNode__C5_OcclusionQueryNode_R1__C5_osg_CopyOp_R1,
-	                           "",
-	                           "");
-	I_Method0(osg::Object *, cloneType,
-	          Properties::VIRTUAL,
-	          __osg_Object_P1__cloneType,
-	          "clone an object of the same type as the node. ",
-	          "");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
-	          Properties::VIRTUAL,
-	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
-	          "return a clone of a node, with Object* return type. ",
-	          "");
-	I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj,
-	          Properties::VIRTUAL,
-	          __bool__isSameKindAs__C5_osg_Object_P1,
-	          "return true if this and obj are of the same kind of object. ",
-	          "");
-	I_Method0(const char *, className,
-	          Properties::VIRTUAL,
-	          __C5_char_P1__className,
-	          "return the name of the node's class type. ",
-	          "");
-	I_Method0(const char *, libraryName,
-	          Properties::VIRTUAL,
-	          __C5_char_P1__libraryName,
-	          "return the name of the node's library. ",
-	          "");
-	I_Method1(void, accept, IN, osg::NodeVisitor &, nv,
-	          Properties::VIRTUAL,
-	          __void__accept__osg_NodeVisitor_R1,
-	          "Visitor Pattern : calls the apply method of a NodeVisitor with this node's type. ",
-	          "");
-	I_Method0(osg::BoundingSphere, computeBound,
-	          Properties::VIRTUAL,
-	          __osg_BoundingSphere__computeBound,
-	          "Compute the bounding sphere around Node's geometry or children. ",
-	          "This method is automatically called by getBound() when the bounding sphere has been marked dirty via dirtyBound(). ");
-	I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, state, 0,
-	                      Properties::VIRTUAL,
-	                      __void__releaseGLObjects__osg_State_P1,
-	                      "If State is non-zero, this function releases any associated OpenGL objects for the specified graphics context. ",
-	                      "Otherwise, releases OpenGL objects for all graphics contexts. ");
-	I_MethodWithDefaults1(void, setQueriesEnabled, IN, bool, enable, true,
-	                      Properties::NON_VIRTUAL,
-	                      __void__setQueriesEnabled__bool,
-	                      "",
-	                      "");
-	I_Method0(bool, getQueriesEnabled,
-	          Properties::NON_VIRTUAL,
-	          __bool__getQueriesEnabled,
-	          "",
-	          "");
-	I_Method1(void, setVisibilityThreshold, IN, unsigned int, pixels,
-	          Properties::NON_VIRTUAL,
-	          __void__setVisibilityThreshold__unsigned_int,
-	          "",
-	          "");
-	I_Method0(unsigned int, getVisibilityThreshold,
-	          Properties::NON_VIRTUAL,
-	          __unsigned_int__getVisibilityThreshold,
-	          "",
-	          "");
-	I_Method1(void, setQueryFrameCount, IN, int, frames,
-	          Properties::NON_VIRTUAL,
-	          __void__setQueryFrameCount__int,
-	          "",
-	          "");
-	I_Method0(int, getQueryFrameCount,
-	          Properties::NON_VIRTUAL,
-	          __int__getQueryFrameCount,
-	          "",
-	          "");
-	I_Method1(void, setDebugDisplay, IN, bool, enable,
-	          Properties::NON_VIRTUAL,
-	          __void__setDebugDisplay__bool,
-	          "",
-	          "");
-	I_Method0(bool, getDebugDisplay,
-	          Properties::NON_VIRTUAL,
-	          __bool__getDebugDisplay,
-	          "",
-	          "");
-	I_Method1(void, setQueryStateSet, IN, osg::StateSet *, ss,
-	          Properties::NON_VIRTUAL,
-	          __void__setQueryStateSet__osg_StateSet_P1,
-	          "",
-	          "");
-	I_Method0(osg::StateSet *, getQueryStateSet,
-	          Properties::NON_VIRTUAL,
-	          __osg_StateSet_P1__getQueryStateSet,
-	          "",
-	          "");
-	I_Method0(const osg::StateSet *, getQueryStateSet,
-	          Properties::NON_VIRTUAL,
-	          __C5_osg_StateSet_P1__getQueryStateSet,
-	          "",
-	          "");
-	I_Method1(void, setDebugStateSet, IN, osg::StateSet *, ss,
-	          Properties::NON_VIRTUAL,
-	          __void__setDebugStateSet__osg_StateSet_P1,
-	          "",
-	          "");
-	I_Method0(osg::StateSet *, getDebugStateSet,
-	          Properties::NON_VIRTUAL,
-	          __osg_StateSet_P1__getDebugStateSet,
-	          "",
-	          "");
-	I_Method0(const osg::StateSet *, getDebugStateSet,
-	          Properties::NON_VIRTUAL,
-	          __C5_osg_StateSet_P1__getDebugStateSet,
-	          "",
-	          "");
-	I_Method0(bool, getPassed,
-	          Properties::NON_VIRTUAL,
-	          __bool__getPassed,
-	          "",
-	          "");
-	I_Method2(bool, getPassed, IN, const osg::Camera *, camera, IN, float, distanceToEyePoint,
-	          Properties::NON_VIRTUAL,
-	          __bool__getPassed__C5_osg_Camera_P1__float,
-	          "",
-	          "");
-	I_Method2(void, traverseQuery, IN, const osg::Camera *, camera, IN, osg::NodeVisitor &, nv,
-	          Properties::NON_VIRTUAL,
-	          __void__traverseQuery__C5_osg_Camera_P1__osg_NodeVisitor_R1,
-	          "",
-	          "");
-	I_Method1(void, traverseDebug, IN, osg::NodeVisitor &, nv,
-	          Properties::NON_VIRTUAL,
-	          __void__traverseDebug__osg_NodeVisitor_R1,
-	          "",
-	          "");
-	I_StaticMethod3(void, flushDeletedQueryObjects, IN, unsigned int, contextID, IN, double, currentTime, IN, double &, availableTime,
-	                __void__flushDeletedQueryObjects__unsigned_int__double__double_R1_S,
-	                "",
-	                "");
-	I_StaticMethod1(void, discardDeletedQueryObjects, IN, unsigned int, contextID,
-	                __void__discardDeletedQueryObjects__unsigned_int_S,
-	                "",
-	                "");
-	I_ProtectedMethod0(void, createSupportNodes,
-	                   Properties::NON_VIRTUAL,
-	                   Properties::NON_CONST,
-	                   __void__createSupportNodes,
-	                   "",
-	                   "");
-	I_SimpleProperty(bool, DebugDisplay, 
-	                 __bool__getDebugDisplay, 
-	                 __void__setDebugDisplay__bool);
-	I_SimpleProperty(osg::StateSet *, DebugStateSet, 
-	                 __osg_StateSet_P1__getDebugStateSet, 
-	                 __void__setDebugStateSet__osg_StateSet_P1);
-	I_SimpleProperty(bool, Passed, 
-	                 __bool__getPassed, 
-	                 0);
-	I_SimpleProperty(bool, QueriesEnabled, 
-	                 __bool__getQueriesEnabled, 
-	                 __void__setQueriesEnabled__bool);
-	I_SimpleProperty(int, QueryFrameCount, 
-	                 __int__getQueryFrameCount, 
-	                 __void__setQueryFrameCount__int);
-	I_SimpleProperty(osg::StateSet *, QueryStateSet, 
-	                 __osg_StateSet_P1__getQueryStateSet, 
-	                 __void__setQueryStateSet__osg_StateSet_P1);
-	I_SimpleProperty(unsigned int, VisibilityThreshold, 
-	                 __unsigned_int__getVisibilityThreshold, 
-	                 __void__setVisibilityThreshold__unsigned_int);
-END_REFLECTOR
-
+// ***************************************************************************
+//
+//   Generated automatically by genwrapper.
+//   Please DO NOT EDIT this file!
+//
+// ***************************************************************************
+
+#include <osgIntrospection/ReflectionMacros>
+#include <osgIntrospection/TypedMethodInfo>
+#include <osgIntrospection/StaticMethodInfo>
+#include <osgIntrospection/Attributes>
+
+#include <osg/BoundingSphere>
+#include <osg/Camera>
+#include <osg/CopyOp>
+#include <osg/NodeVisitor>
+#include <osg/Object>
+#include <osg/OcclusionQueryNode>
+#include <osg/State>
+#include <osg/StateSet>
+
+// Must undefine IN and OUT macros defined in Windows headers
+#ifdef IN
+#undef IN
+#endif
+#ifdef OUT
+#undef OUT
+#endif
+
+BEGIN_OBJECT_REFLECTOR(osg::OcclusionQueryNode)
+	I_DeclaringFile("osg/OcclusionQueryNode");
+	I_BaseType(osg::Group);
+	I_Constructor0(____OcclusionQueryNode,
+	               "",
+	               "");
+	I_ConstructorWithDefaults2(IN, const osg::OcclusionQueryNode &, oqn, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY,
+	                           ____OcclusionQueryNode__C5_OcclusionQueryNode_R1__C5_osg_CopyOp_R1,
+	                           "",
+	                           "");
+	I_Method0(osg::Object *, cloneType,
+	          Properties::VIRTUAL,
+	          __osg_Object_P1__cloneType,
+	          "clone an object of the same type as the node. ",
+	          "");
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	          Properties::VIRTUAL,
+	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
+	          "return a clone of a node, with Object* return type. ",
+	          "");
+	I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj,
+	          Properties::VIRTUAL,
+	          __bool__isSameKindAs__C5_osg_Object_P1,
+	          "return true if this and obj are of the same kind of object. ",
+	          "");
+	I_Method0(const char *, className,
+	          Properties::VIRTUAL,
+	          __C5_char_P1__className,
+	          "return the name of the node's class type. ",
+	          "");
+	I_Method0(const char *, libraryName,
+	          Properties::VIRTUAL,
+	          __C5_char_P1__libraryName,
+	          "return the name of the node's library. ",
+	          "");
+	I_Method1(void, accept, IN, osg::NodeVisitor &, nv,
+	          Properties::VIRTUAL,
+	          __void__accept__osg_NodeVisitor_R1,
+	          "Visitor Pattern : calls the apply method of a NodeVisitor with this node's type. ",
+	          "");
+	I_Method0(osg::BoundingSphere, computeBound,
+	          Properties::VIRTUAL,
+	          __osg_BoundingSphere__computeBound,
+	          "Compute the bounding sphere around Node's geometry or children. ",
+	          "This method is automatically called by getBound() when the bounding sphere has been marked dirty via dirtyBound(). ");
+	I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, x, 0,
+	                      Properties::VIRTUAL,
+	                      __void__releaseGLObjects__osg_State_P1,
+	                      "If State is non-zero, this function releases any associated OpenGL objects for the specified graphics context. ",
+	                      "Otherwise, releases OpenGL objects for all graphics contexts. ");
+	I_MethodWithDefaults1(void, setQueriesEnabled, IN, bool, enable, true,
+	                      Properties::NON_VIRTUAL,
+	                      __void__setQueriesEnabled__bool,
+	                      "",
+	                      "");
+	I_Method0(bool, getQueriesEnabled,
+	          Properties::NON_VIRTUAL,
+	          __bool__getQueriesEnabled,
+	          "",
+	          "");
+	I_Method1(void, setVisibilityThreshold, IN, unsigned int, pixels,
+	          Properties::NON_VIRTUAL,
+	          __void__setVisibilityThreshold__unsigned_int,
+	          "",
+	          "");
+	I_Method0(unsigned int, getVisibilityThreshold,
+	          Properties::NON_VIRTUAL,
+	          __unsigned_int__getVisibilityThreshold,
+	          "",
+	          "");
+	I_Method1(void, setQueryFrameCount, IN, int, frames,
+	          Properties::NON_VIRTUAL,
+	          __void__setQueryFrameCount__int,
+	          "",
+	          "");
+	I_Method0(int, getQueryFrameCount,
+	          Properties::NON_VIRTUAL,
+	          __int__getQueryFrameCount,
+	          "",
+	          "");
+	I_Method1(void, setDebugDisplay, IN, bool, enable,
+	          Properties::NON_VIRTUAL,
+	          __void__setDebugDisplay__bool,
+	          "",
+	          "");
+	I_Method0(bool, getDebugDisplay,
+	          Properties::NON_VIRTUAL,
+	          __bool__getDebugDisplay,
+	          "",
+	          "");
+	I_Method1(void, setQueryStateSet, IN, osg::StateSet *, ss,
+	          Properties::NON_VIRTUAL,
+	          __void__setQueryStateSet__osg_StateSet_P1,
+	          "",
+	          "");
+	I_Method0(osg::StateSet *, getQueryStateSet,
+	          Properties::NON_VIRTUAL,
+	          __osg_StateSet_P1__getQueryStateSet,
+	          "",
+	          "");
+	I_Method0(const osg::StateSet *, getQueryStateSet,
+	          Properties::NON_VIRTUAL,
+	          __C5_osg_StateSet_P1__getQueryStateSet,
+	          "",
+	          "");
+	I_Method1(void, setDebugStateSet, IN, osg::StateSet *, ss,
+	          Properties::NON_VIRTUAL,
+	          __void__setDebugStateSet__osg_StateSet_P1,
+	          "",
+	          "");
+	I_Method0(osg::StateSet *, getDebugStateSet,
+	          Properties::NON_VIRTUAL,
+	          __osg_StateSet_P1__getDebugStateSet,
+	          "",
+	          "");
+	I_Method0(const osg::StateSet *, getDebugStateSet,
+	          Properties::NON_VIRTUAL,
+	          __C5_osg_StateSet_P1__getDebugStateSet,
+	          "",
+	          "");
+	I_Method0(bool, getPassed,
+	          Properties::NON_VIRTUAL,
+	          __bool__getPassed,
+	          "",
+	          "");
+	I_Method2(bool, getPassed, IN, const osg::Camera *, camera, IN, float, distanceToEyePoint,
+	          Properties::NON_VIRTUAL,
+	          __bool__getPassed__C5_osg_Camera_P1__float,
+	          "",
+	          "");
+	I_Method2(void, traverseQuery, IN, const osg::Camera *, camera, IN, osg::NodeVisitor &, nv,
+	          Properties::NON_VIRTUAL,
+	          __void__traverseQuery__C5_osg_Camera_P1__osg_NodeVisitor_R1,
+	          "",
+	          "");
+	I_Method1(void, traverseDebug, IN, osg::NodeVisitor &, nv,
+	          Properties::NON_VIRTUAL,
+	          __void__traverseDebug__osg_NodeVisitor_R1,
+	          "",
+	          "");
+	I_StaticMethod3(void, flushDeletedQueryObjects, IN, unsigned int, contextID, IN, double, currentTime, IN, double &, availableTime,
+	                __void__flushDeletedQueryObjects__unsigned_int__double__double_R1_S,
+	                "",
+	                "");
+	I_StaticMethod1(void, discardDeletedQueryObjects, IN, unsigned int, contextID,
+	                __void__discardDeletedQueryObjects__unsigned_int_S,
+	                "",
+	                "");
+	I_ProtectedMethod0(void, createSupportNodes,
+	                   Properties::NON_VIRTUAL,
+	                   Properties::NON_CONST,
+	                   __void__createSupportNodes,
+	                   "",
+	                   "");
+	I_SimpleProperty(bool, DebugDisplay, 
+	                 __bool__getDebugDisplay, 
+	                 __void__setDebugDisplay__bool);
+	I_SimpleProperty(osg::StateSet *, DebugStateSet, 
+	                 __osg_StateSet_P1__getDebugStateSet, 
+	                 __void__setDebugStateSet__osg_StateSet_P1);
+	I_SimpleProperty(bool, Passed, 
+	                 __bool__getPassed, 
+	                 0);
+	I_SimpleProperty(bool, QueriesEnabled, 
+	                 __bool__getQueriesEnabled, 
+	                 __void__setQueriesEnabled__bool);
+	I_SimpleProperty(int, QueryFrameCount, 
+	                 __int__getQueryFrameCount, 
+	                 __void__setQueryFrameCount__int);
+	I_SimpleProperty(osg::StateSet *, QueryStateSet, 
+	                 __osg_StateSet_P1__getQueryStateSet, 
+	                 __void__setQueryStateSet__osg_StateSet_P1);
+	I_SimpleProperty(unsigned int, VisibilityThreshold, 
+	                 __unsigned_int__getVisibilityThreshold, 
+	                 __void__setVisibilityThreshold__unsigned_int);
+END_REFLECTOR
+

src/osgWrappers/osg/PagedLOD.cpp

@@ -68,7 +68,7 @@ BEGIN_OBJECT_REFLECTOR(osg::PagedLOD)
 	          __void__accept__osg_NodeVisitor_R1,
 	          "Visitor Pattern : calls the apply method of a NodeVisitor with this node's type. ",
 	          "");
-	I_Method1(void, traverse, IN, osg::NodeVisitor &, nv,
+	I_Method1(void, traverse, IN, osg::NodeVisitor &, x,
 	          Properties::VIRTUAL,
 	          __void__traverse__NodeVisitor_R1,
 	          "Traverse downwards : calls children's accept method with NodeVisitor. ",

src/osgWrappers/osg/Point.cpp

@@ -45,7 +45,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Point)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -75,7 +75,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Point)
 	          __int__compare__C5_StateAttribute_R1,
 	          "return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ",
 	          "");
-	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage,
+	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x,
 	          Properties::VIRTUAL,
 	          __bool__getModeUsage__StateAttribute_ModeUsage_R1,
 	          "Return the modes associated with this StateAttribute. ",
@@ -130,7 +130,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Point)
 	          __float__getMaxSize,
 	          "",
 	          "");
-	I_Method1(void, apply, IN, osg::State &, state,
+	I_Method1(void, apply, IN, osg::State &, x,
 	          Properties::VIRTUAL,
 	          __void__apply__State_R1,
 	          "apply the OpenGL state attributes. ",

src/osgWrappers/osg/PointSprite.cpp

@@ -45,7 +45,7 @@ BEGIN_OBJECT_REFLECTOR(osg::PointSprite)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -75,7 +75,7 @@ BEGIN_OBJECT_REFLECTOR(osg::PointSprite)
 	          __int__compare__C5_StateAttribute_R1,
 	          "return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ",
 	          "");
-	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage,
+	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x,
 	          Properties::VIRTUAL,
 	          __bool__getModeUsage__StateAttribute_ModeUsage_R1,
 	          "Return the modes associated with this StateAttribute. ",
@@ -90,7 +90,7 @@ BEGIN_OBJECT_REFLECTOR(osg::PointSprite)
 	          __bool__isTextureAttribute,
 	          "Return true if StateAttribute is a type which controls texturing and needs to be issued w.r.t to specific texture unit. ",
 	          "");
-	I_Method1(void, apply, IN, osg::State &, state,
+	I_Method1(void, apply, IN, osg::State &, x,
 	          Properties::VIRTUAL,
 	          __void__apply__osg_State_R1,
 	          "apply the OpenGL state attributes. ",

src/osgWrappers/osg/PolygonMode.cpp

@@ -57,7 +57,7 @@ BEGIN_OBJECT_REFLECTOR(osg::PolygonMode)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -102,7 +102,7 @@ BEGIN_OBJECT_REFLECTOR(osg::PolygonMode)
 	          __bool__getFrontAndBack,
 	          "",
 	          "");
-	I_Method1(void, apply, IN, osg::State &, state,
+	I_Method1(void, apply, IN, osg::State &, x,
 	          Properties::VIRTUAL,
 	          __void__apply__State_R1,
 	          "apply the OpenGL state attributes. ",

src/osgWrappers/osg/PolygonOffset.cpp

@@ -43,7 +43,7 @@ BEGIN_OBJECT_REFLECTOR(osg::PolygonOffset)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -73,7 +73,7 @@ BEGIN_OBJECT_REFLECTOR(osg::PolygonOffset)
 	          __int__compare__C5_StateAttribute_R1,
 	          "return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ",
 	          "");
-	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage,
+	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x,
 	          Properties::VIRTUAL,
 	          __bool__getModeUsage__StateAttribute_ModeUsage_R1,
 	          "Return the modes associated with this StateAttribute. ",
@@ -98,7 +98,7 @@ BEGIN_OBJECT_REFLECTOR(osg::PolygonOffset)
 	          __float__getUnits,
 	          "",
 	          "");
-	I_Method1(void, apply, IN, osg::State &, state,
+	I_Method1(void, apply, IN, osg::State &, x,
 	          Properties::VIRTUAL,
 	          __void__apply__State_R1,
 	          "apply the OpenGL state attributes. ",

src/osgWrappers/osg/PolygonStipple.cpp

@@ -44,7 +44,7 @@ BEGIN_OBJECT_REFLECTOR(osg::PolygonStipple)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -74,7 +74,7 @@ BEGIN_OBJECT_REFLECTOR(osg::PolygonStipple)
 	          __int__compare__C5_StateAttribute_R1,
 	          "return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ",
 	          "");
-	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage,
+	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x,
 	          Properties::VIRTUAL,
 	          __bool__getModeUsage__StateAttribute_ModeUsage_R1,
 	          "Return the modes associated with this StateAttribute. ",
@@ -89,7 +89,7 @@ BEGIN_OBJECT_REFLECTOR(osg::PolygonStipple)
 	          __C5_GLubyte_P1__getMask,
 	          "get a pointer to the mask. ",
 	          "");
-	I_Method1(void, apply, IN, osg::State &, state,
+	I_Method1(void, apply, IN, osg::State &, x,
 	          Properties::VIRTUAL,
 	          __void__apply__State_R1,
 	          "apply the OpenGL state attributes. ",

src/osgWrappers/osg/PrimitiveSet.cpp

@@ -53,7 +53,7 @@ BEGIN_OBJECT_REFLECTOR(osg::DrawArrays)
 	          __Object_P1__cloneType,
 	          "Clone the type of an object, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __Object_P1__clone__C5_CopyOp_R1,
 	          "Clone an object, with Object* return type. ",

src/osgWrappers/osg/Program.cpp

@@ -47,7 +47,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Program)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",

src/osgWrappers/osg/ProxyNode.cpp

@@ -27,10 +27,6 @@
 #undef OUT
 #endif
 
-TYPE_NAME_ALIAS(osg::BoundingSphere::vec_type, osg::ProxyNode::vec_type)
-
-TYPE_NAME_ALIAS(osg::BoundingSphere::value_type, osg::ProxyNode::value_type)
-
 BEGIN_ENUM_REFLECTOR(osg::ProxyNode::CenterMode)
 	I_DeclaringFile("osg/ProxyNode");
 	I_EnumLabel(osg::ProxyNode::USE_BOUNDING_SPHERE_CENTER);
@@ -44,6 +40,10 @@ BEGIN_ENUM_REFLECTOR(osg::ProxyNode::LoadingExternalReferenceMode)
 	I_EnumLabel(osg::ProxyNode::NO_AUTOMATIC_LOADING);
 END_REFLECTOR
 
+TYPE_NAME_ALIAS(osg::BoundingSphere::vec_type, osg::ProxyNode::vec_type)
+
+TYPE_NAME_ALIAS(osg::BoundingSphere::value_type, osg::ProxyNode::value_type)
+
 BEGIN_OBJECT_REFLECTOR(osg::ProxyNode)
 	I_DeclaringFile("osg/ProxyNode");
 	I_BaseType(osg::Group);
@@ -84,7 +84,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ProxyNode)
 	          __void__accept__osg_NodeVisitor_R1,
 	          "Visitor Pattern : calls the apply method of a NodeVisitor with this node's type. ",
 	          "");
-	I_Method1(void, traverse, IN, osg::NodeVisitor &, nv,
+	I_Method1(void, traverse, IN, osg::NodeVisitor &, x,
 	          Properties::VIRTUAL,
 	          __void__traverse__NodeVisitor_R1,
 	          "Traverse downwards : calls children's accept method with NodeVisitor. ",

src/osgWrappers/osg/Scissor.cpp

@@ -43,7 +43,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Scissor)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -73,7 +73,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Scissor)
 	          __int__compare__C5_StateAttribute_R1,
 	          "Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ",
 	          "");
-	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage,
+	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x,
 	          Properties::VIRTUAL,
 	          __bool__getModeUsage__StateAttribute_ModeUsage_R1,
 	          "Return the modes associated with this StateAttribute. ",
@@ -128,7 +128,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Scissor)
 	          __int__height,
 	          "",
 	          "");
-	I_Method1(void, apply, IN, osg::State &, state,
+	I_Method1(void, apply, IN, osg::State &, x,
 	          Properties::VIRTUAL,
 	          __void__apply__State_R1,
 	          "apply the OpenGL state attributes. ",

src/osgWrappers/osg/Sequence.cpp

@@ -78,7 +78,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Sequence)
 	          __void__accept__osg_NodeVisitor_R1,
 	          "Visitor Pattern : calls the apply method of a NodeVisitor with this node's type. ",
 	          "");
-	I_Method1(void, traverse, IN, osg::NodeVisitor &, nv,
+	I_Method1(void, traverse, IN, osg::NodeVisitor &, x,
 	          Properties::VIRTUAL,
 	          __void__traverse__NodeVisitor_R1,
 	          "Traverse downwards : calls children's accept method with NodeVisitor. ",

src/osgWrappers/osg/ShadeModel.cpp

@@ -47,7 +47,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ShadeModel)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -87,7 +87,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ShadeModel)
 	          __Mode__getMode,
 	          "",
 	          "");
-	I_Method1(void, apply, IN, osg::State &, state,
+	I_Method1(void, apply, IN, osg::State &, x,
 	          Properties::VIRTUAL,
 	          __void__apply__State_R1,
 	          "apply the OpenGL state attributes. ",

src/osgWrappers/osg/Shader.cpp

@@ -52,7 +52,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Shader)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an object, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an object, with Object* return type. ",

src/osgWrappers/osg/Shape.cpp

@@ -50,7 +50,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Box)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -70,12 +70,12 @@ BEGIN_OBJECT_REFLECTOR(osg::Box)
 	          __C5_char_P1__className,
 	          "return the name of the attribute's class type. ",
 	          "");
-	I_Method1(void, accept, IN, osg::ShapeVisitor &, sv,
+	I_Method1(void, accept, IN, osg::ShapeVisitor &, x,
 	          Properties::VIRTUAL,
 	          __void__accept__osg_ShapeVisitor_R1,
 	          "accept a non const shape visitor which can be used on non const shape objects. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(void, accept, IN, osg::ConstShapeVisitor &, csv,
+	I_Method1(void, accept, IN, osg::ConstShapeVisitor &, x,
 	          Properties::VIRTUAL,
 	          __void__accept__osg_ConstShapeVisitor_R1,
 	          "accept a const shape visitor which can be used on const shape objects. ",
@@ -160,7 +160,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Capsule)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -180,12 +180,12 @@ BEGIN_OBJECT_REFLECTOR(osg::Capsule)
 	          __C5_char_P1__className,
 	          "return the name of the attribute's class type. ",
 	          "");
-	I_Method1(void, accept, IN, osg::ShapeVisitor &, sv,
+	I_Method1(void, accept, IN, osg::ShapeVisitor &, x,
 	          Properties::VIRTUAL,
 	          __void__accept__osg_ShapeVisitor_R1,
 	          "accept a non const shape visitor which can be used on non const shape objects. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(void, accept, IN, osg::ConstShapeVisitor &, csv,
+	I_Method1(void, accept, IN, osg::ConstShapeVisitor &, x,
 	          Properties::VIRTUAL,
 	          __void__accept__osg_ConstShapeVisitor_R1,
 	          "accept a const shape visitor which can be used on const shape objects. ",
@@ -281,7 +281,7 @@ BEGIN_OBJECT_REFLECTOR(osg::CompositeShape)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -301,12 +301,12 @@ BEGIN_OBJECT_REFLECTOR(osg::CompositeShape)
 	          __C5_char_P1__className,
 	          "return the name of the attribute's class type. ",
 	          "");
-	I_Method1(void, accept, IN, osg::ShapeVisitor &, sv,
+	I_Method1(void, accept, IN, osg::ShapeVisitor &, x,
 	          Properties::VIRTUAL,
 	          __void__accept__osg_ShapeVisitor_R1,
 	          "accept a non const shape visitor which can be used on non const shape objects. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(void, accept, IN, osg::ConstShapeVisitor &, csv,
+	I_Method1(void, accept, IN, osg::ConstShapeVisitor &, x,
 	          Properties::VIRTUAL,
 	          __void__accept__osg_ConstShapeVisitor_R1,
 	          "accept a const shape visitor which can be used on const shape objects. ",
@@ -387,7 +387,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Cone)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -407,12 +407,12 @@ BEGIN_OBJECT_REFLECTOR(osg::Cone)
 	          __C5_char_P1__className,
 	          "return the name of the attribute's class type. ",
 	          "");
-	I_Method1(void, accept, IN, osg::ShapeVisitor &, sv,
+	I_Method1(void, accept, IN, osg::ShapeVisitor &, x,
 	          Properties::VIRTUAL,
 	          __void__accept__osg_ShapeVisitor_R1,
 	          "accept a non const shape visitor which can be used on non const shape objects. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(void, accept, IN, osg::ConstShapeVisitor &, csv,
+	I_Method1(void, accept, IN, osg::ConstShapeVisitor &, x,
 	          Properties::VIRTUAL,
 	          __void__accept__osg_ConstShapeVisitor_R1,
 	          "accept a const shape visitor which can be used on const shape objects. ",
@@ -584,7 +584,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ConvexHull)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -604,12 +604,12 @@ BEGIN_OBJECT_REFLECTOR(osg::ConvexHull)
 	          __C5_char_P1__className,
 	          "return the name of the attribute's class type. ",
 	          "");
-	I_Method1(void, accept, IN, osg::ShapeVisitor &, sv,
+	I_Method1(void, accept, IN, osg::ShapeVisitor &, x,
 	          Properties::VIRTUAL,
 	          __void__accept__osg_ShapeVisitor_R1,
 	          "accept a non const shape visitor which can be used on non const shape objects. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(void, accept, IN, osg::ConstShapeVisitor &, csv,
+	I_Method1(void, accept, IN, osg::ConstShapeVisitor &, x,
 	          Properties::VIRTUAL,
 	          __void__accept__osg_ConstShapeVisitor_R1,
 	          "accept a const shape visitor which can be used on const shape objects. ",
@@ -635,7 +635,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Cylinder)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -655,12 +655,12 @@ BEGIN_OBJECT_REFLECTOR(osg::Cylinder)
 	          __C5_char_P1__className,
 	          "return the name of the attribute's class type. ",
 	          "");
-	I_Method1(void, accept, IN, osg::ShapeVisitor &, sv,
+	I_Method1(void, accept, IN, osg::ShapeVisitor &, x,
 	          Properties::VIRTUAL,
 	          __void__accept__osg_ShapeVisitor_R1,
 	          "accept a non const shape visitor which can be used on non const shape objects. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(void, accept, IN, osg::ConstShapeVisitor &, csv,
+	I_Method1(void, accept, IN, osg::ConstShapeVisitor &, x,
 	          Properties::VIRTUAL,
 	          __void__accept__osg_ConstShapeVisitor_R1,
 	          "accept a const shape visitor which can be used on const shape objects. ",
@@ -756,7 +756,7 @@ BEGIN_OBJECT_REFLECTOR(osg::HeightField)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -776,12 +776,12 @@ BEGIN_OBJECT_REFLECTOR(osg::HeightField)
 	          __C5_char_P1__className,
 	          "return the name of the attribute's class type. ",
 	          "");
-	I_Method1(void, accept, IN, osg::ShapeVisitor &, sv,
+	I_Method1(void, accept, IN, osg::ShapeVisitor &, x,
 	          Properties::VIRTUAL,
 	          __void__accept__osg_ShapeVisitor_R1,
 	          "accept a non const shape visitor which can be used on non const shape objects. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(void, accept, IN, osg::ConstShapeVisitor &, csv,
+	I_Method1(void, accept, IN, osg::ConstShapeVisitor &, x,
 	          Properties::VIRTUAL,
 	          __void__accept__osg_ConstShapeVisitor_R1,
 	          "accept a const shape visitor which can be used on const shape objects. ",
@@ -967,7 +967,7 @@ BEGIN_OBJECT_REFLECTOR(osg::InfinitePlane)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -987,12 +987,12 @@ BEGIN_OBJECT_REFLECTOR(osg::InfinitePlane)
 	          __C5_char_P1__className,
 	          "return the name of the attribute's class type. ",
 	          "");
-	I_Method1(void, accept, IN, osg::ShapeVisitor &, sv,
+	I_Method1(void, accept, IN, osg::ShapeVisitor &, x,
 	          Properties::VIRTUAL,
 	          __void__accept__osg_ShapeVisitor_R1,
 	          "accept a non const shape visitor which can be used on non const shape objects. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(void, accept, IN, osg::ConstShapeVisitor &, csv,
+	I_Method1(void, accept, IN, osg::ConstShapeVisitor &, x,
 	          Properties::VIRTUAL,
 	          __void__accept__osg_ConstShapeVisitor_R1,
 	          "accept a const shape visitor which can be used on const shape objects. ",
@@ -1127,7 +1127,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Sphere)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -1147,12 +1147,12 @@ BEGIN_OBJECT_REFLECTOR(osg::Sphere)
 	          __C5_char_P1__className,
 	          "return the name of the attribute's class type. ",
 	          "");
-	I_Method1(void, accept, IN, osg::ShapeVisitor &, sv,
+	I_Method1(void, accept, IN, osg::ShapeVisitor &, x,
 	          Properties::VIRTUAL,
 	          __void__accept__osg_ShapeVisitor_R1,
 	          "accept a non const shape visitor which can be used on non const shape objects. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(void, accept, IN, osg::ConstShapeVisitor &, csv,
+	I_Method1(void, accept, IN, osg::ConstShapeVisitor &, x,
 	          Properties::VIRTUAL,
 	          __void__accept__osg_ConstShapeVisitor_R1,
 	          "accept a const shape visitor which can be used on const shape objects. ",
@@ -1210,7 +1210,7 @@ BEGIN_OBJECT_REFLECTOR(osg::TriangleMesh)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -1230,12 +1230,12 @@ BEGIN_OBJECT_REFLECTOR(osg::TriangleMesh)
 	          __C5_char_P1__className,
 	          "return the name of the attribute's class type. ",
 	          "");
-	I_Method1(void, accept, IN, osg::ShapeVisitor &, sv,
+	I_Method1(void, accept, IN, osg::ShapeVisitor &, x,
 	          Properties::VIRTUAL,
 	          __void__accept__osg_ShapeVisitor_R1,
 	          "accept a non const shape visitor which can be used on non const shape objects. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(void, accept, IN, osg::ConstShapeVisitor &, csv,
+	I_Method1(void, accept, IN, osg::ConstShapeVisitor &, x,
 	          Properties::VIRTUAL,
 	          __void__accept__osg_ConstShapeVisitor_R1,
 	          "accept a const shape visitor which can be used on const shape objects. ",

src/osgWrappers/osg/ShapeDrawable.cpp

@@ -47,7 +47,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ShapeDrawable)
 	          __Object_P1__cloneType,
 	          "Clone the type of an object, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __Object_P1__clone__C5_CopyOp_R1,
 	          "Clone an object, with Object* return type. ",
@@ -156,7 +156,7 @@ BEGIN_OBJECT_REFLECTOR(osg::TessellationHints)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an object, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an object, with Object* return type. ",

src/osgWrappers/osg/State.cpp

@@ -31,8 +31,6 @@
 #undef OUT
 #endif
 
-TYPE_NAME_ALIAS(std::vector< const osg::StateSet * >, osg::State::StateSetStack)
-
 BEGIN_ENUM_REFLECTOR(osg::State::CheckForGLErrors)
 	I_DeclaringFile("osg/State");
 	I_EnumLabel(osg::State::NEVER_CHECK_GL_ERRORS);
@@ -40,6 +38,8 @@ BEGIN_ENUM_REFLECTOR(osg::State::CheckForGLErrors)
 	I_EnumLabel(osg::State::ONCE_PER_ATTRIBUTE);
 END_REFLECTOR
 
+TYPE_NAME_ALIAS(std::vector< const osg::StateSet * >, osg::State::StateSetStack)
+
 BEGIN_OBJECT_REFLECTOR(osg::State)
 	I_DeclaringFile("osg/State");
 	I_BaseType(osg::Referenced);

src/osgWrappers/osg/StateAttribute.cpp

@@ -26,16 +26,6 @@
 #undef OUT
 #endif
 
-TYPE_NAME_ALIAS(GLenum, osg::StateAttribute::GLMode)
-
-TYPE_NAME_ALIAS(unsigned int, osg::StateAttribute::GLModeValue)
-
-TYPE_NAME_ALIAS(unsigned int, osg::StateAttribute::OverrideValue)
-
-TYPE_NAME_ALIAS(std::pair< osg::StateAttribute::Type COMMA  unsigned int >, osg::StateAttribute::TypeMemberPair)
-
-TYPE_NAME_ALIAS(std::vector< osg::StateSet * >, osg::StateAttribute::ParentList)
-
 BEGIN_ENUM_REFLECTOR(osg::StateAttribute::Values)
 	I_DeclaringFile("osg/StateAttribute");
 	I_EnumLabel(osg::StateAttribute::OFF);
@@ -97,6 +87,16 @@ BEGIN_ENUM_REFLECTOR(osg::StateAttribute::Type)
 	I_EnumLabel(osg::StateAttribute::OSGNVPARSE_PROGRAM_PARSER);
 END_REFLECTOR
 
+TYPE_NAME_ALIAS(GLenum, osg::StateAttribute::GLMode)
+
+TYPE_NAME_ALIAS(unsigned int, osg::StateAttribute::GLModeValue)
+
+TYPE_NAME_ALIAS(unsigned int, osg::StateAttribute::OverrideValue)
+
+TYPE_NAME_ALIAS(std::pair< osg::StateAttribute::Type COMMA  unsigned int >, osg::StateAttribute::TypeMemberPair)
+
+TYPE_NAME_ALIAS(std::vector< osg::StateSet * >, osg::StateAttribute::ParentList)
+
 BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::StateAttribute)
 	I_DeclaringFile("osg/StateAttribute");
 	I_BaseType(osg::Object);
@@ -301,7 +301,7 @@ BEGIN_OBJECT_REFLECTOR(osg::StateAttribute::Callback)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an object, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an object, with Object* return type. ",

src/osgWrappers/osg/StateSet.cpp

@@ -26,6 +26,20 @@
 #undef OUT
 #endif
 
+BEGIN_ENUM_REFLECTOR(osg::StateSet::RenderingHint)
+	I_DeclaringFile("osg/StateSet");
+	I_EnumLabel(osg::StateSet::DEFAULT_BIN);
+	I_EnumLabel(osg::StateSet::OPAQUE_BIN);
+	I_EnumLabel(osg::StateSet::TRANSPARENT_BIN);
+END_REFLECTOR
+
+BEGIN_ENUM_REFLECTOR(osg::StateSet::RenderBinMode)
+	I_DeclaringFile("osg/StateSet");
+	I_EnumLabel(osg::StateSet::INHERIT_RENDERBIN_DETAILS);
+	I_EnumLabel(osg::StateSet::USE_RENDERBIN_DETAILS);
+	I_EnumLabel(osg::StateSet::OVERRIDE_RENDERBIN_DETAILS);
+END_REFLECTOR
+
 TYPE_NAME_ALIAS(std::vector< osg::Object * >, osg::StateSet::ParentList)
 
 TYPE_NAME_ALIAS(std::map< osg::StateAttribute::GLMode COMMA  osg::StateAttribute::GLModeValue >, osg::StateSet::ModeList)
@@ -42,20 +56,6 @@ TYPE_NAME_ALIAS(std::pair< osg::ref_ptr< osg::Uniform > COMMA  osg::StateAttribu
 
 TYPE_NAME_ALIAS(std::map< std::string COMMA  osg::StateSet::RefUniformPair >, osg::StateSet::UniformList)
 
-BEGIN_ENUM_REFLECTOR(osg::StateSet::RenderingHint)
-	I_DeclaringFile("osg/StateSet");
-	I_EnumLabel(osg::StateSet::DEFAULT_BIN);
-	I_EnumLabel(osg::StateSet::OPAQUE_BIN);
-	I_EnumLabel(osg::StateSet::TRANSPARENT_BIN);
-END_REFLECTOR
-
-BEGIN_ENUM_REFLECTOR(osg::StateSet::RenderBinMode)
-	I_DeclaringFile("osg/StateSet");
-	I_EnumLabel(osg::StateSet::INHERIT_RENDERBIN_DETAILS);
-	I_EnumLabel(osg::StateSet::USE_RENDERBIN_DETAILS);
-	I_EnumLabel(osg::StateSet::OVERRIDE_RENDERBIN_DETAILS);
-END_REFLECTOR
-
 BEGIN_OBJECT_REFLECTOR(osg::StateSet)
 	I_DeclaringFile("osg/StateSet");
 	I_BaseType(osg::Object);
@@ -71,7 +71,7 @@ BEGIN_OBJECT_REFLECTOR(osg::StateSet)
 	          __Object_P1__cloneType,
 	          "Clone the type of an object, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __Object_P1__clone__C5_CopyOp_R1,
 	          "Clone an object, with Object* return type. ",
@@ -688,7 +688,7 @@ BEGIN_OBJECT_REFLECTOR(osg::StateSet::Callback)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an object, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an object, with Object* return type. ",

src/osgWrappers/osg/Stencil.cpp

@@ -63,7 +63,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Stencil)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -93,7 +93,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Stencil)
 	          __int__compare__C5_StateAttribute_R1,
 	          "return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ",
 	          "");
-	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage,
+	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x,
 	          Properties::VIRTUAL,
 	          __bool__getModeUsage__StateAttribute_ModeUsage_R1,
 	          "Return the modes associated with this StateAttribute. ",
@@ -178,7 +178,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Stencil)
 	          __unsigned_int__getWriteMask,
 	          "",
 	          "");
-	I_Method1(void, apply, IN, osg::State &, state,
+	I_Method1(void, apply, IN, osg::State &, x,
 	          Properties::VIRTUAL,
 	          __void__apply__State_R1,
 	          "apply the OpenGL state attributes. ",

src/osgWrappers/osg/StencilTwoSided.cpp

@@ -69,7 +69,7 @@ BEGIN_OBJECT_REFLECTOR(osg::StencilTwoSided)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -99,7 +99,7 @@ BEGIN_OBJECT_REFLECTOR(osg::StencilTwoSided)
 	          __int__compare__C5_StateAttribute_R1,
 	          "return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ",
 	          "");
-	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage,
+	I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x,
 	          Properties::VIRTUAL,
 	          __bool__getModeUsage__StateAttribute_ModeUsage_R1,
 	          "Return the modes associated with this StateAttribute. ",
@@ -184,7 +184,7 @@ BEGIN_OBJECT_REFLECTOR(osg::StencilTwoSided)
 	          __unsigned_int__getWriteMask__Face,
 	          "",
 	          "");
-	I_Method1(void, apply, IN, osg::State &, state,
+	I_Method1(void, apply, IN, osg::State &, x,
 	          Properties::VIRTUAL,
 	          __void__apply__State_R1,
 	          "apply the OpenGL state attributes. ",

src/osgWrappers/osg/Switch.cpp

@@ -67,7 +67,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Switch)
 	          __void__accept__osg_NodeVisitor_R1,
 	          "Visitor Pattern : calls the apply method of a NodeVisitor with this node's type. ",
 	          "");
-	I_Method1(void, traverse, IN, osg::NodeVisitor &, nv,
+	I_Method1(void, traverse, IN, osg::NodeVisitor &, x,
 	          Properties::VIRTUAL,
 	          __void__traverse__NodeVisitor_R1,
 	          "Traverse downwards : calls children's accept method with NodeVisitor. ",

src/osgWrappers/osg/TexEnv.cpp

@@ -51,7 +51,7 @@ BEGIN_OBJECT_REFLECTOR(osg::TexEnv)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -111,7 +111,7 @@ BEGIN_OBJECT_REFLECTOR(osg::TexEnv)
 	          __C5_Vec4_R1__getColor,
 	          "",
 	          "");
-	I_Method1(void, apply, IN, osg::State &, state,
+	I_Method1(void, apply, IN, osg::State &, x,
 	          Properties::VIRTUAL,
 	          __void__apply__State_R1,
 	          "apply the OpenGL state attributes. ",

src/osgWrappers/osg/TexEnvCombine.cpp

@@ -77,7 +77,7 @@ BEGIN_OBJECT_REFLECTOR(osg::TexEnvCombine)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -292,7 +292,7 @@ BEGIN_OBJECT_REFLECTOR(osg::TexEnvCombine)
 	          __Vec3__getConstantColorAsLightDirection,
 	          "",
 	          "");
-	I_Method1(void, apply, IN, osg::State &, state,
+	I_Method1(void, apply, IN, osg::State &, x,
 	          Properties::VIRTUAL,
 	          __void__apply__State_R1,
 	          "apply the OpenGL state attributes. ",

src/osgWrappers/osg/TexEnvFilter.cpp

@@ -41,7 +41,7 @@ BEGIN_OBJECT_REFLECTOR(osg::TexEnvFilter)
 	          __osg_Object_P1__cloneType,
 	          "Clone the type of an attribute, with Object* return type. ",
 	          "Must be defined by derived classes. ");
-	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
+	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x,
 	          Properties::VIRTUAL,
 	          __osg_Object_P1__clone__C5_osg_CopyOp_R1,
 	          "Clone an attribute, with Object* return type. ",
@@ -86,7 +86,7 @@ BEGIN_OBJECT_REFLECTOR(osg::TexEnvFilter)
 	          __float__getLodBias,
 	          "",
 	          "");
-	I_Method1(void, apply, IN, osg::State &, state,
+	I_Method1(void, apply, IN, osg::State &, x,
 	          Properties::VIRTUAL,
 	          __void__apply__State_R1,
 	          "apply the OpenGL state attributes. ",