diff --git a/src/osgWrappers/osg/CullSettings.cpp b/src/osgWrappers/osg/CullSettings.cpp index 117f760eb..52a9b32ea 100644 --- a/src/osgWrappers/osg/CullSettings.cpp +++ b/src/osgWrappers/osg/CullSettings.cpp @@ -81,7 +81,7 @@ BEGIN_VALUE_REFLECTOR(osg::CullSettings) "", ""); I_Method0(void, setDefaults, - Properties::NON_VIRTUAL, + Properties::VIRTUAL, __void__setDefaults, "", ""); diff --git a/src/osgWrappers/osgDB/Registry.cpp b/src/osgWrappers/osgDB/Registry.cpp index 9c2d4142a..e0c44127f 100644 --- a/src/osgWrappers/osgDB/Registry.cpp +++ b/src/osgWrappers/osgDB/Registry.cpp @@ -48,6 +48,14 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgDB::basic_type_wrapper) ""); END_REFLECTOR +BEGIN_VALUE_REFLECTOR(osgDB::PluginFunctionProxy) + I_Constructor1(IN, osgDB::CPluginFunction, function, + Properties::NON_EXPLICIT, + ____PluginFunctionProxy__CPluginFunction, + "", + ""); +END_REFLECTOR + BEGIN_VALUE_REFLECTOR(osgDB::RegisterDotOsgWrapperProxy) I_ConstructorWithDefaults6(IN, osg::Object *, proto, , IN, const std::string &, name, , IN, const std::string &, associates, , IN, osgDB::DotOsgWrapper::ReadFunc, readFunc, , IN, osgDB::DotOsgWrapper::WriteFunc, writeFunc, , IN, osgDB::DotOsgWrapper::ReadWriteMode, readWriteMode, osgDB::DotOsgWrapper::READ_AND_WRITE, ____RegisterDotOsgWrapperProxy__osg_Object_P1__C5_std_string_R1__C5_std_string_R1__DotOsgWrapper_ReadFunc__DotOsgWrapper_WriteFunc__DotOsgWrapper_ReadWriteMode, @@ -592,3 +600,5 @@ BEGIN_OBJECT_REFLECTOR(osgDB::Registry::WriteFileCallback) ""); END_REFLECTOR +TYPE_NAME_ALIAS(void(*, osgDB::CPluginFunction) + diff --git a/src/osgWrappers/osgSim/OverlayNode.cpp b/src/osgWrappers/osgSim/OverlayNode.cpp index 4319b97b5..bdd206314 100644 --- a/src/osgWrappers/osgSim/OverlayNode.cpp +++ b/src/osgWrappers/osgSim/OverlayNode.cpp @@ -118,6 +118,16 @@ BEGIN_OBJECT_REFLECTOR(osgSim::OverlayNode) __bool__getContinuousUpdate, "Get whether the OverlayNode should update the overlay texture on every frame. ", ""); + I_Method1(void, setOverlayBaseHeight, IN, double, baseHeight, + Properties::NON_VIRTUAL, + __void__setOverlayBaseHeight__double, + "Set the base height that the overlay subgraph will be projected down to. ", + "Normally you'll set this to just below ground level, if you set it too high then the overlay texture can end up being clipped in certain viewing directions, while if its too low then there will be a limit to how close you can get to the terrain before pixaltion becomes an issue. "); + I_Method0(double, getOverlayBaseHeight, + Properties::NON_VIRTUAL, + __double__getOverlayBaseHeight, + "Get the base height that the overlay subgraph will be projected down to. ", + ""); I_Method1(void, setOverlayClearColor, IN, const osg::Vec4 &, color, Properties::NON_VIRTUAL, __void__setOverlayClearColor__C5_osg_Vec4_R1, @@ -224,6 +234,9 @@ BEGIN_OBJECT_REFLECTOR(osgSim::OverlayNode) I_SimpleProperty(bool, ContinuousUpdate, __bool__getContinuousUpdate, __void__setContinuousUpdate__bool); + I_SimpleProperty(double, OverlayBaseHeight, + __double__getOverlayBaseHeight, + __void__setOverlayBaseHeight__double); I_SimpleProperty(const osg::Vec4 &, OverlayClearColor, __C5_osg_Vec4_R1__getOverlayClearColor, __void__setOverlayClearColor__C5_osg_Vec4_R1); diff --git a/src/osgWrappers/osgUtil/SceneView.cpp b/src/osgWrappers/osgUtil/SceneView.cpp index cfdd4ffc1..f0c623eac 100644 --- a/src/osgWrappers/osgUtil/SceneView.cpp +++ b/src/osgWrappers/osgUtil/SceneView.cpp @@ -107,11 +107,16 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::SceneView) __C5_char_P1__className, "return the name of the object's class type. ", "Must be defined by derived classes. "); - I_MethodWithDefaults1(void, setDefaults, IN, unsigned int, options, osgUtil::SceneView::STANDARD_SETTINGS, - Properties::NON_VIRTUAL, - __void__setDefaults__unsigned_int, - "Set scene view to use default global state, light, camera and render visitor. ", - ""); + I_Method0(void, setDefaults, + Properties::VIRTUAL, + __void__setDefaults, + "", + ""); + I_Method1(void, setDefaults, IN, unsigned int, options, + Properties::VIRTUAL, + __void__setDefaults__unsigned_int, + "Set scene view to use default global state, light, camera and render visitor. ", + ""); I_Method1(void, setCamera, IN, osg::Camera *, camera, Properties::NON_VIRTUAL, __void__setCamera__osg_Camera_P1, @@ -698,7 +703,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::SceneView) "", ""); I_Method1(void, inheritCullSettings, IN, const osg::CullSettings &, settings, - Properties::NON_VIRTUAL, + Properties::VIRTUAL, __void__inheritCullSettings__C5_CullSettings_R1, "Inherit the local cull settings variable from specified CullSettings object, according to the inheritance mask. ", "");