diff --git a/src/osgWrappers/osgViewer/CompositeViewer.cpp b/src/osgWrappers/osgViewer/CompositeViewer.cpp index 4b47986e2..f7abbf5fc 100644 --- a/src/osgWrappers/osgViewer/CompositeViewer.cpp +++ b/src/osgWrappers/osgViewer/CompositeViewer.cpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -48,6 +49,11 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::CompositeViewer) I_Constructor0(____CompositeViewer, "", ""); + I_Constructor1(IN, osg::ArgumentParser &, arguments, + Properties::NON_EXPLICIT, + ____CompositeViewer__osg_ArgumentParser_R1, + "", + ""); I_Method1(void, addView, IN, osgViewer::View *, view, Properties::NON_VIRTUAL, __void__addView__osgViewer_View_P1, @@ -273,6 +279,12 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::CompositeViewer) __void__setUpRenderingSupport, "Set up the Operations to render the various viewer cameras on the viewers graphics windows. ", ""); + I_ProtectedMethod0(void, constructorInit, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__constructorInit, + "", + ""); I_ProtectedMethod0(void, init, Properties::NON_VIRTUAL, Properties::NON_CONST, diff --git a/src/osgWrappers/osgViewer/SimpleViewer.cpp b/src/osgWrappers/osgViewer/SimpleViewer.cpp deleted file mode 100644 index bea224c0c..000000000 --- a/src/osgWrappers/osgViewer/SimpleViewer.cpp +++ /dev/null @@ -1,216 +0,0 @@ -// *************************************************************************** -// -// Generated automatically by genwrapper. -// Please DO NOT EDIT this file! -// -// *************************************************************************** - -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -// Must undefine IN and OUT macros defined in Windows headers -#ifdef IN -#undef IN -#endif -#ifdef OUT -#undef OUT -#endif - -TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osgGA::GUIEventHandler > >, osgViewer::SimpleViewer::EventHandlers) - -BEGIN_OBJECT_REFLECTOR(osgViewer::SimpleViewer) - I_VirtualBaseType(osgViewer::GraphicsWindow); - I_Constructor0(____SimpleViewer, - "", - ""); - I_Method1(void, setSceneData, IN, osg::Node *, node, - Properties::NON_VIRTUAL, - __void__setSceneData__osg_Node_P1, - "", - ""); - I_Method0(osg::Node *, getSceneData, - Properties::NON_VIRTUAL, - __osg_Node_P1__getSceneData, - "", - ""); - I_Method0(const osg::Node *, getSceneData, - Properties::NON_VIRTUAL, - __C5_osg_Node_P1__getSceneData, - "", - ""); - I_Method1(void, setDatabasePager, IN, osgDB::DatabasePager *, dp, - Properties::NON_VIRTUAL, - __void__setDatabasePager__osgDB_DatabasePager_P1, - "", - ""); - I_Method0(osgDB::DatabasePager *, getDatabasePager, - Properties::NON_VIRTUAL, - __osgDB_DatabasePager_P1__getDatabasePager, - "", - ""); - I_Method0(const osgDB::DatabasePager *, getDatabasePager, - Properties::NON_VIRTUAL, - __C5_osgDB_DatabasePager_P1__getDatabasePager, - "", - ""); - I_Method0(osg::Camera *, getCamera, - Properties::NON_VIRTUAL, - __osg_Camera_P1__getCamera, - "", - ""); - I_Method0(const osg::Camera *, getCamera, - Properties::NON_VIRTUAL, - __C5_osg_Camera_P1__getCamera, - "", - ""); - I_Method1(void, setCameraManipulator, IN, osgGA::MatrixManipulator *, manipulator, - Properties::NON_VIRTUAL, - __void__setCameraManipulator__osgGA_MatrixManipulator_P1, - "", - ""); - I_Method0(osgGA::MatrixManipulator *, getCameraManipulator, - Properties::NON_VIRTUAL, - __osgGA_MatrixManipulator_P1__getCameraManipulator, - "", - ""); - I_Method0(const osgGA::MatrixManipulator *, getCameraManipulator, - Properties::NON_VIRTUAL, - __C5_osgGA_MatrixManipulator_P1__getCameraManipulator, - "", - ""); - I_Method1(void, addEventHandler, IN, osgGA::GUIEventHandler *, eventHandler, - Properties::NON_VIRTUAL, - __void__addEventHandler__osgGA_GUIEventHandler_P1, - "", - ""); - I_Method0(osgViewer::SimpleViewer::EventHandlers &, getEventHandlers, - Properties::NON_VIRTUAL, - __EventHandlers_R1__getEventHandlers, - "", - ""); - I_Method0(const osgViewer::SimpleViewer::EventHandlers &, getEventHandlers, - Properties::NON_VIRTUAL, - __C5_EventHandlers_R1__getEventHandlers, - "", - ""); - I_MethodWithDefaults1(void, frame, IN, double, simulationTime, USE_REFERENCE_TIME, - Properties::VIRTUAL, - __void__frame__double, - "Render a complete new frame. ", - "Calls frameAdvance(), frameEventTraversal(), frameUpateTraversal(), frameCullTraversal() and frameDrawTraversal(). Note, no internal makeCurrent() is issued before, or swap buffers called after frame(), these operations are the responsibility of the calling code. "); - I_MethodWithDefaults1(void, advance, IN, double, simulationTime, USE_REFERENCE_TIME, - Properties::VIRTUAL, - __void__advance__double, - "", - ""); - I_Method0(void, eventTraversal, - Properties::VIRTUAL, - __void__eventTraversal, - "", - ""); - I_Method0(void, updateTraversal, - Properties::VIRTUAL, - __void__updateTraversal, - "", - ""); - I_Method0(void, renderingTraversal, - Properties::VIRTUAL, - __void__renderingTraversal, - "", - ""); - I_Method0(void, releaseAllGLObjects, - Properties::VIRTUAL, - __void__releaseAllGLObjects, - "Release all OpenGL objects associated with this viewer's scenegraph. ", - "Note, does not deleted the actual OpenGL objects, it just releases them to the pending GL object delete lists which will need flushing once a valid graphics context is obtained. "); - I_Method0(void, cleanup, - Properties::VIRTUAL, - __void__cleanup, - "Clean up all OpenGL objects associated with this viewer's scenegraph. ", - "Note, must only be called from the graphics context associated with this viewer. "); - I_Method0(osgUtil::SceneView *, getSceneView, - Properties::NON_VIRTUAL, - __osgUtil_SceneView_P1__getSceneView, - "", - ""); - I_Method0(const osgUtil::SceneView *, getSceneView, - Properties::NON_VIRTUAL, - __C5_osgUtil_SceneView_P1__getSceneView, - "", - ""); - I_Method0(void, init, - Properties::NON_VIRTUAL, - __void__init, - "", - ""); - I_SimpleProperty(osg::Camera *, Camera, - __osg_Camera_P1__getCamera, - 0); - I_SimpleProperty(osgGA::MatrixManipulator *, CameraManipulator, - __osgGA_MatrixManipulator_P1__getCameraManipulator, - __void__setCameraManipulator__osgGA_MatrixManipulator_P1); - I_SimpleProperty(osgDB::DatabasePager *, DatabasePager, - __osgDB_DatabasePager_P1__getDatabasePager, - __void__setDatabasePager__osgDB_DatabasePager_P1); - I_SimpleProperty(osgViewer::SimpleViewer::EventHandlers &, EventHandlers, - __EventHandlers_R1__getEventHandlers, - 0); - I_SimpleProperty(osg::Node *, SceneData, - __osg_Node_P1__getSceneData, - __void__setSceneData__osg_Node_P1); - I_SimpleProperty(osgUtil::SceneView *, SceneView, - __osgUtil_SceneView_P1__getSceneView, - 0); -END_REFLECTOR - -BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgGA::GUIEventHandler >) - I_Constructor0(____ref_ptr, - "", - ""); - I_Constructor1(IN, osgGA::GUIEventHandler *, ptr, - Properties::NON_EXPLICIT, - ____ref_ptr__T_P1, - "", - ""); - I_Constructor1(IN, const osg::ref_ptr< osgGA::GUIEventHandler > &, rp, - Properties::NON_EXPLICIT, - ____ref_ptr__C5_ref_ptr_R1, - "", - ""); - I_Method0(osgGA::GUIEventHandler *, get, - Properties::NON_VIRTUAL, - __T_P1__get, - "", - ""); - I_Method0(bool, valid, - Properties::NON_VIRTUAL, - __bool__valid, - "", - ""); - I_Method0(osgGA::GUIEventHandler *, release, - Properties::NON_VIRTUAL, - __T_P1__release, - "", - ""); - I_Method1(void, swap, IN, osg::ref_ptr< osgGA::GUIEventHandler > &, rp, - Properties::NON_VIRTUAL, - __void__swap__ref_ptr_R1, - "", - ""); - I_SimpleProperty(osgGA::GUIEventHandler *, , - __T_P1__get, - 0); -END_REFLECTOR - -STD_LIST_REFLECTOR(std::list< osg::ref_ptr< osgGA::GUIEventHandler > >) - diff --git a/src/osgWrappers/osgViewer/View.cpp b/src/osgWrappers/osgViewer/View.cpp index a3bb956b4..31eca7a5f 100644 --- a/src/osgWrappers/osgViewer/View.cpp +++ b/src/osgWrappers/osgViewer/View.cpp @@ -308,3 +308,44 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::View) __void__setUpViewOnSingleScreen__unsigned_int); END_REFLECTOR +BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgGA::GUIEventHandler >) + I_Constructor0(____ref_ptr, + "", + ""); + I_Constructor1(IN, osgGA::GUIEventHandler *, ptr, + Properties::NON_EXPLICIT, + ____ref_ptr__T_P1, + "", + ""); + I_Constructor1(IN, const osg::ref_ptr< osgGA::GUIEventHandler > &, rp, + Properties::NON_EXPLICIT, + ____ref_ptr__C5_ref_ptr_R1, + "", + ""); + I_Method0(osgGA::GUIEventHandler *, get, + Properties::NON_VIRTUAL, + __T_P1__get, + "", + ""); + I_Method0(bool, valid, + Properties::NON_VIRTUAL, + __bool__valid, + "", + ""); + I_Method0(osgGA::GUIEventHandler *, release, + Properties::NON_VIRTUAL, + __T_P1__release, + "", + ""); + I_Method1(void, swap, IN, osg::ref_ptr< osgGA::GUIEventHandler > &, rp, + Properties::NON_VIRTUAL, + __void__swap__ref_ptr_R1, + "", + ""); + I_SimpleProperty(osgGA::GUIEventHandler *, , + __T_P1__get, + 0); +END_REFLECTOR + +STD_LIST_REFLECTOR(std::list< osg::ref_ptr< osgGA::GUIEventHandler > >) + diff --git a/src/osgWrappers/osgViewer/Viewer.cpp b/src/osgWrappers/osgViewer/Viewer.cpp index 5728b9b6e..312982cef 100644 --- a/src/osgWrappers/osgViewer/Viewer.cpp +++ b/src/osgWrappers/osgViewer/Viewer.cpp @@ -11,6 +11,7 @@ #include #include +#include #include #include #include @@ -55,6 +56,11 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::Viewer) I_Constructor0(____Viewer, "", ""); + I_Constructor1(IN, osg::ArgumentParser &, arguments, + Properties::NON_EXPLICIT, + ____Viewer__osg_ArgumentParser_R1, + "", + ""); I_Method0(bool, isRealized, Properties::NON_VIRTUAL, __bool__isRealized, @@ -275,6 +281,12 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::Viewer) __void__getUsage__osg_ApplicationUsage_R1, "Get the keyboard and mouse usage of this viewer. ", ""); + I_ProtectedMethod0(void, constructorInit, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__constructorInit, + "", + ""); I_ProtectedMethod0(void, checkWindowStatus, Properties::NON_VIRTUAL, Properties::NON_CONST,