From 7ca2f597e6748f4e49b9c8b817e89e9f42b1c74c Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Sun, 30 Sep 2007 15:24:43 +0000 Subject: [PATCH] Updated wrappers --- genwrapper.conf | 6 ++- src/osgWrappers/osgViewer/Scene.cpp | 48 ++++++++++++++++++++++++ src/osgWrappers/osgViewer/ViewerBase.cpp | 2 + 3 files changed, 55 insertions(+), 1 deletion(-) diff --git a/genwrapper.conf b/genwrapper.conf index c8743d8a7..03798ad84 100644 --- a/genwrapper.conf +++ b/genwrapper.conf @@ -42,7 +42,6 @@ ignore file "osgViewer/api/X11/GraphicsWindowX11" ignore file "osgViewer/api/Win32/GraphicsWindowWin32" ignore file "osgViewer/api/Cocoa/GraphicsWindowCocoa" -suppress reflector "osgViewer::Scene" suppress reflector "CPluginFunction" suppress reflector "PluginFunctionProxy" @@ -53,6 +52,11 @@ configure file /osg\/GraphicsContext/ " end +configure file /osgViewer\/ViewerBase/ + emit before "#include + " +end + ############################################################################# # add header to Plane, Quat and Vec* files diff --git a/src/osgWrappers/osgViewer/Scene.cpp b/src/osgWrappers/osgViewer/Scene.cpp index 7cab83acd..bbffe81a3 100644 --- a/src/osgWrappers/osgViewer/Scene.cpp +++ b/src/osgWrappers/osgViewer/Scene.cpp @@ -22,3 +22,51 @@ #undef OUT #endif +BEGIN_OBJECT_REFLECTOR(osgViewer::Scene) + I_DeclaringFile("osgViewer/Scene"); + I_BaseType(osg::Referenced); + 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_StaticMethod1(osgViewer::Scene *, getScene, IN, osg::Node *, node, + __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); + I_SimpleProperty(osg::Node *, SceneData, + __osg_Node_P1__getSceneData, + __void__setSceneData__osg_Node_P1); +END_REFLECTOR + diff --git a/src/osgWrappers/osgViewer/ViewerBase.cpp b/src/osgWrappers/osgViewer/ViewerBase.cpp index d882fdff0..d70bb5335 100644 --- a/src/osgWrappers/osgViewer/ViewerBase.cpp +++ b/src/osgWrappers/osgViewer/ViewerBase.cpp @@ -25,6 +25,8 @@ #undef OUT #endif +#include + TYPE_NAME_ALIAS(std::vector< osg::Camera * >, osgViewer::ViewerBase::Cameras) TYPE_NAME_ALIAS(std::vector< osg::GraphicsContext * >, osgViewer::ViewerBase::Contexts)