From 97b66b877d8b7d6a3365601cc37f69eaa51b2867 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 14 Sep 2007 11:02:06 +0000 Subject: [PATCH] Updated wrappers --- .../osgGA/AnimationPathManipulator.cpp | 4 +- src/osgWrappers/osgGA/DriveManipulator.cpp | 4 +- src/osgWrappers/osgGA/FlightManipulator.cpp | 4 +- src/osgWrappers/osgGA/GUIEventHandler.cpp | 278 +++++++++++++++++- .../osgGA/KeySwitchMatrixManipulator.cpp | 4 +- src/osgWrappers/osgGA/MatrixManipulator.cpp | 4 +- .../osgGA/NodeTrackerManipulator.cpp | 4 +- src/osgWrappers/osgGA/StateSetManipulator.cpp | 4 +- src/osgWrappers/osgGA/TerrainManipulator.cpp | 4 +- .../osgGA/TrackballManipulator.cpp | 4 +- src/osgWrappers/osgGA/UFOManipulator.cpp | 2 +- src/osgWrappers/osgViewer/View.cpp | 2 +- .../osgViewer/ViewerEventHandlers.cpp | 18 +- 13 files changed, 303 insertions(+), 33 deletions(-) diff --git a/src/osgWrappers/osgGA/AnimationPathManipulator.cpp b/src/osgWrappers/osgGA/AnimationPathManipulator.cpp index 6355af4d9..64d6d0029 100644 --- a/src/osgWrappers/osgGA/AnimationPathManipulator.cpp +++ b/src/osgWrappers/osgGA/AnimationPathManipulator.cpp @@ -41,8 +41,8 @@ BEGIN_OBJECT_REFLECTOR(osgGA::AnimationPathManipulator) 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, setPrintOutTimingInfo, IN, bool, printOutTimingInfo, Properties::NON_VIRTUAL, __void__setPrintOutTimingInfo__bool, diff --git a/src/osgWrappers/osgGA/DriveManipulator.cpp b/src/osgWrappers/osgGA/DriveManipulator.cpp index 463770b03..6040bf75a 100644 --- a/src/osgWrappers/osgGA/DriveManipulator.cpp +++ b/src/osgWrappers/osgGA/DriveManipulator.cpp @@ -34,8 +34,8 @@ BEGIN_OBJECT_REFLECTOR(osgGA::DriveManipulator) 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, diff --git a/src/osgWrappers/osgGA/FlightManipulator.cpp b/src/osgWrappers/osgGA/FlightManipulator.cpp index e5b0f670e..8e27e099b 100644 --- a/src/osgWrappers/osgGA/FlightManipulator.cpp +++ b/src/osgWrappers/osgGA/FlightManipulator.cpp @@ -40,8 +40,8 @@ BEGIN_OBJECT_REFLECTOR(osgGA::FlightManipulator) 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, diff --git a/src/osgWrappers/osgGA/GUIEventHandler.cpp b/src/osgWrappers/osgGA/GUIEventHandler.cpp index 51181169d..e014cb791 100644 --- a/src/osgWrappers/osgGA/GUIEventHandler.cpp +++ b/src/osgWrappers/osgGA/GUIEventHandler.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -29,13 +29,87 @@ #endif BEGIN_OBJECT_REFLECTOR(osgGA::GUIEventHandler) - I_DeclaringFile("osgGA/GUIEventHandler"); + I_DeclaringFile("osgGA/GUIEventHandler.bkp"); + I_BaseType(osg::NodeCallback); + I_BaseType(osg::Drawable::EventCallback); I_BaseType(osg::NodeCallback); I_BaseType(osg::Drawable::EventCallback); I_Constructor0(____GUIEventHandler, "", ""); - I_Constructor2(IN, const osgGA::GUIEventHandler &, x, IN, const osg::CopyOp &, x, + I_Constructor2(IN, const osgGA::GUIEventHandler &, eh, IN, const osg::CopyOp &, x, + ____GUIEventHandler__C5_GUIEventHandler_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 &, copyop, + 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_Method2(void, event, IN, osg::NodeVisitor *, nv, IN, osg::Drawable *, drawable, + Properties::VIRTUAL, + __void__event__osg_NodeVisitor_P1__osg_Drawable_P1, + "Event traversal drawable callback method. ", + ""); + I_Method4(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, IN, osg::Object *, x, IN, osg::NodeVisitor *, x, + Properties::VIRTUAL, + __bool__handle__C5_GUIEventAdapter_R1__GUIActionAdapter_R1__osg_Object_P1__osg_NodeVisitor_P1, + "Handle events, return true if handled, false otherwise. ", + ""); + I_Method4(bool, handleWithCheckAgainstIgnoreHandledEventsMask, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, IN, osg::Object *, object, IN, osg::NodeVisitor *, nv, + Properties::NON_VIRTUAL, + __bool__handleWithCheckAgainstIgnoreHandledEventsMask__C5_GUIEventAdapter_R1__GUIActionAdapter_R1__osg_Object_P1__osg_NodeVisitor_P1, + "Convnience method that only passes on to the handle(,,,) method events that either haven't been handled yet, or have been handled but haven't be set to be ignored by the IgnoreHandledEventsMask. ", + "Note, this method is an inline method, and not appropriate for users to override, override the handle(,,,) method instead. "); + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, + Properties::VIRTUAL, + __bool__handle__C5_GUIEventAdapter_R1__GUIActionAdapter_R1, + "Deprecated, Handle events, return true if handled, false otherwise. ", + ""); + I_Method2(bool, handleWithCheckAgainstIgnoreHandledEventsMask, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, + Properties::NON_VIRTUAL, + __bool__handleWithCheckAgainstIgnoreHandledEventsMask__C5_GUIEventAdapter_R1__GUIActionAdapter_R1, + "Convnience method that only passes on to the handle(,) method events that either haven't been handled yet, or have been handled but haven't be set to be ignored by the IgnoreHandledEventsMask. ", + "Note, this method is an inline method, and not appropriate for users to override, override the handle(,) method instead. "); + 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, setIgnoreHandledEventsMask, IN, unsigned int, mask, + Properties::NON_VIRTUAL, + __void__setIgnoreHandledEventsMask__unsigned_int, + "Set a mask of osgGA::GUIEeventAdapter::Event to be ignored if marked as handled. ", + ""); + I_Method0(unsigned int, getIgnoreHandledEventsMask, + Properties::NON_VIRTUAL, + __unsigned_int__getIgnoreHandledEventsMask, + "Get the event mask of the osgGA::GUIEeventAdapter::Event to be ignored if marked as handled. ", + ""); + I_Constructor0(____GUIEventHandler, + "", + ""); + I_Constructor2(IN, const osgGA::GUIEventHandler &, eh, IN, const osg::CopyOp &, x, ____GUIEventHandler__C5_GUIEventHandler_R1__C5_osg_CopyOp_R1, "", ""); @@ -79,15 +153,189 @@ BEGIN_OBJECT_REFLECTOR(osgGA::GUIEventHandler) __bool__handle__C5_GUIEventAdapter_R1__GUIActionAdapter_R1, "deprecated, Handle events, return true if handled, false otherwise. ", ""); + I_Method2(bool, handleWithCheckAgainstIgnoreUsedEventsMask, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, + Properties::NON_VIRTUAL, + __bool__handleWithCheckAgainstIgnoreUsedEventsMask__C5_GUIEventAdapter_R1__GUIActionAdapter_R1, + "", + ""); 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, setIgnoreUsedEventsMask, IN, unsigned int, mask, + Properties::NON_VIRTUAL, + __void__setIgnoreUsedEventsMask__unsigned_int, + "Set a mask of osgGA::GUIEeventAdapter::Event to be ignored if marked as handled. ", + ""); + I_Method0(unsigned int, getIgnoreUsedEventsMask, + Properties::NON_VIRTUAL, + __unsigned_int__getIgnoreUsedEventsMask, + "Get the event mask of the osgGA::GUIEeventAdapter::Event to be ignored if marked as handled. ", + ""); + I_SimpleProperty(unsigned int, IgnoreHandledEventsMask, + __unsigned_int__getIgnoreHandledEventsMask, + __void__setIgnoreHandledEventsMask__unsigned_int); + I_SimpleProperty(unsigned int, IgnoreUsedEventsMask, + __unsigned_int__getIgnoreUsedEventsMask, + __void__setIgnoreUsedEventsMask__unsigned_int); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osgGA::GUIEventHandler) + I_DeclaringFile("osgGA/GUIEventHandler.bkp"); + I_BaseType(osg::NodeCallback); + I_BaseType(osg::Drawable::EventCallback); + I_BaseType(osg::NodeCallback); + I_BaseType(osg::Drawable::EventCallback); + I_Constructor0(____GUIEventHandler, + "", + ""); + I_Constructor2(IN, const osgGA::GUIEventHandler &, eh, IN, const osg::CopyOp &, x, + ____GUIEventHandler__C5_GUIEventHandler_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 &, copyop, + 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_Method2(void, event, IN, osg::NodeVisitor *, nv, IN, osg::Drawable *, drawable, + Properties::VIRTUAL, + __void__event__osg_NodeVisitor_P1__osg_Drawable_P1, + "Event traversal drawable callback method. ", + ""); + I_Method4(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, IN, osg::Object *, x, IN, osg::NodeVisitor *, x, + Properties::VIRTUAL, + __bool__handle__C5_GUIEventAdapter_R1__GUIActionAdapter_R1__osg_Object_P1__osg_NodeVisitor_P1, + "Handle events, return true if handled, false otherwise. ", + ""); + I_Method4(bool, handleWithCheckAgainstIgnoreHandledEventsMask, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, IN, osg::Object *, object, IN, osg::NodeVisitor *, nv, + Properties::NON_VIRTUAL, + __bool__handleWithCheckAgainstIgnoreHandledEventsMask__C5_GUIEventAdapter_R1__GUIActionAdapter_R1__osg_Object_P1__osg_NodeVisitor_P1, + "Convnience method that only passes on to the handle(,,,) method events that either haven't been handled yet, or have been handled but haven't be set to be ignored by the IgnoreHandledEventsMask. ", + "Note, this method is an inline method, and not appropriate for users to override, override the handle(,,,) method instead. "); + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, + Properties::VIRTUAL, + __bool__handle__C5_GUIEventAdapter_R1__GUIActionAdapter_R1, + "Deprecated, Handle events, return true if handled, false otherwise. ", + ""); + I_Method2(bool, handleWithCheckAgainstIgnoreHandledEventsMask, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, + Properties::NON_VIRTUAL, + __bool__handleWithCheckAgainstIgnoreHandledEventsMask__C5_GUIEventAdapter_R1__GUIActionAdapter_R1, + "Convnience method that only passes on to the handle(,) method events that either haven't been handled yet, or have been handled but haven't be set to be ignored by the IgnoreHandledEventsMask. ", + "Note, this method is an inline method, and not appropriate for users to override, override the handle(,) method instead. "); + 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, setIgnoreHandledEventsMask, IN, unsigned int, mask, + Properties::NON_VIRTUAL, + __void__setIgnoreHandledEventsMask__unsigned_int, + "Set a mask of osgGA::GUIEeventAdapter::Event to be ignored if marked as handled. ", + ""); + I_Method0(unsigned int, getIgnoreHandledEventsMask, + Properties::NON_VIRTUAL, + __unsigned_int__getIgnoreHandledEventsMask, + "Get the event mask of the osgGA::GUIEeventAdapter::Event to be ignored if marked as handled. ", + ""); + I_Constructor0(____GUIEventHandler, + "", + ""); + I_Constructor2(IN, const osgGA::GUIEventHandler &, eh, IN, const osg::CopyOp &, x, + ____GUIEventHandler__C5_GUIEventHandler_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 &, copyop, + 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_Method2(void, event, IN, osg::NodeVisitor *, nv, IN, osg::Drawable *, drawable, + Properties::VIRTUAL, + __void__event__osg_NodeVisitor_P1__osg_Drawable_P1, + "Event traversal drawable callback method. ", + ""); + I_Method4(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, IN, osg::Object *, x, IN, osg::NodeVisitor *, x, + Properties::VIRTUAL, + __bool__handle__C5_GUIEventAdapter_R1__GUIActionAdapter_R1__osg_Object_P1__osg_NodeVisitor_P1, + "Handle events, return true if handled, false otherwise. ", + ""); + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, + Properties::VIRTUAL, + __bool__handle__C5_GUIEventAdapter_R1__GUIActionAdapter_R1, + "deprecated, Handle events, return true if handled, false otherwise. ", + ""); + I_Method2(bool, handleWithCheckAgainstIgnoreUsedEventsMask, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, + Properties::NON_VIRTUAL, + __bool__handleWithCheckAgainstIgnoreUsedEventsMask__C5_GUIEventAdapter_R1__GUIActionAdapter_R1, + "", + ""); + 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, setIgnoreUsedEventsMask, IN, unsigned int, mask, + Properties::NON_VIRTUAL, + __void__setIgnoreUsedEventsMask__unsigned_int, + "Set a mask of osgGA::GUIEeventAdapter::Event to be ignored if marked as handled. ", + ""); + I_Method0(unsigned int, getIgnoreUsedEventsMask, + Properties::NON_VIRTUAL, + __unsigned_int__getIgnoreUsedEventsMask, + "Get the event mask of the osgGA::GUIEeventAdapter::Event to be ignored if marked as handled. ", + ""); + I_SimpleProperty(unsigned int, IgnoreHandledEventsMask, + __unsigned_int__getIgnoreHandledEventsMask, + __void__setIgnoreHandledEventsMask__unsigned_int); + I_SimpleProperty(unsigned int, IgnoreUsedEventsMask, + __unsigned_int__getIgnoreUsedEventsMask, + __void__setIgnoreUsedEventsMask__unsigned_int); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgGA::GUIEventHandlerVisitor) - I_DeclaringFile("osgGA/GUIEventHandler"); + I_DeclaringFile("osgGA/GUIEventHandler.bkp"); I_Constructor0(____GUIEventHandlerVisitor, "", ""); @@ -96,5 +344,27 @@ BEGIN_VALUE_REFLECTOR(osgGA::GUIEventHandlerVisitor) __void__visit__GUIEventHandler_R1, "", ""); + I_Method1(void, visit, IN, osgGA::GUIEventHandler &, x, + Properties::NON_VIRTUAL, + __void__visit__GUIEventHandler_R1, + "", + ""); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osgGA::GUIEventHandlerVisitor) + I_DeclaringFile("osgGA/GUIEventHandler.bkp"); + I_Constructor0(____GUIEventHandlerVisitor, + "", + ""); + I_Method1(void, visit, IN, osgGA::GUIEventHandler &, x, + Properties::NON_VIRTUAL, + __void__visit__GUIEventHandler_R1, + "", + ""); + I_Method1(void, visit, IN, osgGA::GUIEventHandler &, x, + Properties::NON_VIRTUAL, + __void__visit__GUIEventHandler_R1, + "", + ""); END_REFLECTOR diff --git a/src/osgWrappers/osgGA/KeySwitchMatrixManipulator.cpp b/src/osgWrappers/osgGA/KeySwitchMatrixManipulator.cpp index b0cdc2465..c76aa0318 100644 --- a/src/osgWrappers/osgGA/KeySwitchMatrixManipulator.cpp +++ b/src/osgWrappers/osgGA/KeySwitchMatrixManipulator.cpp @@ -41,8 +41,8 @@ BEGIN_OBJECT_REFLECTOR(osgGA::KeySwitchMatrixManipulator) 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_Method3(void, addMatrixManipulator, IN, int, key, IN, std::string, name, IN, osgGA::MatrixManipulator *, cm, Properties::NON_VIRTUAL, __void__addMatrixManipulator__int__std_string__MatrixManipulator_P1, diff --git a/src/osgWrappers/osgGA/MatrixManipulator.cpp b/src/osgWrappers/osgGA/MatrixManipulator.cpp index bf7bc83b8..f7092d314 100644 --- a/src/osgWrappers/osgGA/MatrixManipulator.cpp +++ b/src/osgWrappers/osgGA/MatrixManipulator.cpp @@ -33,8 +33,8 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgGA::MatrixManipulator) 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, setMinimumDistance, IN, float, minimumDistance, Properties::VIRTUAL, __void__setMinimumDistance__float, diff --git a/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp b/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp index 998ae1c8a..7593e5d1d 100644 --- a/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp +++ b/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp @@ -50,8 +50,8 @@ BEGIN_OBJECT_REFLECTOR(osgGA::NodeTrackerManipulator) 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, setTrackNodePath, IN, const osg::NodePath &, nodePath, Properties::NON_VIRTUAL, __void__setTrackNodePath__C5_osg_NodePath_R1, diff --git a/src/osgWrappers/osgGA/StateSetManipulator.cpp b/src/osgWrappers/osgGA/StateSetManipulator.cpp index 635954295..2c85a17ae 100644 --- a/src/osgWrappers/osgGA/StateSetManipulator.cpp +++ b/src/osgWrappers/osgGA/StateSetManipulator.cpp @@ -36,8 +36,8 @@ BEGIN_OBJECT_REFLECTOR(osgGA::StateSetManipulator) 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, setStateSet, IN, osg::StateSet *, x, Properties::VIRTUAL, __void__setStateSet__osg_StateSet_P1, diff --git a/src/osgWrappers/osgGA/TerrainManipulator.cpp b/src/osgWrappers/osgGA/TerrainManipulator.cpp index f3f090e9d..25288b4ba 100644 --- a/src/osgWrappers/osgGA/TerrainManipulator.cpp +++ b/src/osgWrappers/osgGA/TerrainManipulator.cpp @@ -41,8 +41,8 @@ BEGIN_OBJECT_REFLECTOR(osgGA::TerrainManipulator) 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, __void__setRotationMode__RotationMode, diff --git a/src/osgWrappers/osgGA/TrackballManipulator.cpp b/src/osgWrappers/osgGA/TrackballManipulator.cpp index f24e88df7..e748ed2ae 100644 --- a/src/osgWrappers/osgGA/TrackballManipulator.cpp +++ b/src/osgWrappers/osgGA/TrackballManipulator.cpp @@ -37,8 +37,8 @@ BEGIN_OBJECT_REFLECTOR(osgGA::TrackballManipulator) 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, diff --git a/src/osgWrappers/osgGA/UFOManipulator.cpp b/src/osgWrappers/osgGA/UFOManipulator.cpp index 97f2ac2a3..21a2c3ecb 100644 --- a/src/osgWrappers/osgGA/UFOManipulator.cpp +++ b/src/osgWrappers/osgGA/UFOManipulator.cpp @@ -98,7 +98,7 @@ BEGIN_OBJECT_REFLECTOR(osgGA::UFOManipulator) "Handles incoming osgGA events. ", ""); I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage, - Properties::VIRTUAL, + Properties::NON_VIRTUAL, __void__getUsage__osg_ApplicationUsage_R1, "Reports Usage parameters to the application. ", ""); diff --git a/src/osgWrappers/osgViewer/View.cpp b/src/osgWrappers/osgViewer/View.cpp index 98575a34a..b6080cb68 100644 --- a/src/osgWrappers/osgViewer/View.cpp +++ b/src/osgWrappers/osgViewer/View.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/osgWrappers/osgViewer/ViewerEventHandlers.cpp b/src/osgWrappers/osgViewer/ViewerEventHandlers.cpp index 8883c301f..4a92fce95 100644 --- a/src/osgWrappers/osgViewer/ViewerEventHandlers.cpp +++ b/src/osgWrappers/osgViewer/ViewerEventHandlers.cpp @@ -73,9 +73,9 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::HelpHandler) "", ""); I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, - Properties::VIRTUAL, + Properties::NON_VIRTUAL, __bool__handle__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, - "deprecated, Handle events, return true if handled, false otherwise. ", + "", ""); I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage, Properties::VIRTUAL, @@ -136,12 +136,12 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::RecordCameraPathHandler) 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_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, - Properties::VIRTUAL, + Properties::NON_VIRTUAL, __bool__handle__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, - "deprecated, Handle events, return true if handled, false otherwise. ", + "", ""); I_SimpleProperty(int, KeyEventTogglePlayback, __int__getKeyEventTogglePlayback, @@ -208,7 +208,7 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::StatsHandler) I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, Properties::VIRTUAL, __bool__handle__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, - "deprecated, Handle events, return true if handled, false otherwise. ", + "", ""); I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage, Properties::VIRTUAL, @@ -323,9 +323,9 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::ThreadingHandler) "", ""); I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, - Properties::VIRTUAL, + Properties::NON_VIRTUAL, __bool__handle__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, - "deprecated, Handle events, return true if handled, false otherwise. ", + "", ""); I_SimpleProperty(bool, ChangeEndBarrierPosition, __bool__getChangeEndBarrierPosition, @@ -405,7 +405,7 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::WindowSizeHandler) I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, Properties::VIRTUAL, __bool__handle__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, - "deprecated, Handle events, return true if handled, false otherwise. ", + "", ""); I_ProtectedMethod1(void, toggleFullscreen, IN, osgViewer::GraphicsWindow *, window, Properties::NON_VIRTUAL,