diff --git a/src/osgWrappers/osg/BlendEquation.cpp b/src/osgWrappers/osg/BlendEquation.cpp index 43ffd8c3e..bea871cfe 100644 --- a/src/osgWrappers/osg/BlendEquation.cpp +++ b/src/osgWrappers/osg/BlendEquation.cpp @@ -47,6 +47,10 @@ BEGIN_OBJECT_REFLECTOR(osg::BlendEquation) ____BlendEquation__Equation, "", ""); + I_Constructor2(IN, osg::BlendEquation::Equation, equationRGB, IN, osg::BlendEquation::Equation, equationAlpha, + ____BlendEquation__Equation__Equation, + "", + ""); I_ConstructorWithDefaults2(IN, const osg::BlendEquation &, trans, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, ____BlendEquation__C5_BlendEquation_R1__C5_CopyOp_R1, "Copy constructor using CopyOp to manage deep vs shallow copy. ", @@ -101,6 +105,26 @@ BEGIN_OBJECT_REFLECTOR(osg::BlendEquation) __Equation__getEquation, "", ""); + I_Method1(void, setEquationRGB, IN, osg::BlendEquation::Equation, equation, + Properties::NON_VIRTUAL, + __void__setEquationRGB__Equation, + "", + ""); + I_Method0(osg::BlendEquation::Equation, getEquationRGB, + Properties::NON_VIRTUAL, + __Equation__getEquationRGB, + "", + ""); + I_Method1(void, setEquationAlpha, IN, osg::BlendEquation::Equation, equation, + Properties::NON_VIRTUAL, + __void__setEquationAlpha__Equation, + "", + ""); + I_Method0(osg::BlendEquation::Equation, getEquationAlpha, + Properties::NON_VIRTUAL, + __Equation__getEquationAlpha, + "", + ""); I_Method1(void, apply, IN, osg::State &, x, Properties::VIRTUAL, __void__apply__State_R1, @@ -117,6 +141,12 @@ BEGIN_OBJECT_REFLECTOR(osg::BlendEquation) I_SimpleProperty(osg::BlendEquation::Equation, Equation, __Equation__getEquation, __void__setEquation__Equation); + I_SimpleProperty(osg::BlendEquation::Equation, EquationAlpha, + __Equation__getEquationAlpha, + __void__setEquationAlpha__Equation); + I_SimpleProperty(osg::BlendEquation::Equation, EquationRGB, + __Equation__getEquationRGB, + __void__setEquationRGB__Equation); I_SimpleProperty(osg::StateAttribute::Type, Type, __Type__getType, 0); diff --git a/src/osgWrappers/osg/ProxyNode.cpp b/src/osgWrappers/osg/ProxyNode.cpp index 58f0e6208..2e457de1a 100644 --- a/src/osgWrappers/osg/ProxyNode.cpp +++ b/src/osgWrappers/osg/ProxyNode.cpp @@ -104,6 +104,21 @@ BEGIN_OBJECT_REFLECTOR(osg::ProxyNode) __bool__removeChildren__unsigned_int__unsigned_int, "Remove children from Group. ", "Note, must be override by subclasses of Group which add per child attributes. "); + I_Method1(void, setDatabaseOptions, IN, osg::Referenced *, options, + Properties::NON_VIRTUAL, + __void__setDatabaseOptions__osg_Referenced_P1, + "Set the optional database osgDB::Options object to use when loaded children. ", + ""); + I_Method0(osg::Referenced *, getDatabaseOptions, + Properties::NON_VIRTUAL, + __osg_Referenced_P1__getDatabaseOptions, + "Get the optional database osgDB::Options object used when loaded children. ", + ""); + I_Method0(const osg::Referenced *, getDatabaseOptions, + Properties::NON_VIRTUAL, + __C5_osg_Referenced_P1__getDatabaseOptions, + "Get the optional database osgDB::Options object used when loaded children. ", + ""); I_Method1(void, setDatabasePath, IN, const std::string &, path, Properties::NON_VIRTUAL, __void__setDatabasePath__C5_std_string_R1, @@ -196,6 +211,9 @@ BEGIN_OBJECT_REFLECTOR(osg::ProxyNode) I_SimpleProperty(osg::ProxyNode::CenterMode, CenterMode, __CenterMode__getCenterMode, __void__setCenterMode__CenterMode); + I_SimpleProperty(osg::Referenced *, DatabaseOptions, + __osg_Referenced_P1__getDatabaseOptions, + __void__setDatabaseOptions__osg_Referenced_P1); I_SimpleProperty(const std::string &, DatabasePath, __C5_std_string_R1__getDatabasePath, __void__setDatabasePath__C5_std_string_R1); diff --git a/src/osgWrappers/osgUtil/RenderStage.cpp b/src/osgWrappers/osgUtil/RenderStage.cpp index aaaa19750..f41c2dbb6 100644 --- a/src/osgWrappers/osgUtil/RenderStage.cpp +++ b/src/osgWrappers/osgUtil/RenderStage.cpp @@ -407,6 +407,16 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::RenderStage) __void__attach__osg_Camera_BufferComponent__osg_Image_P1, "", ""); + I_Method0(void, collateReferencesToDependentCameras, + Properties::NON_VIRTUAL, + __void__collateReferencesToDependentCameras, + "search through any pre and post RenderStage that reference a Camera, and take a reference to each of these cameras to prevent them being deleted while they are still be used by the drawing thread. ", + ""); + I_Method0(void, clearReferencesToDependentCameras, + Properties::NON_VIRTUAL, + __void__clearReferencesToDependentCameras, + "clear the references to any dependent cameras. ", + ""); I_SimpleProperty(osg::Camera *, Camera, __osg_Camera_P1__getCamera, __void__setCamera__osg_Camera_P1); diff --git a/src/osgWrappers/osgUtil/SceneView.cpp b/src/osgWrappers/osgUtil/SceneView.cpp index 4d4f4f2e4..8b343269d 100644 --- a/src/osgWrappers/osgUtil/SceneView.cpp +++ b/src/osgWrappers/osgUtil/SceneView.cpp @@ -591,6 +591,16 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::SceneView) __C5_osgUtil_RenderStage_P1__getRenderStageRight, "", ""); + I_Method0(void, collateReferencesToDependentCameras, + Properties::NON_VIRTUAL, + __void__collateReferencesToDependentCameras, + "search through any pre and post RenderStage that reference a Camera, and take a reference to each of these cameras to prevent them being deleted while they are still be used by the drawing thread. ", + ""); + I_Method0(void, clearReferencesToDependentCameras, + Properties::NON_VIRTUAL, + __void__clearReferencesToDependentCameras, + "clear the refence to any any dependent cameras. ", + ""); I_Method1(void, setDrawBufferValue, IN, GLenum, drawBufferValue, Properties::NON_VIRTUAL, __void__setDrawBufferValue__GLenum,