diff --git a/include/osgGA/StandardManipulator b/include/osgGA/StandardManipulator index b0130a8a3..c67667af4 100644 --- a/include/osgGA/StandardManipulator +++ b/include/osgGA/StandardManipulator @@ -29,133 +29,133 @@ namespace osgGA { for user controlled manipulation.*/ class OSGGA_EXPORT StandardManipulator : public MatrixManipulator { - typedef MatrixManipulator inherited; + typedef MatrixManipulator inherited; -public: + public: - // flags - enum { - UPDATE_MODEL_SIZE = 0x01, - COMPUTE_HOME_USING_BBOX = 0x02, - PROCESS_MOUSE_WHEEL = 0x04, - SET_CENTER_ON_WHEEL_UP = 0x08, - DEFAULT_SETTINGS = UPDATE_MODEL_SIZE | COMPUTE_HOME_USING_BBOX | PROCESS_MOUSE_WHEEL - }; + // flags + enum UserInteractionFlags + { + UPDATE_MODEL_SIZE = 0x01, + COMPUTE_HOME_USING_BBOX = 0x02, + PROCESS_MOUSE_WHEEL = 0x04, + SET_CENTER_ON_WHEEL_UP = 0x08, + DEFAULT_SETTINGS = UPDATE_MODEL_SIZE | COMPUTE_HOME_USING_BBOX | PROCESS_MOUSE_WHEEL + }; - StandardManipulator( int flags = DEFAULT_SETTINGS ); - StandardManipulator( const StandardManipulator& m, - const osg::CopyOp& copyOp = osg::CopyOp::SHALLOW_COPY ); + StandardManipulator( int flags = DEFAULT_SETTINGS ); + StandardManipulator( const StandardManipulator& m, + const osg::CopyOp& copyOp = osg::CopyOp::SHALLOW_COPY ); - // We are not using META_Object as this is abstract class. - // Use META_Object(osgGA,YourManipulator); in your descendant non-abstract classes. - virtual const char* className() const { return "StandardManipulator"; } + // We are not using META_Object as this is abstract class. + // Use META_Object(osgGA,YourManipulator); in your descendant non-abstract classes. + virtual const char* className() const { return "StandardManipulator"; } - virtual void setTransformation( const osg::Vec3d& eye, const osg::Quat& rotation ) = 0; - virtual void setTransformation( const osg::Vec3d& center, const osg::Vec3d& eye, const osg::Vec3d& up ) = 0; - virtual void getTransformation( osg::Vec3d& eye, osg::Quat& rotation ) const = 0; - virtual void getTransformation( osg::Vec3d& center, osg::Vec3d& eye, osg::Vec3d& up ) const = 0; + virtual void setTransformation( const osg::Vec3d& eye, const osg::Quat& rotation ) = 0; + virtual void setTransformation( const osg::Vec3d& center, const osg::Vec3d& eye, const osg::Vec3d& up ) = 0; + virtual void getTransformation( osg::Vec3d& eye, osg::Quat& rotation ) const = 0; + virtual void getTransformation( osg::Vec3d& center, osg::Vec3d& eye, osg::Vec3d& up ) const = 0; - virtual void setNode( osg::Node* ); - virtual const osg::Node* getNode() const; - virtual osg::Node* getNode(); + virtual void setNode( osg::Node* ); + virtual const osg::Node* getNode() const; + virtual osg::Node* getNode(); - virtual void setVerticalAxisFixed( bool value ); - inline bool getVerticalAxisFixed() const; + virtual void setVerticalAxisFixed( bool value ); + inline bool getVerticalAxisFixed() const; - virtual void setAnimationTime( const double t ); - double getAnimationTime() const; - bool isAnimating() const; - virtual void finishAnimation(); + virtual void setAnimationTime( const double t ); + double getAnimationTime() const; + bool isAnimating() const; + virtual void finishAnimation(); - virtual void home( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& us ); - virtual void home( double ); + virtual void home( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& us ); + virtual void home( double ); - virtual void init( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& us ); - virtual bool handle( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& us ); - virtual void getUsage( osg::ApplicationUsage& usage ) const; + virtual void init( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& us ); + virtual bool handle( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& us ); + virtual void getUsage( osg::ApplicationUsage& usage ) const; -protected: + protected: - virtual bool handleFrame( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& us ); - virtual bool handleResize( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& us ); - virtual bool handleMouseMove( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& us ); - virtual bool handleMouseDrag( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& us ); - virtual bool handleMousePush( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& us ); - virtual bool handleMouseRelease( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& us ); - virtual bool handleKeyDown( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& us ); - virtual bool handleKeyUp( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& us ); - virtual bool handleMouseWheel( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& us ); - virtual bool handleMouseDeltaMovement( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& us ); + virtual bool handleFrame( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& us ); + virtual bool handleResize( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& us ); + virtual bool handleMouseMove( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& us ); + virtual bool handleMouseDrag( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& us ); + virtual bool handleMousePush( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& us ); + virtual bool handleMouseRelease( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& us ); + virtual bool handleKeyDown( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& us ); + virtual bool handleKeyUp( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& us ); + virtual bool handleMouseWheel( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& us ); + virtual bool handleMouseDeltaMovement( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& us ); - virtual bool performMovement(); - virtual bool performMovementLeftMouseButton( const double dt, const double dx, const double dy ); - virtual bool performMovementMiddleMouseButton( const double dt, const double dx, const double dy ); - virtual bool performMovementRightMouseButton( const double dt, const double dx, const double dy ); - virtual bool performMouseDeltaMovement( const float dx, const float dy ); - virtual bool performAnimationMovement( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& us ); - virtual void applyAnimationStep( const double currentProgress, const double prevProgress ); + virtual bool performMovement(); + virtual bool performMovementLeftMouseButton( const double dt, const double dx, const double dy ); + virtual bool performMovementMiddleMouseButton( const double dt, const double dx, const double dy ); + virtual bool performMovementRightMouseButton( const double dt, const double dx, const double dy ); + virtual bool performMouseDeltaMovement( const float dx, const float dy ); + virtual bool performAnimationMovement( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& us ); + virtual void applyAnimationStep( const double currentProgress, const double prevProgress ); - void addMouseEvent( const osgGA::GUIEventAdapter& ea ); - void flushMouseEventStack(); - virtual bool isMouseMoving() const; - virtual void centerMousePointer( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& us ); + void addMouseEvent( const osgGA::GUIEventAdapter& ea ); + void flushMouseEventStack(); + virtual bool isMouseMoving() const; + virtual void centerMousePointer( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& us ); - static void rotateYawPitch( osg::Quat& rotation, const double yaw, const double pitch, - const osg::Vec3d& localUp = osg::Vec3d( 0.,0.,0.) ); - static void fixVerticalAxis( osg::Quat& rotation, const osg::Vec3d& localUp, bool disallowFlipOver ); - void fixVerticalAxis( osg::Vec3d& eye, osg::Quat& rotation, bool disallowFlipOver ); - static void fixVerticalAxis( const osg::Vec3d& forward, const osg::Vec3d& up, osg::Vec3d& newUp, - const osg::Vec3d& localUp, bool disallowFlipOver ); - virtual bool setCenterByMousePointerIntersection( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& us ); - virtual bool startAnimationByMousePointerIntersection( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& us ); + static void rotateYawPitch( osg::Quat& rotation, const double yaw, const double pitch, + const osg::Vec3d& localUp = osg::Vec3d( 0.,0.,0.) ); + static void fixVerticalAxis( osg::Quat& rotation, const osg::Vec3d& localUp, bool disallowFlipOver ); + void fixVerticalAxis( osg::Vec3d& eye, osg::Quat& rotation, bool disallowFlipOver ); + static void fixVerticalAxis( const osg::Vec3d& forward, const osg::Vec3d& up, osg::Vec3d& newUp, + const osg::Vec3d& localUp, bool disallowFlipOver ); + virtual bool setCenterByMousePointerIntersection( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& us ); + virtual bool startAnimationByMousePointerIntersection( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& us ); - // mouse state - bool _thrown; - float _mouseCenterX, _mouseCenterY; + // mouse state + bool _thrown; + float _mouseCenterX, _mouseCenterY; - // internal event stack comprising last two mouse events. - osg::ref_ptr< const osgGA::GUIEventAdapter > _ga_t1; - osg::ref_ptr< const osgGA::GUIEventAdapter > _ga_t0; + // internal event stack comprising last two mouse events. + osg::ref_ptr< const osgGA::GUIEventAdapter > _ga_t1; + osg::ref_ptr< const osgGA::GUIEventAdapter > _ga_t0; - /** The approximate amount of time it is currently taking to draw a frame. - * This is used to compute the delta in translation/rotation during a thrown display update. - * It allows us to match an delta in position/rotation independent of the rendering frame rate. - */ - double _delta_frame_time; + /** The approximate amount of time it is currently taking to draw a frame. + * This is used to compute the delta in translation/rotation during a thrown display update. + * It allows us to match an delta in position/rotation independent of the rendering frame rate. + */ + double _delta_frame_time; - /** The time the last frame started. - * Used when _rate_sensitive is true so that we can match display update rate to rotation/translation rate. - */ - double _last_frame_time; + /** The time the last frame started. + * Used when _rate_sensitive is true so that we can match display update rate to rotation/translation rate. + */ + double _last_frame_time; - // scene data - osg::ref_ptr< osg::Node > _node; - double _modelSize; - bool _verticalAxisFixed; + // scene data + osg::ref_ptr< osg::Node > _node; + double _modelSize; + bool _verticalAxisFixed; - // animation stuff - class AnimationData : public osg::Referenced { - public: - double _animationTime; - bool _isAnimating; - double _startTime; - double _phase; - AnimationData(); - void start( const double startTime ); - }; - osg::ref_ptr< AnimationData > _animationData; - virtual void allocAnimationData() { _animationData = new AnimationData(); } + // animation stuff + class AnimationData : public osg::Referenced { + public: + double _animationTime; + bool _isAnimating; + double _startTime; + double _phase; + AnimationData(); + void start( const double startTime ); + }; + osg::ref_ptr< AnimationData > _animationData; + virtual void allocAnimationData() { _animationData = new AnimationData(); } - // flags - int _flags; - - // flags indicating that a value is relative to model size - int _relativeFlags; - inline bool getRelativeFlag( int index ) const; - inline void setRelativeFlag( int index, bool value ); - static int numRelativeFlagsAllocated; - static int allocateRelativeFlag(); + // flags + int _flags; + // flags indicating that a value is relative to model size + int _relativeFlags; + inline bool getRelativeFlag( int index ) const; + inline void setRelativeFlag( int index, bool value ); + static int numRelativeFlagsAllocated; + static int allocateRelativeFlag(); }; diff --git a/src/osgWrappers/introspection/osgGA/DriveManipulator.cpp b/src/osgWrappers/introspection/osgGA/DriveManipulator.cpp index ce77dede7..b6af47c0d 100644 --- a/src/osgWrappers/introspection/osgGA/DriveManipulator.cpp +++ b/src/osgWrappers/introspection/osgGA/DriveManipulator.cpp @@ -74,7 +74,7 @@ BEGIN_OBJECT_REFLECTOR(osgGA::DriveManipulator) I_Method0(void, computeHomePosition, Properties::VIRTUAL, __void__computeHomePosition, - "Compute the home position. ", + "", ""); I_Method2(void, home, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, Properties::VIRTUAL, diff --git a/src/osgWrappers/introspection/osgGA/FlightManipulator.cpp b/src/osgWrappers/introspection/osgGA/FlightManipulator.cpp index a2028e91d..2e63c5988 100644 --- a/src/osgWrappers/introspection/osgGA/FlightManipulator.cpp +++ b/src/osgWrappers/introspection/osgGA/FlightManipulator.cpp @@ -11,8 +11,8 @@ #include #include -#include -#include +#include +#include #include #include #include @@ -33,155 +33,134 @@ END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgGA::FlightManipulator) I_DeclaringFile("osgGA/FlightManipulator"); - I_BaseType(osgGA::MatrixManipulator); - I_Constructor0(____FlightManipulator, - "", - ""); + I_BaseType(osgGA::FirstPersonManipulator); + I_ConstructorWithDefaults1(IN, int, flags, osgGA::StandardManipulator::UPDATE_MODEL_SIZE|osgGA::StandardManipulator::COMPUTE_HOME_USING_BBOX, + Properties::NON_EXPLICIT, + ____FlightManipulator__int, + "", + ""); + I_ConstructorWithDefaults2(IN, const osgGA::FlightManipulator &, fpm, , IN, const osg::CopyOp &, copyOp, osg::CopyOp::SHALLOW_COPY, + ____FlightManipulator__C5_FlightManipulator_R1__C5_osg_CopyOp_R1, + "", + ""); + I_Method0(osg::Object *, cloneType, + Properties::VIRTUAL, + __osg_Object_P1__cloneType, + "Clone the type of an object, with Object* return type. ", + "Must be defined by derived classes. "); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + Properties::VIRTUAL, + __osg_Object_P1__clone__C5_osg_CopyOp_R1, + "Clone an object, with Object* return type. ", + "Must be defined by derived classes. "); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, + Properties::VIRTUAL, + __bool__isSameKindAs__C5_osg_Object_P1, + "", + ""); + I_Method0(const char *, libraryName, + Properties::VIRTUAL, + __C5_char_P1__libraryName, + "return the name of the object's library. ", + "Must be defined by derived classes. The OpenSceneGraph convention is that the namespace of a library is the same as the library name. "); I_Method0(const char *, className, Properties::VIRTUAL, __C5_char_P1__className, "return the name of the object's class type. ", "Must be defined by derived classes. "); - I_Method1(void, setByMatrix, IN, const osg::Matrixd &, matrix, + I_Method1(void, setYawControlMode, IN, osgGA::FlightManipulator::YawControlMode, ycm, Properties::VIRTUAL, - __void__setByMatrix__C5_osg_Matrixd_R1, - "set the position of the matrix manipulator using a 4x4 Matrix. ", + __void__setYawControlMode__YawControlMode, + "", ""); - I_Method1(void, setByInverseMatrix, IN, const osg::Matrixd &, matrix, - Properties::VIRTUAL, - __void__setByInverseMatrix__C5_osg_Matrixd_R1, - "set the position of the matrix manipulator using a 4x4 Matrix. ", - ""); - I_Method0(osg::Matrixd, getMatrix, - Properties::VIRTUAL, - __osg_Matrixd__getMatrix, - "get the position of the manipulator as 4x4 Matrix. ", - ""); - I_Method0(osg::Matrixd, getInverseMatrix, - Properties::VIRTUAL, - __osg_Matrixd__getInverseMatrix, - "get the position of the manipulator as a inverse matrix of the manipulator, typically used as a model view matrix. ", - ""); - I_Method1(void, setNode, IN, osg::Node *, x, - Properties::VIRTUAL, - __void__setNode__osg_Node_P1, - "Attach a node to the manipulator, automatically detaching any previously attached node. ", - "setNode(NULL) detaches previous nodes. May be ignored by manipulators which do not require a reference model. "); - I_Method0(const osg::Node *, getNode, - Properties::VIRTUAL, - __C5_osg_Node_P1__getNode, - "Return const node if attached. ", - ""); - I_Method0(osg::Node *, getNode, - Properties::VIRTUAL, - __osg_Node_P1__getNode, - "Return node if attached. ", + I_Method0(osgGA::FlightManipulator::YawControlMode, getYawControlMode, + Properties::NON_VIRTUAL, + __YawControlMode__getYawControlMode, + "Returns the Yaw control for the flight model. ", ""); I_Method2(void, home, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, Properties::VIRTUAL, - __void__home__C5_GUIEventAdapter_R1__GUIActionAdapter_R1, + __void__home__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, "Move the camera to the default position. ", "May be ignored by manipulators if home functionality is not appropriate. "); I_Method2(void, init, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, Properties::VIRTUAL, - __void__init__C5_GUIEventAdapter_R1__GUIActionAdapter_R1, + __void__init__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, "Start/restart the manipulator. ", "FIXME: what does this actually mean? Provide examples. "); - I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, - Properties::VIRTUAL, - __bool__handle__C5_GUIEventAdapter_R1__GUIActionAdapter_R1, - "Handle events, return true if handled, false otherwise. ", - ""); - I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage, + I_Method1(void, getUsage, IN, osg::ApplicationUsage &, x, Properties::VIRTUAL, __void__getUsage__osg_ApplicationUsage_R1, "Get the keyboard and mouse usage of this manipulator. ", ""); - I_Method1(void, setYawControlMode, IN, osgGA::FlightManipulator::YawControlMode, ycm, - Properties::NON_VIRTUAL, - __void__setYawControlMode__YawControlMode, - "Configure the Yaw control for the flight model. ", - ""); - I_Method1(void, setModelScale, IN, double, in_ms, - Properties::NON_VIRTUAL, - __void__setModelScale__double, - "", - ""); - I_Method0(double, getModelScale, - Properties::NON_VIRTUAL, - __double__getModelScale, - "", - ""); - I_Method1(void, setAcceleration, IN, double, in_acc, - Properties::NON_VIRTUAL, - __void__setAcceleration__double, - "", - ""); - I_Method0(double, getAcceleration, - Properties::NON_VIRTUAL, - __double__getAcceleration, - "", - ""); - I_Method1(void, setVelocity, IN, double, in_vel, - Properties::NON_VIRTUAL, - __void__setVelocity__double, - "", - ""); - I_Method0(double, getVelocity, - Properties::NON_VIRTUAL, - __double__getVelocity, - "", - ""); - I_ProtectedMethod0(void, flushMouseEventStack, - Properties::NON_VIRTUAL, + I_ProtectedMethod2(bool, handleFrame, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, + Properties::VIRTUAL, Properties::NON_CONST, - __void__flushMouseEventStack, - "Reset the internal GUIEvent stack. ", - ""); - I_ProtectedMethod1(void, addMouseEvent, IN, const osgGA::GUIEventAdapter &, ea, - Properties::NON_VIRTUAL, - Properties::NON_CONST, - __void__addMouseEvent__C5_GUIEventAdapter_R1, - "Add the current mouse GUIEvent to internal stack. ", - ""); - I_ProtectedMethod3(void, computePosition, IN, const osg::Vec3 &, eye, IN, const osg::Vec3 &, lv, IN, const osg::Vec3 &, up, - Properties::NON_VIRTUAL, - Properties::NON_CONST, - __void__computePosition__C5_osg_Vec3_R1__C5_osg_Vec3_R1__C5_osg_Vec3_R1, + __bool__handleFrame__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, "", ""); - I_ProtectedMethod0(bool, calcMovement, - Properties::NON_VIRTUAL, + I_ProtectedMethod2(bool, handleMouseMove, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, + Properties::VIRTUAL, Properties::NON_CONST, - __bool__calcMovement, - "For the give mouse movement calculate the movement of the camera. ", - "Return true is camera has moved and a redraw is required. "); - I_SimpleProperty(double, Acceleration, - __double__getAcceleration, - __void__setAcceleration__double); - I_SimpleProperty(const osg::Matrixd &, ByInverseMatrix, - 0, - __void__setByInverseMatrix__C5_osg_Matrixd_R1); - I_SimpleProperty(const osg::Matrixd &, ByMatrix, - 0, - __void__setByMatrix__C5_osg_Matrixd_R1); - I_SimpleProperty(osg::Matrixd, InverseMatrix, - __osg_Matrixd__getInverseMatrix, - 0); - I_SimpleProperty(osg::Matrixd, Matrix, - __osg_Matrixd__getMatrix, - 0); - I_SimpleProperty(double, ModelScale, - __double__getModelScale, - __void__setModelScale__double); - I_SimpleProperty(osg::Node *, Node, - __osg_Node_P1__getNode, - __void__setNode__osg_Node_P1); - I_SimpleProperty(double, Velocity, - __double__getVelocity, - __void__setVelocity__double); + __bool__handleMouseMove__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, + "", + ""); + I_ProtectedMethod2(bool, handleMouseDrag, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, + Properties::VIRTUAL, + Properties::NON_CONST, + __bool__handleMouseDrag__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, + "", + ""); + I_ProtectedMethod2(bool, handleMousePush, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, + Properties::VIRTUAL, + Properties::NON_CONST, + __bool__handleMousePush__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, + "", + ""); + I_ProtectedMethod2(bool, handleMouseRelease, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, + Properties::VIRTUAL, + Properties::NON_CONST, + __bool__handleMouseRelease__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, + "", + ""); + I_ProtectedMethod2(bool, handleKeyDown, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, + Properties::VIRTUAL, + Properties::NON_CONST, + __bool__handleKeyDown__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, + "", + ""); + I_ProtectedMethod2(bool, flightHandleEvent, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, + Properties::VIRTUAL, + Properties::NON_CONST, + __bool__flightHandleEvent__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, + "", + ""); + I_ProtectedMethod0(bool, performMovement, + Properties::VIRTUAL, + Properties::NON_CONST, + __bool__performMovement, + "", + ""); + I_ProtectedMethod3(bool, performMovementLeftMouseButton, IN, const double, dt, IN, const double, dx, IN, const double, dy, + Properties::VIRTUAL, + Properties::NON_CONST, + __bool__performMovementLeftMouseButton__C5_double__C5_double__C5_double, + "", + ""); + I_ProtectedMethod3(bool, performMovementMiddleMouseButton, IN, const double, dt, IN, const double, dx, IN, const double, dy, + Properties::VIRTUAL, + Properties::NON_CONST, + __bool__performMovementMiddleMouseButton__C5_double__C5_double__C5_double, + "", + ""); + I_ProtectedMethod3(bool, performMovementRightMouseButton, IN, const double, dt, IN, const double, dx, IN, const double, dy, + Properties::VIRTUAL, + Properties::NON_CONST, + __bool__performMovementRightMouseButton__C5_double__C5_double__C5_double, + "", + ""); I_SimpleProperty(osgGA::FlightManipulator::YawControlMode, YawControlMode, - 0, + __YawControlMode__getYawControlMode, __void__setYawControlMode__YawControlMode); END_REFLECTOR diff --git a/src/osgWrappers/introspection/osgGA/KeySwitchMatrixManipulator.cpp b/src/osgWrappers/introspection/osgGA/KeySwitchMatrixManipulator.cpp index e2a75612f..3272018c2 100644 --- a/src/osgWrappers/introspection/osgGA/KeySwitchMatrixManipulator.cpp +++ b/src/osgWrappers/introspection/osgGA/KeySwitchMatrixManipulator.cpp @@ -103,11 +103,6 @@ BEGIN_OBJECT_REFLECTOR(osgGA::KeySwitchMatrixManipulator) __C5_MatrixManipulator_P1__getMatrixManipulatorWithKey__unsigned_int, "Get const manipulator assigned to a specified key. ", ""); - I_Method1(void, setMinimumDistance, IN, float, minimumDistance, - Properties::VIRTUAL, - __void__setMinimumDistance__float, - "set the minimum distance (as ratio) the eye point can be zoomed in towards the center before the center is pushed forward. ", - ""); I_Method1(void, setCoordinateFrameCallback, IN, osgGA::MatrixManipulator::CoordinateFrameCallback *, cb, Properties::VIRTUAL, __void__setCoordinateFrameCallback__CoordinateFrameCallback_P1, @@ -143,16 +138,6 @@ BEGIN_OBJECT_REFLECTOR(osgGA::KeySwitchMatrixManipulator) __float__getFusionDistanceValue, "Get the FusionDistanceValue. ", "Used by SceneView for setting up stereo convergence. "); - I_Method1(void, setDistance, IN, double, distance, - Properties::NON_VIRTUAL, - __void__setDistance__double, - "Set the distance property. ", - ""); - I_Method0(double, getDistance, - Properties::VIRTUAL, - __double__getDistance, - "Get the distance property. ", - ""); I_Method1(void, setNode, IN, osg::Node *, x, Properties::VIRTUAL, __void__setNode__osg_Node_P1, @@ -181,7 +166,7 @@ BEGIN_OBJECT_REFLECTOR(osgGA::KeySwitchMatrixManipulator) I_Method0(void, computeHomePosition, Properties::VIRTUAL, __void__computeHomePosition, - "Compute the home position. ", + "", ""); I_Method2(void, home, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, Properties::VIRTUAL, @@ -218,9 +203,6 @@ BEGIN_OBJECT_REFLECTOR(osgGA::KeySwitchMatrixManipulator) I_SimpleProperty(osgGA::MatrixManipulator *, CurrentMatrixManipulator, __MatrixManipulator_P1__getCurrentMatrixManipulator, 0); - I_SimpleProperty(double, Distance, - __double__getDistance, - __void__setDistance__double); I_SimpleProperty(osgUtil::SceneView::FusionDistanceMode, FusionDistanceMode, __osgUtil_SceneView_FusionDistanceMode__getFusionDistanceMode, 0); @@ -236,9 +218,6 @@ BEGIN_OBJECT_REFLECTOR(osgGA::KeySwitchMatrixManipulator) I_SimpleProperty(osg::Matrixd, Matrix, __osg_Matrixd__getMatrix, 0); - I_SimpleProperty(float, MinimumDistance, - 0, - __void__setMinimumDistance__float); I_SimpleProperty(osg::Node *, Node, __osg_Node_P1__getNode, __void__setNode__osg_Node_P1); diff --git a/src/osgWrappers/introspection/osgGA/MatrixManipulator.cpp b/src/osgWrappers/introspection/osgGA/MatrixManipulator.cpp index a910149a9..d9b6e9ab0 100644 --- a/src/osgWrappers/introspection/osgGA/MatrixManipulator.cpp +++ b/src/osgWrappers/introspection/osgGA/MatrixManipulator.cpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -35,16 +36,6 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgGA::MatrixManipulator) __C5_char_P1__className, "return the name of the object's class type. ", "Must be defined by derived classes. "); - I_Method1(void, setMinimumDistance, IN, float, minimumDistance, - Properties::VIRTUAL, - __void__setMinimumDistance__float, - "set the minimum distance (as ratio) the eye point can be zoomed in towards the center before the center is pushed forward. ", - ""); - I_Method0(float, getMinimumDistance, - Properties::NON_VIRTUAL, - __float__getMinimumDistance, - "get the minimum distance (as ratio) the eye point can be zoomed in ", - ""); I_Method1(void, setCoordinateFrameCallback, IN, osgGA::MatrixManipulator::CoordinateFrameCallback *, cb, Properties::VIRTUAL, __void__setCoordinateFrameCallback__CoordinateFrameCallback_P1, @@ -110,16 +101,6 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgGA::MatrixManipulator) __float__getFusionDistanceValue, "Get the FusionDistanceValue. ", "Used by SceneView for setting up stereo convergence. "); - I_Method1(void, setDistance, IN, double, x, - Properties::NON_VIRTUAL, - __void__setDistance__double, - "Set the distance parameter (used by TrackballManipulator etc. ", - ") "); - I_Method0(double, getDistance, - Properties::VIRTUAL, - __double__getDistance, - "Get the distance parameter. ", - ""); I_Method1(void, setIntersectTraversalMask, IN, unsigned int, mask, Properties::NON_VIRTUAL, __void__setIntersectTraversalMask__unsigned_int, @@ -165,11 +146,11 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgGA::MatrixManipulator) __bool__getAutoComputeHomePosition, "Get whether the automatic compute of the home position is enabled. ", ""); - I_Method0(void, computeHomePosition, - Properties::VIRTUAL, - __void__computeHomePosition, - "Compute the home position. ", - ""); + I_MethodWithDefaults2(void, computeHomePosition, IN, const osg::Camera *, camera, NULL, IN, bool, useBoundingBox, false, + Properties::VIRTUAL, + __void__computeHomePosition__C5_osg_Camera_P1__bool, + "Compute the home position. ", + ""); I_Method2(void, home, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, Properties::VIRTUAL, __void__home__C5_GUIEventAdapter_R1__GUIActionAdapter_R1, @@ -193,6 +174,16 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgGA::MatrixManipulator) I_ProtectedConstructor0(____MatrixManipulator, "", ""); + I_ProtectedConstructorWithDefaults2(IN, const osgGA::MatrixManipulator &, mm, , IN, const osg::CopyOp &, copyOp, osg::CopyOp::SHALLOW_COPY, + ____MatrixManipulator__C5_MatrixManipulator_R1__C5_osg_CopyOp_R1, + "", + ""); + I_ProtectedMethod0(std::string, getManipulatorName, + Properties::NON_VIRTUAL, + Properties::CONST, + __std_string__getManipulatorName, + "", + ""); I_SimpleProperty(bool, AutoComputeHomePosition, __bool__getAutoComputeHomePosition, __void__setAutoComputeHomePosition__bool); @@ -205,9 +196,6 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgGA::MatrixManipulator) I_SimpleProperty(osgGA::MatrixManipulator::CoordinateFrameCallback *, CoordinateFrameCallback, __CoordinateFrameCallback_P1__getCoordinateFrameCallback, __void__setCoordinateFrameCallback__CoordinateFrameCallback_P1); - I_SimpleProperty(double, Distance, - __double__getDistance, - __void__setDistance__double); I_SimpleProperty(osgUtil::SceneView::FusionDistanceMode, FusionDistanceMode, __osgUtil_SceneView_FusionDistanceMode__getFusionDistanceMode, 0); @@ -223,9 +211,6 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgGA::MatrixManipulator) I_SimpleProperty(osg::Matrixd, Matrix, __osg_Matrixd__getMatrix, 0); - I_SimpleProperty(float, MinimumDistance, - __float__getMinimumDistance, - __void__setMinimumDistance__float); I_SimpleProperty(osg::Node *, Node, __osg_Node_P1__getNode, __void__setNode__osg_Node_P1); diff --git a/src/osgWrappers/introspection/osgGA/NodeTrackerManipulator.cpp b/src/osgWrappers/introspection/osgGA/NodeTrackerManipulator.cpp index 8535fb3da..6a46e16df 100644 --- a/src/osgWrappers/introspection/osgGA/NodeTrackerManipulator.cpp +++ b/src/osgWrappers/introspection/osgGA/NodeTrackerManipulator.cpp @@ -10,14 +10,11 @@ #include #include -#include +#include #include #include -#include -#include -#include +#include #include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -40,12 +37,40 @@ BEGIN_ENUM_REFLECTOR(osgGA::NodeTrackerManipulator::RotationMode) I_EnumLabel(osgGA::NodeTrackerManipulator::ELEVATION_AZIM); END_REFLECTOR +TYPE_NAME_ALIAS(std::vector< osg::observer_ptr< osg::Node > >, osgGA::NodeTrackerManipulator::ObserverNodePath) + BEGIN_OBJECT_REFLECTOR(osgGA::NodeTrackerManipulator) I_DeclaringFile("osgGA/NodeTrackerManipulator"); - I_BaseType(osgGA::MatrixManipulator); - I_Constructor0(____NodeTrackerManipulator, - "", - ""); + I_BaseType(osgGA::OrbitManipulator); + I_ConstructorWithDefaults1(IN, int, flags, osgGA::StandardManipulator::DEFAULT_SETTINGS, + Properties::NON_EXPLICIT, + ____NodeTrackerManipulator__int, + "", + ""); + I_ConstructorWithDefaults2(IN, const osgGA::NodeTrackerManipulator &, om, , IN, const osg::CopyOp &, copyOp, osg::CopyOp::SHALLOW_COPY, + ____NodeTrackerManipulator__C5_NodeTrackerManipulator_R1__C5_osg_CopyOp_R1, + "", + ""); + I_Method0(osg::Object *, cloneType, + Properties::VIRTUAL, + __osg_Object_P1__cloneType, + "Clone the type of an object, with Object* return type. ", + "Must be defined by derived classes. "); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + Properties::VIRTUAL, + __osg_Object_P1__clone__C5_osg_CopyOp_R1, + "Clone an object, with Object* return type. ", + "Must be defined by derived classes. "); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, + Properties::VIRTUAL, + __bool__isSameKindAs__C5_osg_Object_P1, + "", + ""); + I_Method0(const char *, libraryName, + Properties::VIRTUAL, + __C5_char_P1__libraryName, + "return the name of the object's library. ", + "Must be defined by derived classes. The OpenSceneGraph convention is that the namespace of a library is the same as the library name. "); I_Method0(const char *, className, Properties::VIRTUAL, __C5_char_P1__className, @@ -56,14 +81,14 @@ BEGIN_OBJECT_REFLECTOR(osgGA::NodeTrackerManipulator) __void__setTrackNodePath__C5_osg_NodePath_R1, "", ""); - I_Method1(void, setTrackNodePath, IN, const osg::ObserverNodePath &, nodePath, + I_Method1(void, setTrackNodePath, IN, const osgGA::NodeTrackerManipulator::ObserverNodePath &, nodePath, Properties::NON_VIRTUAL, - __void__setTrackNodePath__C5_osg_ObserverNodePath_R1, + __void__setTrackNodePath__C5_ObserverNodePath_R1, "", ""); - I_Method0(osg::ObserverNodePath &, getTrackNodePath, + I_Method0(osgGA::NodeTrackerManipulator::ObserverNodePath &, getTrackNodePath, Properties::NON_VIRTUAL, - __osg_ObserverNodePath_R1__getTrackNodePath, + __ObserverNodePath_R1__getTrackNodePath, "", ""); I_Method1(void, setTrackNode, IN, osg::Node *, node, @@ -106,11 +131,6 @@ BEGIN_OBJECT_REFLECTOR(osgGA::NodeTrackerManipulator) __void__setByMatrix__C5_osg_Matrixd_R1, "set the position of the matrix manipulator using a 4x4 Matrix. ", ""); - I_Method1(void, setByInverseMatrix, IN, const osg::Matrixd &, matrix, - Properties::VIRTUAL, - __void__setByInverseMatrix__C5_osg_Matrixd_R1, - "set the position of the matrix manipulator using a 4x4 Matrix. ", - ""); I_Method0(osg::Matrixd, getMatrix, Properties::VIRTUAL, __osg_Matrixd__getMatrix, @@ -121,67 +141,57 @@ BEGIN_OBJECT_REFLECTOR(osgGA::NodeTrackerManipulator) __osg_Matrixd__getInverseMatrix, "get the position of the manipulator as a inverse matrix of the manipulator, typically used as a model view matrix. ", ""); - I_Method0(osgUtil::SceneView::FusionDistanceMode, getFusionDistanceMode, - Properties::VIRTUAL, - __osgUtil_SceneView_FusionDistanceMode__getFusionDistanceMode, - "Get the FusionDistanceMode. ", - "Used by SceneView for setting up stereo convergence. "); - I_Method0(float, getFusionDistanceValue, - Properties::VIRTUAL, - __float__getFusionDistanceValue, - "Get the FusionDistanceValue. ", - "Used by SceneView for setting up stereo convergence. "); I_Method1(void, setNode, IN, osg::Node *, x, Properties::VIRTUAL, __void__setNode__osg_Node_P1, - "Attach a node to the manipulator. ", - "Automatically detaches previously attached node. setNode(NULL) detaches previously nodes. Is ignored by manipulators which do not require a reference model. "); - I_Method0(const osg::Node *, getNode, - Properties::VIRTUAL, - __C5_osg_Node_P1__getNode, - "Return node if attached. ", - ""); - I_Method0(osg::Node *, getNode, - Properties::VIRTUAL, - __osg_Node_P1__getNode, - "Return node if attached. ", - ""); + "Attach a node to the manipulator, automatically detaching any previously attached node. ", + "setNode(NULL) detaches previous nodes. May be ignored by manipulators which do not require a reference model. "); I_Method0(void, computeHomePosition, Properties::VIRTUAL, __void__computeHomePosition, - "Compute the home position. ", + "", ""); - I_Method2(void, home, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, - Properties::VIRTUAL, - __void__home__C5_GUIEventAdapter_R1__GUIActionAdapter_R1, - "Move the camera to the default position. ", - "May be ignored by manipulators if home functionality is not appropriate. "); - I_Method2(void, init, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, - Properties::VIRTUAL, - __void__init__C5_GUIEventAdapter_R1__GUIActionAdapter_R1, - "Start/restart the manipulator. ", - ""); - I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, - Properties::VIRTUAL, - __bool__handle__C5_GUIEventAdapter_R1__GUIActionAdapter_R1, - "handle events, return true if handled, false otherwise. ", - ""); - I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage, - Properties::VIRTUAL, - __void__getUsage__osg_ApplicationUsage_R1, - "Get the keyboard and mouse usage of this manipulator. ", - ""); - I_ProtectedMethod0(void, flushMouseEventStack, - Properties::NON_VIRTUAL, + I_ProtectedMethod3(bool, performMovementLeftMouseButton, IN, const double, dt, IN, const double, dx, IN, const double, dy, + Properties::VIRTUAL, Properties::NON_CONST, - __void__flushMouseEventStack, - "Reset the internal GUIEvent stack. ", + __bool__performMovementLeftMouseButton__C5_double__C5_double__C5_double, + "", ""); - I_ProtectedMethod1(void, addMouseEvent, IN, const osgGA::GUIEventAdapter &, ea, - Properties::NON_VIRTUAL, + I_ProtectedMethod3(bool, performMovementMiddleMouseButton, IN, const double, dt, IN, const double, dx, IN, const double, dy, + Properties::VIRTUAL, Properties::NON_CONST, - __void__addMouseEvent__C5_GUIEventAdapter_R1, - "Add the current mouse GUIEvent to internal stack. ", + __bool__performMovementMiddleMouseButton__C5_double__C5_double__C5_double, + "", + ""); + I_ProtectedMethod3(bool, performMovementRightMouseButton, IN, const double, dt, IN, const double, dx, IN, const double, dy, + Properties::VIRTUAL, + Properties::NON_CONST, + __bool__performMovementRightMouseButton__C5_double__C5_double__C5_double, + "", + ""); + I_ProtectedMethod0(osg::NodePath, getNodePath, + Properties::NON_VIRTUAL, + Properties::CONST, + __osg_NodePath__getNodePath, + "", + ""); + I_ProtectedMethod0(bool, validateNodePath, + Properties::NON_VIRTUAL, + Properties::CONST, + __bool__validateNodePath, + "", + ""); + I_ProtectedMethod1(void, computeNodeWorldToLocal, IN, osg::Matrixd &, worldToLocal, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__computeNodeWorldToLocal__osg_Matrixd_R1, + "", + ""); + I_ProtectedMethod1(void, computeNodeLocalToWorld, IN, osg::Matrixd &, localToWorld, + Properties::NON_VIRTUAL, + Properties::CONST, + __void__computeNodeLocalToWorld__osg_Matrixd_R1, + "", ""); I_ProtectedMethod2(void, computeNodeCenterAndRotation, IN, osg::Vec3d &, center, IN, osg::Quat &, rotation, Properties::NON_VIRTUAL, @@ -195,48 +205,9 @@ BEGIN_OBJECT_REFLECTOR(osgGA::NodeTrackerManipulator) __void__computePosition__C5_osg_Vec3d_R1__C5_osg_Vec3d_R1__C5_osg_Vec3d_R1, "", ""); - I_ProtectedMethod0(bool, calcMovement, - Properties::NON_VIRTUAL, - Properties::NON_CONST, - __bool__calcMovement, - "For the give mouse movement calculate the movement of the camera. ", - "Return true is camera has moved and a redraw is required. "); - I_ProtectedMethod6(void, trackball, IN, osg::Vec3 &, axis, IN, double &, angle, IN, double, p1x, IN, double, p1y, IN, double, p2x, IN, double, p2y, - Properties::NON_VIRTUAL, - Properties::NON_CONST, - __void__trackball__osg_Vec3_R1__double_R1__double__double__double__double, - "", - ""); - I_ProtectedMethod3(double, tb_project_to_sphere, IN, double, r, IN, double, x, IN, double, y, - Properties::NON_VIRTUAL, - Properties::NON_CONST, - __double__tb_project_to_sphere__double__double__double, - "", - ""); - I_ProtectedMethod0(bool, isMouseMoving, - Properties::NON_VIRTUAL, - Properties::NON_CONST, - __bool__isMouseMoving, - "Check the speed at which the mouse is moving. ", - "If speed is below a threshold then return false, otherwise return true. "); - I_ProtectedMethod0(void, clampOrientation, - Properties::NON_VIRTUAL, - Properties::NON_CONST, - __void__clampOrientation, - "", - ""); - I_SimpleProperty(const osg::Matrixd &, ByInverseMatrix, - 0, - __void__setByInverseMatrix__C5_osg_Matrixd_R1); I_SimpleProperty(const osg::Matrixd &, ByMatrix, 0, __void__setByMatrix__C5_osg_Matrixd_R1); - I_SimpleProperty(osgUtil::SceneView::FusionDistanceMode, FusionDistanceMode, - __osgUtil_SceneView_FusionDistanceMode__getFusionDistanceMode, - 0); - I_SimpleProperty(float, FusionDistanceValue, - __float__getFusionDistanceValue, - 0); I_SimpleProperty(osg::Matrixd, InverseMatrix, __osg_Matrixd__getInverseMatrix, 0); @@ -244,7 +215,7 @@ BEGIN_OBJECT_REFLECTOR(osgGA::NodeTrackerManipulator) __osg_Matrixd__getMatrix, 0); I_SimpleProperty(osg::Node *, Node, - __osg_Node_P1__getNode, + 0, __void__setNode__osg_Node_P1); I_SimpleProperty(osgGA::NodeTrackerManipulator::RotationMode, RotationMode, __RotationMode__getRotationMode, @@ -252,11 +223,53 @@ BEGIN_OBJECT_REFLECTOR(osgGA::NodeTrackerManipulator) I_SimpleProperty(osg::Node *, TrackNode, __osg_Node_P1__getTrackNode, __void__setTrackNode__osg_Node_P1); - I_SimpleProperty(osg::ObserverNodePath &, TrackNodePath, - __osg_ObserverNodePath_R1__getTrackNodePath, + I_SimpleProperty(osgGA::NodeTrackerManipulator::ObserverNodePath &, TrackNodePath, + __ObserverNodePath_R1__getTrackNodePath, 0); I_SimpleProperty(osgGA::NodeTrackerManipulator::TrackerMode, TrackerMode, __TrackerMode__getTrackerMode, __void__setTrackerMode__TrackerMode); END_REFLECTOR +BEGIN_OBJECT_REFLECTOR(osg::observer_ptr< osg::Node >) + I_DeclaringFile("osg/observer_ptr"); + I_Constructor0(____observer_ptr, + "", + ""); + I_Constructor1(IN, const osg::ref_ptr< osg::Node > &, rp, + Properties::NON_EXPLICIT, + ____observer_ptr__C5_ref_ptrT1_T__R1, + "Create a observer_ptr from a ref_ptr. ", + ""); + I_Constructor1(IN, osg::Node *, rp, + Properties::NON_EXPLICIT, + ____observer_ptr__T_P1, + "Create a observer_ptr from a raw pointer. ", + "For compatibility; the result might not be lockable. "); + I_Constructor1(IN, const osg::observer_ptr< osg::Node > &, wp, + Properties::NON_EXPLICIT, + ____observer_ptr__C5_observer_ptr_R1, + "", + ""); + I_Method0(osg::ref_ptr< osg::Node >, lock, + Properties::NON_VIRTUAL, + __ref_ptrT1_T___lock, + "Create a ref_ptr from a observer_ptr. ", + "The ref_ptr will be valid if the referenced object hasn't been deleted and has a ref count > 0. "); + I_Method0(osg::Node *, get, + Properties::NON_VIRTUAL, + __T_P1__get, + "", + ""); + I_Method0(bool, valid, + Properties::NON_VIRTUAL, + __bool__valid, + "", + ""); + I_SimpleProperty(osg::Node *, , + __T_P1__get, + 0); +END_REFLECTOR + +STD_VECTOR_REFLECTOR(std::vector< osg::observer_ptr< osg::Node > >) + diff --git a/src/osgWrappers/introspection/osgGA/SphericalManipulator.cpp b/src/osgWrappers/introspection/osgGA/SphericalManipulator.cpp index 758026a6e..0fcb13e17 100644 --- a/src/osgWrappers/introspection/osgGA/SphericalManipulator.cpp +++ b/src/osgWrappers/introspection/osgGA/SphericalManipulator.cpp @@ -137,15 +137,15 @@ BEGIN_OBJECT_REFLECTOR(osgGA::SphericalManipulator) __C5_osg_Vec3d_R1__getCenter, "", ""); - I_Method1(bool, setDistance, IN, double, x, + I_Method1(bool, setDistance, IN, double, distance, Properties::NON_VIRTUAL, __bool__setDistance__double, - "Set the distance parameter (used by TrackballManipulator etc. ", - ") "); + "", + ""); I_Method0(double, getDistance, - Properties::VIRTUAL, + Properties::NON_VIRTUAL, __double__getDistance, - "Get the distance parameter. ", + "", ""); I_Method0(double, getHomeDistance, Properties::NON_VIRTUAL, diff --git a/src/osgWrappers/introspection/osgGA/TerrainManipulator.cpp b/src/osgWrappers/introspection/osgGA/TerrainManipulator.cpp index f226ab31b..50da0a9db 100644 --- a/src/osgWrappers/introspection/osgGA/TerrainManipulator.cpp +++ b/src/osgWrappers/introspection/osgGA/TerrainManipulator.cpp @@ -10,13 +10,12 @@ #include #include -#include +#include #include #include -#include -#include +#include +#include #include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -28,23 +27,49 @@ BEGIN_ENUM_REFLECTOR(osgGA::TerrainManipulator::RotationMode) I_DeclaringFile("osgGA/TerrainManipulator"); - I_EnumLabel(osgGA::TerrainManipulator::ELEVATION_HEADING_ROLL); - I_EnumLabel(osgGA::TerrainManipulator::ELEVATION_HEADING); + I_EnumLabel(osgGA::TerrainManipulator::ELEVATION_AZIM_ROLL); + I_EnumLabel(osgGA::TerrainManipulator::ELEVATION_AZIM); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgGA::TerrainManipulator) I_DeclaringFile("osgGA/TerrainManipulator"); - I_BaseType(osgGA::MatrixManipulator); - I_Constructor0(____TerrainManipulator, - "", - ""); + I_BaseType(osgGA::OrbitManipulator); + I_ConstructorWithDefaults1(IN, int, flags, osgGA::StandardManipulator::DEFAULT_SETTINGS, + Properties::NON_EXPLICIT, + ____TerrainManipulator__int, + "", + ""); + I_ConstructorWithDefaults2(IN, const osgGA::TerrainManipulator &, tm, , IN, const osg::CopyOp &, copyOp, osg::CopyOp::SHALLOW_COPY, + ____TerrainManipulator__C5_TerrainManipulator_R1__C5_osg_CopyOp_R1, + "", + ""); + I_Method0(osg::Object *, cloneType, + Properties::VIRTUAL, + __osg_Object_P1__cloneType, + "Clone the type of an object, with Object* return type. ", + "Must be defined by derived classes. "); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + Properties::VIRTUAL, + __osg_Object_P1__clone__C5_osg_CopyOp_R1, + "Clone an object, with Object* return type. ", + "Must be defined by derived classes. "); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, + Properties::VIRTUAL, + __bool__isSameKindAs__C5_osg_Object_P1, + "", + ""); + I_Method0(const char *, libraryName, + Properties::VIRTUAL, + __C5_char_P1__libraryName, + "return the name of the object's library. ", + "Must be defined by derived classes. The OpenSceneGraph convention is that the namespace of a library is the same as the library name. "); I_Method0(const char *, className, Properties::VIRTUAL, __C5_char_P1__className, "return the name of the object's class type. ", "Must be defined by derived classes. "); I_Method1(void, setRotationMode, IN, osgGA::TerrainManipulator::RotationMode, mode, - Properties::NON_VIRTUAL, + Properties::VIRTUAL, __void__setRotationMode__RotationMode, "", ""); @@ -58,153 +83,45 @@ BEGIN_OBJECT_REFLECTOR(osgGA::TerrainManipulator) __void__setByMatrix__C5_osg_Matrixd_R1, "set the position of the matrix manipulator using a 4x4 Matrix. ", ""); - I_Method1(void, setByInverseMatrix, IN, const osg::Matrixd &, matrix, + I_Method3(void, setTransformation, IN, const osg::Vec3d &, eye, IN, const osg::Vec3d &, center, IN, const osg::Vec3d &, up, Properties::VIRTUAL, - __void__setByInverseMatrix__C5_osg_Matrixd_R1, - "set the position of the matrix manipulator using a 4x4 Matrix. ", - ""); - I_Method0(osg::Matrixd, getMatrix, - Properties::VIRTUAL, - __osg_Matrixd__getMatrix, - "get the position of the manipulator as 4x4 Matrix. ", - ""); - I_Method0(osg::Matrixd, getInverseMatrix, - Properties::VIRTUAL, - __osg_Matrixd__getInverseMatrix, - "get the position of the manipulator as a inverse matrix of the manipulator, typically used as a model view matrix. ", - ""); - I_Method0(osgUtil::SceneView::FusionDistanceMode, getFusionDistanceMode, - Properties::VIRTUAL, - __osgUtil_SceneView_FusionDistanceMode__getFusionDistanceMode, - "Get the FusionDistanceMode. ", - "Used by SceneView for setting up stereo convergence. "); - I_Method0(float, getFusionDistanceValue, - Properties::VIRTUAL, - __float__getFusionDistanceValue, - "Get the FusionDistanceValue. ", - "Used by SceneView for setting up stereo convergence. "); - I_Method1(void, setDistance, IN, double, distance, - Properties::NON_VIRTUAL, - __void__setDistance__double, - "Set the distance of the trackball. ", - ""); - I_Method0(double, getDistance, - Properties::VIRTUAL, - __double__getDistance, - "Get the distance of the trackball. ", + __void__setTransformation__C5_osg_Vec3d_R1__C5_osg_Vec3d_R1__C5_osg_Vec3d_R1, + "", ""); I_Method1(void, setNode, IN, osg::Node *, x, Properties::VIRTUAL, __void__setNode__osg_Node_P1, - "Attach a node to the manipulator. ", - "Automatically detaches previously attached node. setNode(NULL) detaches previously nodes. Is ignored by manipulators which do not require a reference model. "); - I_Method0(const osg::Node *, getNode, - Properties::VIRTUAL, - __C5_osg_Node_P1__getNode, - "Return node if attached. ", - ""); - I_Method0(osg::Node *, getNode, - Properties::VIRTUAL, - __osg_Node_P1__getNode, - "Return node if attached. ", - ""); - I_Method2(void, home, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, - Properties::VIRTUAL, - __void__home__C5_GUIEventAdapter_R1__GUIActionAdapter_R1, - "Move the camera to the default position. ", - "May be ignored by manipulators if home functionality is not appropriate. "); - I_Method2(void, init, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, - Properties::VIRTUAL, - __void__init__C5_GUIEventAdapter_R1__GUIActionAdapter_R1, - "Start/restart the manipulator. ", - ""); - I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, - Properties::VIRTUAL, - __bool__handle__C5_GUIEventAdapter_R1__GUIActionAdapter_R1, - "handle events, return true if handled, false otherwise. ", - ""); - I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage, - Properties::VIRTUAL, - __void__getUsage__osg_ApplicationUsage_R1, - "Get the keyboard and mouse usage of this manipulator. ", - ""); + "Attach a node to the manipulator, automatically detaching any previously attached node. ", + "setNode(NULL) detaches previous nodes. May be ignored by manipulators which do not require a reference model. "); + I_ProtectedMethod3(bool, performMovementMiddleMouseButton, IN, const double, dt, IN, const double, dx, IN, const double, dy, + Properties::VIRTUAL, + Properties::NON_CONST, + __bool__performMovementMiddleMouseButton__C5_double__C5_double__C5_double, + "", + ""); + I_ProtectedMethod3(bool, performMovementRightMouseButton, IN, const double, dt, IN, const double, dx, IN, const double, dy, + Properties::VIRTUAL, + Properties::NON_CONST, + __bool__performMovementRightMouseButton__C5_double__C5_double__C5_double, + "", + ""); I_ProtectedMethod3(bool, intersect, IN, const osg::Vec3d &, start, IN, const osg::Vec3d &, end, IN, osg::Vec3d &, intersection, Properties::NON_VIRTUAL, Properties::CONST, __bool__intersect__C5_osg_Vec3d_R1__C5_osg_Vec3d_R1__osg_Vec3d_R1, "", ""); - I_ProtectedMethod0(void, flushMouseEventStack, - Properties::NON_VIRTUAL, - Properties::NON_CONST, - __void__flushMouseEventStack, - "Reset the internal GUIEvent stack. ", - ""); - I_ProtectedMethod1(void, addMouseEvent, IN, const osgGA::GUIEventAdapter &, ea, - Properties::NON_VIRTUAL, - Properties::NON_CONST, - __void__addMouseEvent__C5_GUIEventAdapter_R1, - "Add the current mouse GUIEvent to internal stack. ", - ""); - I_ProtectedMethod3(void, computePosition, IN, const osg::Vec3d &, eye, IN, const osg::Vec3d &, lv, IN, const osg::Vec3d &, up, - Properties::NON_VIRTUAL, - Properties::NON_CONST, - __void__computePosition__C5_osg_Vec3d_R1__C5_osg_Vec3d_R1__C5_osg_Vec3d_R1, - "", - ""); - I_ProtectedMethod0(bool, calcMovement, - Properties::NON_VIRTUAL, - Properties::NON_CONST, - __bool__calcMovement, - "For the give mouse movement calculate the movement of the camera. ", - "Return true is camera has moved and a redraw is required. "); - I_ProtectedMethod6(void, trackball, IN, osg::Vec3 &, axis, IN, double &, angle, IN, double, p1x, IN, double, p1y, IN, double, p2x, IN, double, p2y, - Properties::NON_VIRTUAL, - Properties::NON_CONST, - __void__trackball__osg_Vec3_R1__double_R1__double__double__double__double, - "", - ""); - I_ProtectedMethod3(double, tb_project_to_sphere, IN, double, r, IN, double, x, IN, double, y, - Properties::NON_VIRTUAL, - Properties::NON_CONST, - __double__tb_project_to_sphere__double__double__double, - "", - ""); - I_ProtectedMethod0(bool, isMouseMoving, - Properties::NON_VIRTUAL, - Properties::NON_CONST, - __bool__isMouseMoving, - "Check the speed at which the mouse is moving. ", - "If speed is below a threshold then return false, otherwise return true. "); I_ProtectedMethod0(void, clampOrientation, Properties::NON_VIRTUAL, Properties::NON_CONST, __void__clampOrientation, "", ""); - I_SimpleProperty(const osg::Matrixd &, ByInverseMatrix, - 0, - __void__setByInverseMatrix__C5_osg_Matrixd_R1); I_SimpleProperty(const osg::Matrixd &, ByMatrix, 0, __void__setByMatrix__C5_osg_Matrixd_R1); - I_SimpleProperty(double, Distance, - __double__getDistance, - __void__setDistance__double); - I_SimpleProperty(osgUtil::SceneView::FusionDistanceMode, FusionDistanceMode, - __osgUtil_SceneView_FusionDistanceMode__getFusionDistanceMode, - 0); - I_SimpleProperty(float, FusionDistanceValue, - __float__getFusionDistanceValue, - 0); - I_SimpleProperty(osg::Matrixd, InverseMatrix, - __osg_Matrixd__getInverseMatrix, - 0); - I_SimpleProperty(osg::Matrixd, Matrix, - __osg_Matrixd__getMatrix, - 0); I_SimpleProperty(osg::Node *, Node, - __osg_Node_P1__getNode, + 0, __void__setNode__osg_Node_P1); I_SimpleProperty(osgGA::TerrainManipulator::RotationMode, RotationMode, __RotationMode__getRotationMode, diff --git a/src/osgWrappers/introspection/osgGA/TrackballManipulator.cpp b/src/osgWrappers/introspection/osgGA/TrackballManipulator.cpp index 54a91dd97..4ce762249 100644 --- a/src/osgWrappers/introspection/osgGA/TrackballManipulator.cpp +++ b/src/osgWrappers/introspection/osgGA/TrackballManipulator.cpp @@ -10,15 +10,9 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include #include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -30,238 +24,40 @@ BEGIN_OBJECT_REFLECTOR(osgGA::TrackballManipulator) I_DeclaringFile("osgGA/TrackballManipulator"); - I_BaseType(osgGA::MatrixManipulator); - I_Constructor0(____TrackballManipulator, - "", - ""); + I_BaseType(osgGA::OrbitManipulator); + I_ConstructorWithDefaults1(IN, int, flags, osgGA::StandardManipulator::DEFAULT_SETTINGS, + Properties::NON_EXPLICIT, + ____TrackballManipulator__int, + "", + ""); + I_ConstructorWithDefaults2(IN, const osgGA::TrackballManipulator &, tm, , IN, const osg::CopyOp &, copyOp, osg::CopyOp::SHALLOW_COPY, + ____TrackballManipulator__C5_TrackballManipulator_R1__C5_osg_CopyOp_R1, + "", + ""); + I_Method0(osg::Object *, cloneType, + Properties::VIRTUAL, + __osg_Object_P1__cloneType, + "Clone the type of an object, with Object* return type. ", + "Must be defined by derived classes. "); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + Properties::VIRTUAL, + __osg_Object_P1__clone__C5_osg_CopyOp_R1, + "Clone an object, with Object* return type. ", + "Must be defined by derived classes. "); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, + Properties::VIRTUAL, + __bool__isSameKindAs__C5_osg_Object_P1, + "", + ""); + I_Method0(const char *, libraryName, + Properties::VIRTUAL, + __C5_char_P1__libraryName, + "return the name of the object's library. ", + "Must be defined by derived classes. The OpenSceneGraph convention is that the namespace of a library is the same as the library name. "); I_Method0(const char *, className, Properties::VIRTUAL, __C5_char_P1__className, "return the name of the object's class type. ", "Must be defined by derived classes. "); - I_Method1(void, setByMatrix, IN, const osg::Matrixd &, matrix, - Properties::VIRTUAL, - __void__setByMatrix__C5_osg_Matrixd_R1, - "set the position of the matrix manipulator using a 4x4 Matrix. ", - ""); - I_Method1(void, setByInverseMatrix, IN, const osg::Matrixd &, matrix, - Properties::VIRTUAL, - __void__setByInverseMatrix__C5_osg_Matrixd_R1, - "set the position of the matrix manipulator using a 4x4 Matrix. ", - ""); - I_Method0(osg::Matrixd, getMatrix, - Properties::VIRTUAL, - __osg_Matrixd__getMatrix, - "get the position of the manipulator as 4x4 Matrix. ", - ""); - I_Method0(osg::Matrixd, getInverseMatrix, - Properties::VIRTUAL, - __osg_Matrixd__getInverseMatrix, - "get the position of the manipulator as a inverse matrix of the manipulator, typically used as a model view matrix. ", - ""); - I_Method0(osgUtil::SceneView::FusionDistanceMode, getFusionDistanceMode, - Properties::VIRTUAL, - __osgUtil_SceneView_FusionDistanceMode__getFusionDistanceMode, - "Get the FusionDistanceMode. ", - "Used by SceneView for setting up stereo convergence. "); - I_Method0(float, getFusionDistanceValue, - Properties::VIRTUAL, - __float__getFusionDistanceValue, - "Get the FusionDistanceValue. ", - "Used by SceneView for setting up stereo convergence. "); - I_Method1(void, setNode, IN, osg::Node *, x, - Properties::VIRTUAL, - __void__setNode__osg_Node_P1, - "Attach a node to the manipulator. ", - "Automatically detaches previously attached node. setNode(NULL) detaches previously nodes. Is ignored by manipulators which do not require a reference model. "); - I_Method0(const osg::Node *, getNode, - Properties::VIRTUAL, - __C5_osg_Node_P1__getNode, - "Return node if attached. ", - ""); - I_Method0(osg::Node *, getNode, - Properties::VIRTUAL, - __osg_Node_P1__getNode, - "Return node if attached. ", - ""); - I_Method2(void, home, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, - Properties::VIRTUAL, - __void__home__C5_GUIEventAdapter_R1__GUIActionAdapter_R1, - "Move the camera to the default position. ", - "May be ignored by manipulators if home functionality is not appropriate. "); - I_Method1(void, home, IN, double, x, - Properties::VIRTUAL, - __void__home__double, - "Move the camera to the default position. ", - "This version does not require GUIEventAdapter and GUIActionAdapter so may be called from somewhere other than a handle() method in GUIEventHandler. Application must be aware of implications. "); - I_Method2(void, init, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, - Properties::VIRTUAL, - __void__init__C5_GUIEventAdapter_R1__GUIActionAdapter_R1, - "Start/restart the manipulator. ", - ""); - I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, - Properties::VIRTUAL, - __bool__handle__C5_GUIEventAdapter_R1__GUIActionAdapter_R1, - "handle events, return true if handled, false otherwise. ", - ""); - I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage, - Properties::VIRTUAL, - __void__getUsage__osg_ApplicationUsage_R1, - "Get the keyboard and mouse usage of this manipulator. ", - ""); - I_Method1(void, setMinimumZoomScale, IN, double, minimumZoomScale, - Properties::NON_VIRTUAL, - __void__setMinimumZoomScale__double, - "set the minimum distance (as ratio) the eye point can be zoomed in towards the center before the center is pushed forward. ", - ""); - I_Method0(double, getMinimumZoomScale, - Properties::NON_VIRTUAL, - __double__getMinimumZoomScale, - "get the minimum distance (as ratio) the eye point can be zoomed in ", - ""); - I_Method1(void, setScroolWheelZoomDelta, IN, double, zoomDelta, - Properties::NON_VIRTUAL, - __void__setScroolWheelZoomDelta__double, - "set the mouse scroll wheel zoom delta. ", - "Range -1.0 to +1.0, -ve value inverts wheel direction and zero switches off scroll wheel. "); - I_Method0(double, getScroolWheelZoomDelta, - Properties::NON_VIRTUAL, - __double__getScroolWheelZoomDelta, - "get the mouse scroll wheel zoom delta. ", - ""); - I_Method1(void, setCenter, IN, const osg::Vec3d &, center, - Properties::NON_VIRTUAL, - __void__setCenter__C5_osg_Vec3d_R1, - "Set the center of the trackball. ", - ""); - I_Method0(const osg::Vec3d &, getCenter, - Properties::NON_VIRTUAL, - __C5_osg_Vec3d_R1__getCenter, - "Get the center of the trackball. ", - ""); - I_Method1(void, setRotation, IN, const osg::Quat &, rotation, - Properties::NON_VIRTUAL, - __void__setRotation__C5_osg_Quat_R1, - "Set the rotation of the trackball. ", - ""); - I_Method0(const osg::Quat &, getRotation, - Properties::NON_VIRTUAL, - __C5_osg_Quat_R1__getRotation, - "Get the rotation of the trackball. ", - ""); - I_Method1(void, setDistance, IN, double, distance, - Properties::NON_VIRTUAL, - __void__setDistance__double, - "Set the distance of the trackball. ", - ""); - I_Method0(double, getDistance, - Properties::VIRTUAL, - __double__getDistance, - "Get the distance of the trackball. ", - ""); - I_Method1(void, setTrackballSize, IN, float, size, - Properties::NON_VIRTUAL, - __void__setTrackballSize__float, - "Set the size of the trackball. ", - ""); - I_Method0(float, getTrackballSize, - Properties::NON_VIRTUAL, - __float__getTrackballSize, - "Get the size of the trackball. ", - ""); - 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_Method0(bool, getAllowThrow, - Properties::NON_VIRTUAL, - __bool__getAllowThrow, - "Returns true if the camera can be thrown, false otherwise. ", - "This defaults to true. "); - I_ProtectedMethod0(void, flushMouseEventStack, - Properties::NON_VIRTUAL, - Properties::NON_CONST, - __void__flushMouseEventStack, - "Reset the internal GUIEvent stack. ", - ""); - I_ProtectedMethod1(void, addMouseEvent, IN, const osgGA::GUIEventAdapter &, ea, - Properties::NON_VIRTUAL, - Properties::NON_CONST, - __void__addMouseEvent__C5_GUIEventAdapter_R1, - "Add the current mouse GUIEvent to internal stack. ", - ""); - I_ProtectedMethod3(void, computePosition, IN, const osg::Vec3 &, eye, IN, const osg::Vec3 &, lv, IN, const osg::Vec3 &, up, - Properties::NON_VIRTUAL, - Properties::NON_CONST, - __void__computePosition__C5_osg_Vec3_R1__C5_osg_Vec3_R1__C5_osg_Vec3_R1, - "", - ""); - I_ProtectedMethod0(bool, calcMovement, - Properties::NON_VIRTUAL, - Properties::NON_CONST, - __bool__calcMovement, - "For the give mouse movement calculate the movement of the camera. ", - "Return true is camera has moved and a redraw is required. "); - I_ProtectedMethod6(void, trackball, IN, osg::Vec3 &, axis, IN, float &, angle, IN, float, p1x, IN, float, p1y, IN, float, p2x, IN, float, p2y, - Properties::NON_VIRTUAL, - Properties::NON_CONST, - __void__trackball__osg_Vec3_R1__float_R1__float__float__float__float, - "", - ""); - I_ProtectedMethod3(float, tb_project_to_sphere, IN, float, r, IN, float, x, IN, float, y, - Properties::NON_VIRTUAL, - Properties::NON_CONST, - __float__tb_project_to_sphere__float__float__float, - "", - ""); - I_ProtectedMethod0(bool, isMouseMoving, - Properties::NON_VIRTUAL, - Properties::NON_CONST, - __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); - I_SimpleProperty(const osg::Matrixd &, ByMatrix, - 0, - __void__setByMatrix__C5_osg_Matrixd_R1); - I_SimpleProperty(const osg::Vec3d &, Center, - __C5_osg_Vec3d_R1__getCenter, - __void__setCenter__C5_osg_Vec3d_R1); - I_SimpleProperty(double, Distance, - __double__getDistance, - __void__setDistance__double); - I_SimpleProperty(osgUtil::SceneView::FusionDistanceMode, FusionDistanceMode, - __osgUtil_SceneView_FusionDistanceMode__getFusionDistanceMode, - 0); - I_SimpleProperty(float, FusionDistanceValue, - __float__getFusionDistanceValue, - 0); - I_SimpleProperty(osg::Matrixd, InverseMatrix, - __osg_Matrixd__getInverseMatrix, - 0); - I_SimpleProperty(osg::Matrixd, Matrix, - __osg_Matrixd__getMatrix, - 0); - I_SimpleProperty(double, MinimumZoomScale, - __double__getMinimumZoomScale, - __void__setMinimumZoomScale__double); - I_SimpleProperty(osg::Node *, Node, - __osg_Node_P1__getNode, - __void__setNode__osg_Node_P1); - I_SimpleProperty(const osg::Quat &, Rotation, - __C5_osg_Quat_R1__getRotation, - __void__setRotation__C5_osg_Quat_R1); - I_SimpleProperty(double, ScroolWheelZoomDelta, - __double__getScroolWheelZoomDelta, - __void__setScroolWheelZoomDelta__double); - I_SimpleProperty(float, TrackballSize, - __float__getTrackballSize, - __void__setTrackballSize__float); END_REFLECTOR diff --git a/src/osgWrappers/introspection/osgGA/UFOManipulator.cpp b/src/osgWrappers/introspection/osgGA/UFOManipulator.cpp index cf47729e1..876307cfa 100644 --- a/src/osgWrappers/introspection/osgGA/UFOManipulator.cpp +++ b/src/osgWrappers/introspection/osgGA/UFOManipulator.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -102,9 +102,9 @@ BEGIN_OBJECT_REFLECTOR(osgGA::UFOManipulator) __void__getUsage__osg_ApplicationUsage_R1, "Reports Usage parameters to the application. ", ""); - I_Method3(void, getCurrentPositionAsLookAt, IN, osg::Vec3 &, eye, IN, osg::Vec3 &, center, IN, osg::Vec3 &, up, + I_Method3(void, getCurrentPositionAsLookAt, IN, osg::Vec3d &, eye, IN, osg::Vec3d &, center, IN, osg::Vec3d &, up, Properties::NON_VIRTUAL, - __void__getCurrentPositionAsLookAt__osg_Vec3_R1__osg_Vec3_R1__osg_Vec3_R1, + __void__getCurrentPositionAsLookAt__osg_Vec3d_R1__osg_Vec3d_R1__osg_Vec3d_R1, "Report the current position as LookAt vectors. ", ""); I_Method1(void, setMinHeight, IN, double, in_min_height,