diff --git a/src/osgWrappers/osgAnimation/Animation.cpp b/src/osgWrappers/osgAnimation/Animation.cpp index 8e349b97f..a6c24ea90 100644 --- a/src/osgWrappers/osgAnimation/Animation.cpp +++ b/src/osgWrappers/osgAnimation/Animation.cpp @@ -62,7 +62,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::Animation) I_Constructor0(____Animation, "", ""); - I_Constructor2(IN, const osgAnimation::Animation &, anim, IN, const osg::CopyOp &, x, + I_Constructor2(IN, const osgAnimation::Animation &, x, IN, const osg::CopyOp &, x, ____Animation__C5_osgAnimation_Animation_R1__C5_osg_CopyOp_R1, "", ""); diff --git a/src/osgWrappers/osgAnimation/Channel.cpp b/src/osgWrappers/osgAnimation/Channel.cpp index 06e93b419..e39e00c8f 100644 --- a/src/osgWrappers/osgAnimation/Channel.cpp +++ b/src/osgWrappers/osgAnimation/Channel.cpp @@ -28,6 +28,16 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::Channel) I_Constructor0(____Channel, "", ""); + I_Constructor1(IN, const osgAnimation::Channel &, channel, + Properties::NON_EXPLICIT, + ____Channel__C5_Channel_R1, + "", + ""); + I_Method0(osgAnimation::Channel *, clone, + Properties::PURE_VIRTUAL, + __Channel_P1__clone, + "", + ""); I_Method1(void, update, IN, float, time, Properties::PURE_VIRTUAL, __void__update__float, diff --git a/src/osgWrappers/osgDB/Options.cpp b/src/osgWrappers/osgDB/Options.cpp index 43acb93ff..70149dbef 100644 --- a/src/osgWrappers/osgDB/Options.cpp +++ b/src/osgWrappers/osgDB/Options.cpp @@ -84,6 +84,11 @@ BEGIN_OBJECT_REFLECTOR(osgDB::Options) __C5_char_P1__className, "return the name of the object's class type. ", "Must be defined by derived classes. "); + I_Method0(osgDB::Options *, cloneOptions, + Properties::NON_VIRTUAL, + __Options_P1__cloneOptions, + "", + ""); I_Method1(void, setOptionString, IN, const std::string &, str, Properties::NON_VIRTUAL, __void__setOptionString__C5_std_string_R1, diff --git a/src/osgWrappers/osgGA/SphericalManipulator.cpp b/src/osgWrappers/osgGA/SphericalManipulator.cpp index c3d348bab..0fcb13e17 100644 --- a/src/osgWrappers/osgGA/SphericalManipulator.cpp +++ b/src/osgWrappers/osgGA/SphericalManipulator.cpp @@ -207,6 +207,16 @@ BEGIN_OBJECT_REFLECTOR(osgGA::SphericalManipulator) __void__setRotationMode__RotationMode, "", ""); + I_Method0(bool, getAllowThrow, + Properties::NON_VIRTUAL, + __bool__getAllowThrow, + "Returns true if the camera can be thrown, false otherwise. ", + "This defaults to true. "); + I_Method1(void, setAllowThrow, IN, bool, allowThrow, + Properties::NON_VIRTUAL, + __void__setAllowThrow__bool, + "Set the 'allow throw' flag. ", + "Releasing the mouse button while moving the camera results in a throw. "); I_ProtectedMethod0(void, flushMouseEventStack, Properties::NON_VIRTUAL, Properties::NON_CONST, @@ -231,6 +241,9 @@ BEGIN_OBJECT_REFLECTOR(osgGA::SphericalManipulator) __bool__isMouseMoving, "Check the speed at which the mouse is moving. ", "If speed is below a threshold then return false, otherwise return true. "); + I_SimpleProperty(bool, AllowThrow, + __bool__getAllowThrow, + __void__setAllowThrow__bool); I_SimpleProperty(const osg::Matrixd &, ByInverseMatrix, 0, __void__setByInverseMatrix__C5_osg_Matrixd_R1); diff --git a/src/osgWrappers/osgManipulator/Constraint.cpp b/src/osgWrappers/osgManipulator/Constraint.cpp index bfbd07bf7..a8897ea25 100644 --- a/src/osgWrappers/osgManipulator/Constraint.cpp +++ b/src/osgWrappers/osgManipulator/Constraint.cpp @@ -100,14 +100,24 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::GridConstraint) ____GridConstraint__osg_Node_R1__C5_osg_Vec3d_R1__C5_osg_Vec3d_R1, "", ""); - I_Method1(void, setOrigin, IN, const osg::Vec3d, origin, + I_Method1(void, setOrigin, IN, const osg::Vec3d &, origin, Properties::NON_VIRTUAL, - __void__setOrigin__C5_osg_Vec3d, + __void__setOrigin__C5_osg_Vec3d_R1, "", ""); - I_Method1(void, setSpacing, IN, const osg::Vec3d, spacing, + I_Method0(const osg::Vec3d &, getOrigin, Properties::NON_VIRTUAL, - __void__setSpacing__C5_osg_Vec3d, + __C5_osg_Vec3d_R1__getOrigin, + "", + ""); + I_Method1(void, setSpacing, IN, const osg::Vec3d &, spacing, + Properties::NON_VIRTUAL, + __void__setSpacing__C5_osg_Vec3d_R1, + "", + ""); + I_Method0(const osg::Vec3d &, getSpacing, + Properties::NON_VIRTUAL, + __C5_osg_Vec3d_R1__getSpacing, "", ""); I_Method1(bool, constrain, IN, osgManipulator::TranslateInLineCommand &, command, @@ -135,11 +145,11 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::GridConstraint) __bool__constrain__ScaleUniformCommand_R1, "", ""); - I_SimpleProperty(const osg::Vec3d, Origin, - 0, - __void__setOrigin__C5_osg_Vec3d); - I_SimpleProperty(const osg::Vec3d, Spacing, - 0, - __void__setSpacing__C5_osg_Vec3d); + I_SimpleProperty(const osg::Vec3d &, Origin, + __C5_osg_Vec3d_R1__getOrigin, + __void__setOrigin__C5_osg_Vec3d_R1); + I_SimpleProperty(const osg::Vec3d &, Spacing, + __C5_osg_Vec3d_R1__getSpacing, + __void__setSpacing__C5_osg_Vec3d_R1); END_REFLECTOR diff --git a/src/osgWrappers/osgManipulator/Dragger.cpp b/src/osgWrappers/osgManipulator/Dragger.cpp index aef89251d..5bde10428 100644 --- a/src/osgWrappers/osgManipulator/Dragger.cpp +++ b/src/osgWrappers/osgManipulator/Dragger.cpp @@ -12,6 +12,7 @@ #include #include +#include #include #include #include @@ -186,6 +187,36 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Dragger) __CompositeDragger_P1__getComposite, "Returns 0 if this Dragger is not a CompositeDragger. ", ""); + I_Method1(void, setHandleEvents, IN, bool, flag, + Properties::NON_VIRTUAL, + __void__setHandleEvents__bool, + "", + ""); + I_Method0(bool, getHandleEvents, + Properties::NON_VIRTUAL, + __bool__getHandleEvents, + "", + ""); + I_Method1(void, setDraggerActive, IN, bool, active, + Properties::NON_VIRTUAL, + __void__setDraggerActive__bool, + "", + ""); + I_Method0(bool, getDraggerActive, + Properties::NON_VIRTUAL, + __bool__getDraggerActive, + "", + ""); + I_Method1(void, traverse, IN, osg::NodeVisitor &, x, + Properties::VIRTUAL, + __void__traverse__osg_NodeVisitor_R1, + "Traverse downwards : calls children's accept method with NodeVisitor. ", + ""); + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, + Properties::VIRTUAL, + __bool__handle__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, + "", + ""); I_Method3(bool, handle, IN, const osgManipulator::PointerInfo &, x, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, Properties::VIRTUAL, __bool__handle__C5_PointerInfo_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, @@ -200,6 +231,12 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Dragger) I_SimpleProperty(osgManipulator::CompositeDragger *, Composite, __CompositeDragger_P1__getComposite, 0); + I_SimpleProperty(bool, DraggerActive, + __bool__getDraggerActive, + __void__setDraggerActive__bool); + I_SimpleProperty(bool, HandleEvents, + __bool__getHandleEvents, + __void__setHandleEvents__bool); I_SimpleProperty(osgManipulator::Dragger *, ParentDragger, __Dragger_P1__getParentDragger, __void__setParentDragger__Dragger_P1);