From e725f30d81440ca4805ed417b8db1a5aeca23239 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 24 Sep 2007 16:25:55 +0000 Subject: [PATCH] Updated wrappers --- src/osgWrappers/osg/View.cpp | 10 +++++ src/osgWrappers/osgViewer/CompositeViewer.cpp | 5 +++ src/osgWrappers/osgViewer/Scene.cpp | 6 +-- src/osgWrappers/osgViewer/View.cpp | 6 +++ src/osgWrappers/osgViewer/Viewer.cpp | 42 +++++++++++++++++++ 5 files changed, 66 insertions(+), 3 deletions(-) diff --git a/src/osgWrappers/osg/View.cpp b/src/osgWrappers/osg/View.cpp index 3a574de1c..828c786ee 100644 --- a/src/osgWrappers/osg/View.cpp +++ b/src/osgWrappers/osg/View.cpp @@ -69,6 +69,11 @@ BEGIN_OBJECT_REFLECTOR(osg::View) __C5_char_P1__className, "return the name of the object's class type. ", "Must be defined by derived classes. "); + I_Method1(void, take, IN, osg::View &, rhs, + Properties::VIRTUAL, + __void__take__View_R1, + "Take all the settings, Camera and Slaves from the passed in view, leaving it empty. ", + ""); I_Method1(void, setStats, IN, osg::Stats *, stats, Properties::NON_VIRTUAL, __void__setStats__osg_Stats_P1, @@ -154,6 +159,11 @@ BEGIN_OBJECT_REFLECTOR(osg::View) __C5_Slave_R1__getSlave__unsigned_int, "", ""); + I_Method1(unsigned int, findSlaveIndexForCamera, IN, osg::Camera *, camera, + Properties::NON_VIRTUAL, + __unsigned_int__findSlaveIndexForCamera__osg_Camera_P1, + "", + ""); I_Method1(osg::View::Slave *, findSlaveForCamera, IN, osg::Camera *, camera, Properties::NON_VIRTUAL, __Slave_P1__findSlaveForCamera__osg_Camera_P1, diff --git a/src/osgWrappers/osgViewer/CompositeViewer.cpp b/src/osgWrappers/osgViewer/CompositeViewer.cpp index 528eca0a8..e68ce7d2b 100644 --- a/src/osgWrappers/osgViewer/CompositeViewer.cpp +++ b/src/osgWrappers/osgViewer/CompositeViewer.cpp @@ -90,6 +90,11 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::CompositeViewer) __C5_char_P1__className, "return the name of the object's class type. ", "Must be defined by derived classes. "); + I_Method1(bool, readConfiguration, IN, const std::string &, filename, + Properties::NON_VIRTUAL, + __bool__readConfiguration__C5_std_string_R1, + "read the viewer configuration from a configuration file. ", + ""); I_Method1(void, addView, IN, osgViewer::View *, view, Properties::NON_VIRTUAL, __void__addView__osgViewer_View_P1, diff --git a/src/osgWrappers/osgViewer/Scene.cpp b/src/osgWrappers/osgViewer/Scene.cpp index fceb690da..bbffe81a3 100644 --- a/src/osgWrappers/osgViewer/Scene.cpp +++ b/src/osgWrappers/osgViewer/Scene.cpp @@ -25,9 +25,6 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::Scene) I_DeclaringFile("osgViewer/Scene"); I_BaseType(osg::Referenced); - I_Constructor0(____Scene, - "", - ""); I_Method1(void, setSceneData, IN, osg::Node *, node, Properties::NON_VIRTUAL, __void__setSceneData__osg_Node_P1, @@ -62,6 +59,9 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::Scene) __Scene_P1__getScene__osg_Node_P1_S, "Get the Scene object that has the specified node assigned to it. ", "return 0 if no Scene has yet been assigned the specified node. "); + I_ProtectedConstructor0(____Scene, + "", + ""); I_SimpleProperty(osgDB::DatabasePager *, DatabasePager, __osgDB_DatabasePager_P1__getDatabasePager, __void__setDatabasePager__osgDB_DatabasePager_P1); diff --git a/src/osgWrappers/osgViewer/View.cpp b/src/osgWrappers/osgViewer/View.cpp index 98575a34a..f137c7e00 100644 --- a/src/osgWrappers/osgViewer/View.cpp +++ b/src/osgWrappers/osgViewer/View.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -73,6 +74,11 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::View) __C5_char_P1__className, "return the name of the object's class type. ", "Must be defined by derived classes. "); + I_Method1(void, take, IN, osg::View &, rhs, + Properties::VIRTUAL, + __void__take__osg_View_R1, + "Take all the settings, Camera and Slaves from the passed in view, leaving it empty. ", + ""); I_Method1(void, setStartTick, IN, osg::Timer_t, tick, Properties::VIRTUAL, __void__setStartTick__osg_Timer_t, diff --git a/src/osgWrappers/osgViewer/Viewer.cpp b/src/osgWrappers/osgViewer/Viewer.cpp index 1560b2006..ec3dd42d8 100644 --- a/src/osgWrappers/osgViewer/Viewer.cpp +++ b/src/osgWrappers/osgViewer/Viewer.cpp @@ -13,12 +13,15 @@ #include #include #include +#include #include +#include #include #include #include #include #include +#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -65,6 +68,45 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::Viewer) ____Viewer__osg_ArgumentParser_R1, "", ""); + I_ConstructorWithDefaults2(IN, const osgViewer::Viewer &, viewer, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, + ____Viewer__C5_osgViewer_Viewer_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_Method1(void, take, IN, osgViewer::View &, rhs, + Properties::VIRTUAL, + __void__take__View_R1, + "Take all the settings, Camera and Slaves from the passed in view(er), leaving it empty. ", + ""); + I_Method1(bool, readConfiguration, IN, const std::string &, filename, + Properties::NON_VIRTUAL, + __bool__readConfiguration__C5_std_string_R1, + "read the viewer configuration from a configuration file. ", + ""); I_Method0(bool, isRealized, Properties::NON_VIRTUAL, __bool__isRealized,