diff --git a/src/osgWrappers/osg/CameraNode.cpp b/src/osgWrappers/osg/CameraNode.cpp index bbfce8ffc..ad7d90688 100644 --- a/src/osgWrappers/osg/CameraNode.cpp +++ b/src/osgWrappers/osg/CameraNode.cpp @@ -112,8 +112,9 @@ BEGIN_OBJECT_REFLECTOR(osg::CameraNode) I_Method0(const osg::Matrixd &, getViewMatrix); I_MethodWithDefaults4(void, getViewMatrixAsLookAt, IN, osg::Vec3 &, eye, , IN, osg::Vec3 &, center, , IN, osg::Vec3 &, up, , IN, float, lookDistance, 1.0f); I_Method0(osg::Matrixd, getInverseViewMatrix); - I_Method1(void, setRenderOrder, IN, osg::CameraNode::RenderOrder, order); + I_MethodWithDefaults2(void, setRenderOrder, IN, osg::CameraNode::RenderOrder, order, , IN, int, orderNum, 0); I_Method0(osg::CameraNode::RenderOrder, getRenderOrder); + I_Method0(int, getRenderOrderNum); I_Method0(bool, isRenderToTextureCamera); I_Method1(void, setRenderTargetImplementation, IN, osg::CameraNode::RenderTargetImplementation, impl); I_Method2(void, setRenderTargetImplementation, IN, osg::CameraNode::RenderTargetImplementation, impl, IN, osg::CameraNode::RenderTargetImplementation, fallback); @@ -153,7 +154,8 @@ BEGIN_OBJECT_REFLECTOR(osg::CameraNode) I_Property(osg::CameraNode::DrawCallback *, PostDrawCallback); I_Property(const osg::Matrixd &, ProjectionMatrix); I_Property(GLenum, ReadBuffer); - I_Property(osg::CameraNode::RenderOrder, RenderOrder); + I_ReadOnlyProperty(osg::CameraNode::RenderOrder, RenderOrder); + I_ReadOnlyProperty(int, RenderOrderNum); I_ReadOnlyProperty(osg::CameraNode::RenderTargetImplementation, RenderTargetFallback); I_Property(osg::CameraNode::RenderTargetImplementation, RenderTargetImplementation); I_IndexedProperty1(osg::Object *, RenderingCache, unsigned int, contextID); diff --git a/src/osgWrappers/osg/TexMat.cpp b/src/osgWrappers/osg/TexMat.cpp index bc617f74d..ce23725ee 100644 --- a/src/osgWrappers/osg/TexMat.cpp +++ b/src/osgWrappers/osg/TexMat.cpp @@ -41,8 +41,11 @@ BEGIN_OBJECT_REFLECTOR(osg::TexMat) I_Method1(void, setMatrix, IN, const osg::Matrix &, matrix); I_Method0(osg::Matrix &, getMatrix); I_Method0(const osg::Matrix &, getMatrix); + I_Method1(void, setScaleByTextureRectangleSize, IN, bool, flag); + I_Method0(bool, getScaleByTextureRectangleSize); I_Method1(void, apply, IN, osg::State &, state); I_Property(const osg::Matrix &, Matrix); + I_Property(bool, ScaleByTextureRectangleSize); I_ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR diff --git a/src/osgWrappers/osgTerrain/DataSet.cpp b/src/osgWrappers/osgTerrain/DataSet.cpp index 8ea34f384..b46fd7a55 100644 --- a/src/osgWrappers/osgTerrain/DataSet.cpp +++ b/src/osgWrappers/osgTerrain/DataSet.cpp @@ -497,7 +497,10 @@ BEGIN_VALUE_REFLECTOR(osgTerrain::GeospatialExtents) I_Method0(double, radius); I_Method0(double, radius2); I_Method1(osgTerrain::GeospatialExtents, intersect, IN, const osgTerrain::GeospatialExtents &, e); - I_Method1(bool, intersects, IN, const osgTerrain::GeospatialExtents &, bb); + I_Method1(osgTerrain::GeospatialExtents, intersectGeographicLeft, IN, const osgTerrain::GeospatialExtents &, e); + I_Method1(osgTerrain::GeospatialExtents, intersectGeographicRight, IN, const osgTerrain::GeospatialExtents &, e); + I_Method1(unsigned int, intersects, IN, const osgTerrain::GeospatialExtents &, bb); + I_Method1(unsigned int, intersectsGeographic, IN, const osgTerrain::GeospatialExtents &, bb); I_Method1(void, expandBy, IN, const osg::BoundingSphere &, sh); I_Method1(void, expandBy, IN, const osg::Vec3 &, v); I_Method1(void, expandBy, IN, const osgTerrain::GeospatialExtents &, e); diff --git a/src/osgWrappers/osgUtil/RenderStage.cpp b/src/osgWrappers/osgUtil/RenderStage.cpp index b13dd8837..f4e4ee410 100644 --- a/src/osgWrappers/osgUtil/RenderStage.cpp +++ b/src/osgWrappers/osgUtil/RenderStage.cpp @@ -103,8 +103,8 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::RenderStage) I_Method2(void, drawPostRenderStages, IN, osg::State &, state, IN, osgUtil::RenderLeaf *&, previous); I_Method2(void, drawImplementation, IN, osg::State &, state, IN, osgUtil::RenderLeaf *&, previous); I_Method1(void, addToDependencyList, IN, osgUtil::RenderStage *, rs); - I_Method1(void, addPreRenderStage, IN, osgUtil::RenderStage *, rs); - I_Method1(void, addPostRenderStage, IN, osgUtil::RenderStage *, rs); + I_MethodWithDefaults2(void, addPreRenderStage, IN, osgUtil::RenderStage *, rs, , IN, int, order, 0); + I_MethodWithDefaults2(void, addPostRenderStage, IN, osgUtil::RenderStage *, rs, , IN, int, order, 0); I_Method1(bool, getStats, IN, osgUtil::Statistics &, stats); I_Property(osg::CameraNode *, CameraNode); I_Property(bool, CameraRequiresSetUp);