diff --git a/src/osgWrappers/introspection/osg/Vec3d.cpp b/src/osgWrappers/introspection/osg/Vec3d.cpp index e00f6f192..f0580c39c 100644 --- a/src/osgWrappers/introspection/osg/Vec3d.cpp +++ b/src/osgWrappers/introspection/osg/Vec3d.cpp @@ -120,6 +120,6 @@ BEGIN_VALUE_REFLECTOR(osg::Vec3d) Properties::NON_VIRTUAL, __value_type__normalize, "Normalize the vector so that it has length unity. ", - "Returns the previous length of the vector. "); + "Returns the previous length of the vector. If the vector is zero length, it is left unchanged and zero is returned. "); END_REFLECTOR diff --git a/src/osgWrappers/introspection/osgDB/DatabasePager.cpp b/src/osgWrappers/introspection/osgDB/DatabasePager.cpp index b7ae41d45..b7de66e9a 100644 --- a/src/osgWrappers/introspection/osgDB/DatabasePager.cpp +++ b/src/osgWrappers/introspection/osgDB/DatabasePager.cpp @@ -506,6 +506,16 @@ BEGIN_OBJECT_REFLECTOR(osgDB::DatabasePager::DatabaseThread) ____DatabaseThread__C5_DatabaseThread_R1__DatabasePager_P1, "", ""); + I_Method1(void, setName, IN, const std::string &, name, + Properties::NON_VIRTUAL, + __void__setName__C5_std_string_R1, + "", + ""); + I_Method0(const std::string &, getName, + Properties::NON_VIRTUAL, + __C5_std_string_R1__getName, + "", + ""); I_Method1(void, setDone, IN, bool, done, Properties::NON_VIRTUAL, __void__setDone__bool, @@ -526,6 +536,11 @@ BEGIN_OBJECT_REFLECTOR(osgDB::DatabasePager::DatabaseThread) __bool__getActive, "", ""); + I_Method0(double, getTimeSinceStartOfIteration, + Properties::NON_VIRTUAL, + __double__getTimeSinceStartOfIteration, + "", + ""); I_Method0(int, cancel, Properties::VIRTUAL, __int__cancel, @@ -542,6 +557,12 @@ BEGIN_OBJECT_REFLECTOR(osgDB::DatabasePager::DatabaseThread) I_SimpleProperty(bool, Done, __bool__getDone, __void__setDone__bool); + I_SimpleProperty(const std::string &, Name, + __C5_std_string_R1__getName, + __void__setName__C5_std_string_R1); + I_SimpleProperty(double, TimeSinceStartOfIteration, + __double__getTimeSinceStartOfIteration, + 0); END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgDB::DatabasePager::PagedLODList) diff --git a/src/osgWrappers/introspection/osgViewer/ViewerEventHandlers.cpp b/src/osgWrappers/introspection/osgViewer/ViewerEventHandlers.cpp index 6bd390eed..5ac1b7ce6 100644 --- a/src/osgWrappers/introspection/osgViewer/ViewerEventHandlers.cpp +++ b/src/osgWrappers/introspection/osgViewer/ViewerEventHandlers.cpp @@ -118,11 +118,10 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::InteractiveImageHandler) I_DeclaringFile("osgViewer/ViewerEventHandlers"); I_BaseType(osgGA::GUIEventHandler); I_BaseType(osg::Drawable::CullCallback); - I_Constructor1(IN, osg::Image *, image, - Properties::NON_EXPLICIT, - ____InteractiveImageHandler__osg_Image_P1, - "", - ""); + I_ConstructorWithDefaults2(IN, osg::Image *, image, , IN, osg::Camera *, camera, 0, + ____InteractiveImageHandler__osg_Image_P1__osg_Camera_P1, + "", + ""); I_Method0(osg::Object *, cloneType, Properties::VIRTUAL, __osg_Object_P1__cloneType, @@ -171,6 +170,12 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::InteractiveImageHandler) __bool__mousePosition__osgViewer_View_P1__osg_NodeVisitor_P1__C5_osgGA_GUIEventAdapter_R1__int_R1__int_R1, "", ""); + I_ProtectedMethodWithDefaults6(bool, computeIntersections, IN, osgViewer::View *, view, , IN, float, x, , IN, float, y, , IN, const osg::NodePath &, nodePath, , IN, osgUtil::LineSegmentIntersector::Intersections &, intersections, , IN, osg::Node::NodeMask, traversalMask, 0xffffffff, + Properties::NON_VIRTUAL, + Properties::CONST, + __bool__computeIntersections__osgViewer_View_P1__float__float__C5_osg_NodePath_R1__osgUtil_LineSegmentIntersector_Intersections_R1__osg_Node_NodeMask, + "", + ""); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgViewer::LODScaleHandler)