diff --git a/src/osgWrappers/introspection/genwrapper.conf b/src/osgWrappers/introspection/genwrapper.conf index 2951804b2..91beb7304 100644 --- a/src/osgWrappers/introspection/genwrapper.conf +++ b/src/osgWrappers/introspection/genwrapper.conf @@ -498,7 +498,7 @@ suppress reflector "osgSim::ShapeAttribute" suppress reflector "osg::Drawable::Extensions" configure reflector "osg::State" - configure method "__typedef__void__APIENTRY_P1" + configure method "__typedef__void__GL_APIENTRY_P1" replace with "" end end diff --git a/src/osgWrappers/introspection/osg/FrameBufferObject.cpp b/src/osgWrappers/introspection/osg/FrameBufferObject.cpp index 43605b61f..e544b566a 100644 --- a/src/osgWrappers/introspection/osg/FrameBufferObject.cpp +++ b/src/osgWrappers/introspection/osg/FrameBufferObject.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -55,6 +56,10 @@ BEGIN_VALUE_REFLECTOR(osg::FrameBufferAttachment) ____FrameBufferAttachment__Texture2D_P1__int, "", ""); + I_ConstructorWithDefaults2(IN, osg::Texture2DMultisample *, target, , IN, int, level, 0, + ____FrameBufferAttachment__Texture2DMultisample_P1__int, + "", + ""); I_ConstructorWithDefaults3(IN, osg::Texture3D *, target, , IN, int, zoffset, , IN, int, level, 0, ____FrameBufferAttachment__Texture3D_P1__int__int, "", diff --git a/src/osgWrappers/introspection/osg/PrimitiveSet.cpp b/src/osgWrappers/introspection/osg/PrimitiveSet.cpp index 1de2a8606..21c952791 100644 --- a/src/osgWrappers/introspection/osg/PrimitiveSet.cpp +++ b/src/osgWrappers/introspection/osg/PrimitiveSet.cpp @@ -400,7 +400,7 @@ BEGIN_ENUM_REFLECTOR(osg::PrimitiveSet::Mode) I_EnumLabel(osg::PrimitiveSet::LINES_ADJACENCY); I_EnumLabel(osg::PrimitiveSet::LINE_STRIP_ADJACENCY); I_EnumLabel(osg::PrimitiveSet::TRIANGLES_ADJACENCY); - I_EnumLabel(osg::PrimitiveSet::TRIANGLE_STRIP_ADJECENCY); + I_EnumLabel(osg::PrimitiveSet::TRIANGLE_STRIP_ADJACENCY); END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::PrimitiveSet) diff --git a/src/osgWrappers/introspection/osgManipulator/RotateCylinderDragger.cpp b/src/osgWrappers/introspection/osgManipulator/RotateCylinderDragger.cpp index a8538fccf..dab254671 100644 --- a/src/osgWrappers/introspection/osgManipulator/RotateCylinderDragger.cpp +++ b/src/osgWrappers/introspection/osgManipulator/RotateCylinderDragger.cpp @@ -31,6 +31,11 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::RotateCylinderDragger) I_Constructor0(____RotateCylinderDragger, "", ""); + I_Method0(osg::Object *, cloneType, + Properties::VIRTUAL, + __osg_Object_P1__cloneType, + "clone an object of the same type as the node. ", + ""); I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, Properties::VIRTUAL, __bool__isSameKindAs__C5_osg_Object_P1, @@ -61,9 +66,9 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::RotateCylinderDragger) __void__setColor__C5_osg_Vec4_R1, "Set/Get color for dragger. ", ""); - I_Method0(const osg::Vec4, getColor, + I_Method0(const osg::Vec4 &, getColor, Properties::NON_VIRTUAL, - __C5_osg_Vec4__getColor, + __C5_osg_Vec4_R1__getColor, "", ""); I_Method1(void, setPickColor, IN, const osg::Vec4 &, color, @@ -71,16 +76,16 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::RotateCylinderDragger) __void__setPickColor__C5_osg_Vec4_R1, "Set/Get pick color for dragger. ", "Pick color is color of the dragger when picked. It gives a visual feedback to show that the dragger has been picked. "); - I_Method0(const osg::Vec4, getPickColor, + I_Method0(const osg::Vec4 &, getPickColor, Properties::NON_VIRTUAL, - __C5_osg_Vec4__getPickColor, + __C5_osg_Vec4_R1__getPickColor, "", ""); I_SimpleProperty(const osg::Vec4 &, Color, - 0, + __C5_osg_Vec4_R1__getColor, __void__setColor__C5_osg_Vec4_R1); I_SimpleProperty(const osg::Vec4 &, PickColor, - 0, + __C5_osg_Vec4_R1__getPickColor, __void__setPickColor__C5_osg_Vec4_R1); END_REFLECTOR diff --git a/src/osgWrappers/introspection/osgManipulator/RotateSphereDragger.cpp b/src/osgWrappers/introspection/osgManipulator/RotateSphereDragger.cpp index 2c9aec5f4..e0055b65b 100644 --- a/src/osgWrappers/introspection/osgManipulator/RotateSphereDragger.cpp +++ b/src/osgWrappers/introspection/osgManipulator/RotateSphereDragger.cpp @@ -31,6 +31,11 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::RotateSphereDragger) I_Constructor0(____RotateSphereDragger, "", ""); + I_Method0(osg::Object *, cloneType, + Properties::VIRTUAL, + __osg_Object_P1__cloneType, + "clone an object of the same type as the node. ", + ""); I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, Properties::VIRTUAL, __bool__isSameKindAs__C5_osg_Object_P1, @@ -61,9 +66,9 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::RotateSphereDragger) __void__setColor__C5_osg_Vec4_R1, "Set/Get color for dragger. ", ""); - I_Method0(const osg::Vec4, getColor, + I_Method0(const osg::Vec4 &, getColor, Properties::NON_VIRTUAL, - __C5_osg_Vec4__getColor, + __C5_osg_Vec4_R1__getColor, "", ""); I_Method1(void, setPickColor, IN, const osg::Vec4 &, color, @@ -71,16 +76,16 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::RotateSphereDragger) __void__setPickColor__C5_osg_Vec4_R1, "Set/Get pick color for dragger. ", "Pick color is color of the dragger when picked. It gives a visual feedback to show that the dragger has been picked. "); - I_Method0(const osg::Vec4, getPickColor, + I_Method0(const osg::Vec4 &, getPickColor, Properties::NON_VIRTUAL, - __C5_osg_Vec4__getPickColor, + __C5_osg_Vec4_R1__getPickColor, "", ""); I_SimpleProperty(const osg::Vec4 &, Color, - 0, + __C5_osg_Vec4_R1__getColor, __void__setColor__C5_osg_Vec4_R1); I_SimpleProperty(const osg::Vec4 &, PickColor, - 0, + __C5_osg_Vec4_R1__getPickColor, __void__setPickColor__C5_osg_Vec4_R1); END_REFLECTOR diff --git a/src/osgWrappers/introspection/osgManipulator/Scale1DDragger.cpp b/src/osgWrappers/introspection/osgManipulator/Scale1DDragger.cpp index e5a3f55e0..9b42657cc 100644 --- a/src/osgWrappers/introspection/osgManipulator/Scale1DDragger.cpp +++ b/src/osgWrappers/introspection/osgManipulator/Scale1DDragger.cpp @@ -40,6 +40,11 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Scale1DDragger) ____Scale1DDragger__ScaleMode, "", ""); + I_Method0(osg::Object *, cloneType, + Properties::VIRTUAL, + __osg_Object_P1__cloneType, + "clone an object of the same type as the node. ", + ""); I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, Properties::VIRTUAL, __bool__isSameKindAs__C5_osg_Object_P1, @@ -80,9 +85,9 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Scale1DDragger) __void__setColor__C5_osg_Vec4_R1, "Set/Get color for dragger. ", ""); - I_Method0(const osg::Vec4, getColor, + I_Method0(const osg::Vec4 &, getColor, Properties::NON_VIRTUAL, - __C5_osg_Vec4__getColor, + __C5_osg_Vec4_R1__getColor, "", ""); I_Method1(void, setPickColor, IN, const osg::Vec4 &, color, @@ -90,9 +95,9 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Scale1DDragger) __void__setPickColor__C5_osg_Vec4_R1, "Set/Get pick color for dragger. ", "Pick color is color of the dragger when picked. It gives a visual feedback to show that the dragger has been picked. "); - I_Method0(const osg::Vec4, getPickColor, + I_Method0(const osg::Vec4 &, getPickColor, Properties::NON_VIRTUAL, - __C5_osg_Vec4__getPickColor, + __C5_osg_Vec4_R1__getPickColor, "", ""); I_Method1(void, setLeftHandleNode, IN, osg::Node &, node, @@ -110,11 +115,21 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Scale1DDragger) __osg_Node_P1__getLeftHandleNode, "", ""); + I_Method0(const osg::Node *, getLeftHandleNode, + Properties::NON_VIRTUAL, + __C5_osg_Node_P1__getLeftHandleNode, + "", + ""); I_Method0(osg::Node *, getRightHandleNode, Properties::NON_VIRTUAL, __osg_Node_P1__getRightHandleNode, "", ""); + I_Method0(const osg::Node *, getRightHandleNode, + Properties::NON_VIRTUAL, + __C5_osg_Node_P1__getRightHandleNode, + "", + ""); I_Method1(void, setLeftHandlePosition, IN, double, pos, Properties::NON_VIRTUAL, __void__setLeftHandlePosition__double, @@ -136,7 +151,7 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Scale1DDragger) "", ""); I_SimpleProperty(const osg::Vec4 &, Color, - 0, + __C5_osg_Vec4_R1__getColor, __void__setColor__C5_osg_Vec4_R1); I_SimpleProperty(osg::Node &, LeftHandleNode, 0, @@ -148,7 +163,7 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Scale1DDragger) __double__getMinScale, __void__setMinScale__double); I_SimpleProperty(const osg::Vec4 &, PickColor, - 0, + __C5_osg_Vec4_R1__getPickColor, __void__setPickColor__C5_osg_Vec4_R1); I_SimpleProperty(osg::Node &, RightHandleNode, 0, diff --git a/src/osgWrappers/introspection/osgManipulator/Scale2DDragger.cpp b/src/osgWrappers/introspection/osgManipulator/Scale2DDragger.cpp index 1b52de474..60f89899a 100644 --- a/src/osgWrappers/introspection/osgManipulator/Scale2DDragger.cpp +++ b/src/osgWrappers/introspection/osgManipulator/Scale2DDragger.cpp @@ -41,6 +41,11 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Scale2DDragger) ____Scale2DDragger__ScaleMode, "", ""); + I_Method0(osg::Object *, cloneType, + Properties::VIRTUAL, + __osg_Object_P1__cloneType, + "clone an object of the same type as the node. ", + ""); I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, Properties::VIRTUAL, __bool__isSameKindAs__C5_osg_Object_P1, @@ -81,9 +86,9 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Scale2DDragger) __void__setColor__C5_osg_Vec4_R1, "Set/Get color for dragger. ", ""); - I_Method0(const osg::Vec4, getColor, + I_Method0(const osg::Vec4 &, getColor, Properties::NON_VIRTUAL, - __C5_osg_Vec4__getColor, + __C5_osg_Vec4_R1__getColor, "", ""); I_Method1(void, setPickColor, IN, const osg::Vec4 &, color, @@ -91,9 +96,9 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Scale2DDragger) __void__setPickColor__C5_osg_Vec4_R1, "Set/Get pick color for dragger. ", "Pick color is color of the dragger when picked. It gives a visual feedback to show that the dragger has been picked. "); - I_Method0(const osg::Vec4, getPickColor, + I_Method0(const osg::Vec4 &, getPickColor, Properties::NON_VIRTUAL, - __C5_osg_Vec4__getPickColor, + __C5_osg_Vec4_R1__getPickColor, "", ""); I_Method1(void, setTopLeftHandleNode, IN, osg::Node &, node, @@ -106,6 +111,11 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Scale2DDragger) __osg_Node_P1__getTopLeftHandleNode, "", ""); + I_Method0(const osg::Node *, getTopLeftHandleNode, + Properties::NON_VIRTUAL, + __C5_osg_Node_P1__getTopLeftHandleNode, + "", + ""); I_Method1(void, setBottomLeftHandleNode, IN, osg::Node &, node, Properties::NON_VIRTUAL, __void__setBottomLeftHandleNode__osg_Node_R1, @@ -116,6 +126,11 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Scale2DDragger) __osg_Node_P1__getBottomLeftHandleNode, "", ""); + I_Method0(const osg::Node *, getBottomLeftHandleNode, + Properties::NON_VIRTUAL, + __C5_osg_Node_P1__getBottomLeftHandleNode, + "", + ""); I_Method1(void, setTopRightHandleNode, IN, osg::Node &, node, Properties::NON_VIRTUAL, __void__setTopRightHandleNode__osg_Node_R1, @@ -126,6 +141,11 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Scale2DDragger) __osg_Node_P1__getTopRightHandleNode, "", ""); + I_Method0(const osg::Node *, getTopRightHandleNode, + Properties::NON_VIRTUAL, + __C5_osg_Node_P1__getTopRightHandleNode, + "", + ""); I_Method1(void, setBottomRightHandleNode, IN, osg::Node &, node, Properties::NON_VIRTUAL, __void__setBottomRightHandleNode__osg_Node_R1, @@ -136,6 +156,11 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Scale2DDragger) __osg_Node_P1__getBottomRightHandleNode, "", ""); + I_Method0(const osg::Node *, getBottomRightHandleNode, + Properties::NON_VIRTUAL, + __C5_osg_Node_P1__getBottomRightHandleNode, + "", + ""); I_Method1(void, setTopLeftHandlePosition, IN, const osg::Vec2d &, pos, Properties::NON_VIRTUAL, __void__setTopLeftHandlePosition__C5_osg_Vec2d_R1, @@ -189,13 +214,13 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Scale2DDragger) __C5_osg_Vec2d_R1__getBottomRightHandlePosition, __void__setBottomRightHandlePosition__C5_osg_Vec2d_R1); I_SimpleProperty(const osg::Vec4 &, Color, - 0, + __C5_osg_Vec4_R1__getColor, __void__setColor__C5_osg_Vec4_R1); I_SimpleProperty(const osg::Vec2d &, MinScale, __C5_osg_Vec2d_R1__getMinScale, __void__setMinScale__C5_osg_Vec2d_R1); I_SimpleProperty(const osg::Vec4 &, PickColor, - 0, + __C5_osg_Vec4_R1__getPickColor, __void__setPickColor__C5_osg_Vec4_R1); I_SimpleProperty(osg::Node &, TopLeftHandleNode, 0, diff --git a/src/osgWrappers/introspection/osgManipulator/ScaleAxisDragger.cpp b/src/osgWrappers/introspection/osgManipulator/ScaleAxisDragger.cpp index 2fcb86a3c..0c51a201a 100644 --- a/src/osgWrappers/introspection/osgManipulator/ScaleAxisDragger.cpp +++ b/src/osgWrappers/introspection/osgManipulator/ScaleAxisDragger.cpp @@ -27,6 +27,11 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::ScaleAxisDragger) I_Constructor0(____ScaleAxisDragger, "", ""); + I_Method0(osg::Object *, cloneType, + Properties::VIRTUAL, + __osg_Object_P1__cloneType, + "clone an object of the same type as the node. ", + ""); I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, Properties::VIRTUAL, __bool__isSameKindAs__C5_osg_Object_P1, diff --git a/src/osgWrappers/introspection/osgManipulator/TabBoxDragger.cpp b/src/osgWrappers/introspection/osgManipulator/TabBoxDragger.cpp index 165765a6c..eafc4da53 100644 --- a/src/osgWrappers/introspection/osgManipulator/TabBoxDragger.cpp +++ b/src/osgWrappers/introspection/osgManipulator/TabBoxDragger.cpp @@ -28,6 +28,11 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::TabBoxDragger) I_Constructor0(____TabBoxDragger, "", ""); + I_Method0(osg::Object *, cloneType, + Properties::VIRTUAL, + __osg_Object_P1__cloneType, + "clone an object of the same type as the node. ", + ""); I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, Properties::VIRTUAL, __bool__isSameKindAs__C5_osg_Object_P1, diff --git a/src/osgWrappers/introspection/osgManipulator/TabBoxTrackballDragger.cpp b/src/osgWrappers/introspection/osgManipulator/TabBoxTrackballDragger.cpp index 9de92abdf..745b3f107 100644 --- a/src/osgWrappers/introspection/osgManipulator/TabBoxTrackballDragger.cpp +++ b/src/osgWrappers/introspection/osgManipulator/TabBoxTrackballDragger.cpp @@ -27,6 +27,11 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::TabBoxTrackballDragger) I_Constructor0(____TabBoxTrackballDragger, "", ""); + I_Method0(osg::Object *, cloneType, + Properties::VIRTUAL, + __osg_Object_P1__cloneType, + "clone an object of the same type as the node. ", + ""); I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, Properties::VIRTUAL, __bool__isSameKindAs__C5_osg_Object_P1, diff --git a/src/osgWrappers/introspection/osgManipulator/TabPlaneDragger.cpp b/src/osgWrappers/introspection/osgManipulator/TabPlaneDragger.cpp index d89121ece..9691295f4 100644 --- a/src/osgWrappers/introspection/osgManipulator/TabPlaneDragger.cpp +++ b/src/osgWrappers/introspection/osgManipulator/TabPlaneDragger.cpp @@ -31,6 +31,11 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::TabPlaneDragger) I_Constructor0(____TabPlaneDragger, "", ""); + I_Method0(osg::Object *, cloneType, + Properties::VIRTUAL, + __osg_Object_P1__cloneType, + "clone an object of the same type as the node. ", + ""); I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, Properties::VIRTUAL, __bool__isSameKindAs__C5_osg_Object_P1, diff --git a/src/osgWrappers/introspection/osgManipulator/TabPlaneTrackballDragger.cpp b/src/osgWrappers/introspection/osgManipulator/TabPlaneTrackballDragger.cpp index c2880a038..414c0cfd3 100644 --- a/src/osgWrappers/introspection/osgManipulator/TabPlaneTrackballDragger.cpp +++ b/src/osgWrappers/introspection/osgManipulator/TabPlaneTrackballDragger.cpp @@ -28,6 +28,11 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::TabPlaneTrackballDragger) I_Constructor0(____TabPlaneTrackballDragger, "", ""); + I_Method0(osg::Object *, cloneType, + Properties::VIRTUAL, + __osg_Object_P1__cloneType, + "clone an object of the same type as the node. ", + ""); I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, Properties::VIRTUAL, __bool__isSameKindAs__C5_osg_Object_P1, diff --git a/src/osgWrappers/introspection/osgManipulator/TrackballDragger.cpp b/src/osgWrappers/introspection/osgManipulator/TrackballDragger.cpp index 0d96ea838..386540f4a 100644 --- a/src/osgWrappers/introspection/osgManipulator/TrackballDragger.cpp +++ b/src/osgWrappers/introspection/osgManipulator/TrackballDragger.cpp @@ -29,6 +29,11 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::TrackballDragger) ____TrackballDragger__bool, "", ""); + I_Method0(osg::Object *, cloneType, + Properties::VIRTUAL, + __osg_Object_P1__cloneType, + "clone an object of the same type as the node. ", + ""); I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, Properties::VIRTUAL, __bool__isSameKindAs__C5_osg_Object_P1, diff --git a/src/osgWrappers/introspection/osgManipulator/Translate1DDragger.cpp b/src/osgWrappers/introspection/osgManipulator/Translate1DDragger.cpp index c086f0ef3..52ce88924 100644 --- a/src/osgWrappers/introspection/osgManipulator/Translate1DDragger.cpp +++ b/src/osgWrappers/introspection/osgManipulator/Translate1DDragger.cpp @@ -32,6 +32,11 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Translate1DDragger) I_Constructor0(____Translate1DDragger, "", ""); + I_Method0(osg::Object *, cloneType, + Properties::VIRTUAL, + __osg_Object_P1__cloneType, + "clone an object of the same type as the node. ", + ""); I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, Properties::VIRTUAL, __bool__isSameKindAs__C5_osg_Object_P1, @@ -66,9 +71,9 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Translate1DDragger) __void__setColor__C5_osg_Vec4_R1, "Set/Get color for dragger. ", ""); - I_Method0(const osg::Vec4, getColor, + I_Method0(const osg::Vec4 &, getColor, Properties::NON_VIRTUAL, - __C5_osg_Vec4__getColor, + __C5_osg_Vec4_R1__getColor, "", ""); I_Method1(void, setPickColor, IN, const osg::Vec4 &, color, @@ -76,9 +81,9 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Translate1DDragger) __void__setPickColor__C5_osg_Vec4_R1, "Set/Get pick color for dragger. ", "Pick color is color of the dragger when picked. It gives a visual feedback to show that the dragger has been picked. "); - I_Method0(const osg::Vec4, getPickColor, + I_Method0(const osg::Vec4 &, getPickColor, Properties::NON_VIRTUAL, - __C5_osg_Vec4__getPickColor, + __C5_osg_Vec4_R1__getPickColor, "", ""); I_Method1(void, setCheckForNodeInNodePath, IN, bool, onOff, @@ -90,10 +95,10 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Translate1DDragger) 0, __void__setCheckForNodeInNodePath__bool); I_SimpleProperty(const osg::Vec4 &, Color, - 0, + __C5_osg_Vec4_R1__getColor, __void__setColor__C5_osg_Vec4_R1); I_SimpleProperty(const osg::Vec4 &, PickColor, - 0, + __C5_osg_Vec4_R1__getPickColor, __void__setPickColor__C5_osg_Vec4_R1); END_REFLECTOR diff --git a/src/osgWrappers/introspection/osgManipulator/Translate2DDragger.cpp b/src/osgWrappers/introspection/osgManipulator/Translate2DDragger.cpp index 228820889..5022b33ee 100644 --- a/src/osgWrappers/introspection/osgManipulator/Translate2DDragger.cpp +++ b/src/osgWrappers/introspection/osgManipulator/Translate2DDragger.cpp @@ -37,6 +37,11 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Translate2DDragger) ____Translate2DDragger__C5_osg_Plane_R1, "", ""); + I_Method0(osg::Object *, cloneType, + Properties::VIRTUAL, + __osg_Object_P1__cloneType, + "clone an object of the same type as the node. ", + ""); I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, Properties::VIRTUAL, __bool__isSameKindAs__C5_osg_Object_P1, @@ -67,9 +72,9 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Translate2DDragger) __void__setColor__C5_osg_Vec4_R1, "Set/Get color for dragger. ", ""); - I_Method0(const osg::Vec4, getColor, + I_Method0(const osg::Vec4 &, getColor, Properties::NON_VIRTUAL, - __C5_osg_Vec4__getColor, + __C5_osg_Vec4_R1__getColor, "", ""); I_Method1(void, setPickColor, IN, const osg::Vec4 &, color, @@ -77,16 +82,16 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Translate2DDragger) __void__setPickColor__C5_osg_Vec4_R1, "Set/Get pick color for dragger. ", "Pick color is color of the dragger when picked. It gives a visual feedback to show that the dragger has been picked. "); - I_Method0(const osg::Vec4, getPickColor, + I_Method0(const osg::Vec4 &, getPickColor, Properties::NON_VIRTUAL, - __C5_osg_Vec4__getPickColor, + __C5_osg_Vec4_R1__getPickColor, "", ""); I_SimpleProperty(const osg::Vec4 &, Color, - 0, + __C5_osg_Vec4_R1__getColor, __void__setColor__C5_osg_Vec4_R1); I_SimpleProperty(const osg::Vec4 &, PickColor, - 0, + __C5_osg_Vec4_R1__getPickColor, __void__setPickColor__C5_osg_Vec4_R1); END_REFLECTOR diff --git a/src/osgWrappers/introspection/osgManipulator/TranslateAxisDragger.cpp b/src/osgWrappers/introspection/osgManipulator/TranslateAxisDragger.cpp index d1e4e2587..6048d5ce1 100644 --- a/src/osgWrappers/introspection/osgManipulator/TranslateAxisDragger.cpp +++ b/src/osgWrappers/introspection/osgManipulator/TranslateAxisDragger.cpp @@ -27,6 +27,11 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::TranslateAxisDragger) I_Constructor0(____TranslateAxisDragger, "", ""); + I_Method0(osg::Object *, cloneType, + Properties::VIRTUAL, + __osg_Object_P1__cloneType, + "clone an object of the same type as the node. ", + ""); I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, Properties::VIRTUAL, __bool__isSameKindAs__C5_osg_Object_P1, diff --git a/src/osgWrappers/introspection/osgManipulator/TranslatePlaneDragger.cpp b/src/osgWrappers/introspection/osgManipulator/TranslatePlaneDragger.cpp index 9ffca1c38..ad5452621 100644 --- a/src/osgWrappers/introspection/osgManipulator/TranslatePlaneDragger.cpp +++ b/src/osgWrappers/introspection/osgManipulator/TranslatePlaneDragger.cpp @@ -33,6 +33,11 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::TranslatePlaneDragger) I_Constructor0(____TranslatePlaneDragger, "", ""); + I_Method0(osg::Object *, cloneType, + Properties::VIRTUAL, + __osg_Object_P1__cloneType, + "clone an object of the same type as the node. ", + ""); I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, Properties::VIRTUAL, __bool__isSameKindAs__C5_osg_Object_P1, diff --git a/src/osgWrappers/introspection/osgPresentation/SlideShowConstructor.cpp b/src/osgWrappers/introspection/osgPresentation/SlideShowConstructor.cpp index 6ba0cc8bd..0cb386b65 100644 --- a/src/osgWrappers/introspection/osgPresentation/SlideShowConstructor.cpp +++ b/src/osgWrappers/introspection/osgPresentation/SlideShowConstructor.cpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include @@ -101,9 +101,9 @@ BEGIN_VALUE_REFLECTOR(osgPresentation::SlideShowConstructor) __void__setLayerJump__bool__int__int, "", ""); - I_Constructor1(IN, const osgDB::ReaderWriter::Options *, options, + I_Constructor1(IN, osgDB::Options *, options, Properties::NON_EXPLICIT, - ____SlideShowConstructor__C5_osgDB_ReaderWriter_Options_P1, + ____SlideShowConstructor__osgDB_Options_P1, "", ""); I_Method0(void, createPresentation, @@ -291,6 +291,11 @@ BEGIN_VALUE_REFLECTOR(osgPresentation::SlideShowConstructor) __void__addStereoImagePair__C5_std_string_R1__C5_ImageData_R1__C5_std_string_R1__C5_ImageData_R1__C5_PositionData_R1, "", ""); + I_Method4(void, addGraph, IN, const std::string &, filename, IN, const std::string &, options, IN, const osgPresentation::SlideShowConstructor::PositionData &, positionData, IN, const osgPresentation::SlideShowConstructor::ImageData &, imageData, + Properties::NON_VIRTUAL, + __void__addGraph__C5_std_string_R1__C5_std_string_R1__C5_PositionData_R1__C5_ImageData_R1, + "", + ""); I_Method3(void, addVNC, IN, const std::string &, filename, IN, const osgPresentation::SlideShowConstructor::PositionData &, positionData, IN, const osgPresentation::SlideShowConstructor::ImageData &, imageData, Properties::NON_VIRTUAL, __void__addVNC__C5_std_string_R1__C5_PositionData_R1__C5_ImageData_R1,