From 1e9b4f78556a75ca13c02cc6b5786f0f5f1b655f Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 26 Sep 2007 10:46:30 +0000 Subject: [PATCH] Added suprression of the reflection of osgViewer::Scene to avoid build issues associated with the class. --- genwrapper.conf | 1 + src/osgWrappers/osgViewer/Scene.cpp | 72 ----------------------------- src/osgWrappers/osgViewer/View.cpp | 7 ++- 3 files changed, 4 insertions(+), 76 deletions(-) delete mode 100644 src/osgWrappers/osgViewer/Scene.cpp diff --git a/genwrapper.conf b/genwrapper.conf index 4b3b5b7fe..033051cca 100644 --- a/genwrapper.conf +++ b/genwrapper.conf @@ -41,6 +41,7 @@ end ignore file "osgViewer/api/X11/GraphicsWindowX11" ignore file "osgViewer/api/Win32/GraphicsWindowWin32" ignore file "osgViewer/api/Cocoa/GraphicsWindowCocoa" +ignore file "osgViewer/Scene" suppress reflector "CPluginFunction" suppress reflector "PluginFunctionProxy" diff --git a/src/osgWrappers/osgViewer/Scene.cpp b/src/osgWrappers/osgViewer/Scene.cpp deleted file mode 100644 index bbffe81a3..000000000 --- a/src/osgWrappers/osgViewer/Scene.cpp +++ /dev/null @@ -1,72 +0,0 @@ -// *************************************************************************** -// -// Generated automatically by genwrapper. -// Please DO NOT EDIT this file! -// -// *************************************************************************** - -#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 - -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/View.cpp b/src/osgWrappers/osgViewer/View.cpp index f137c7e00..c668c0bd3 100644 --- a/src/osgWrappers/osgViewer/View.cpp +++ b/src/osgWrappers/osgViewer/View.cpp @@ -25,7 +25,6 @@ #include #include #include -#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -104,12 +103,12 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::View) __C5_osg_FrameStamp_P1__getFrameStamp, "", ""); - I_Method0(osgViewer::Scene *, getScene, + I_Method0(Scene *, getScene, Properties::NON_VIRTUAL, __Scene_P1__getScene, "", ""); - I_Method0(const osgViewer::Scene *, getScene, + I_Method0(const Scene *, getScene, Properties::NON_VIRTUAL, __C5_Scene_P1__getScene, "", @@ -342,7 +341,7 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::View) I_SimpleProperty(float, FusionDistanceValue, __float__getFusionDistanceValue, 0); - I_SimpleProperty(osgViewer::Scene *, Scene, + I_SimpleProperty(Scene *, Scene, __Scene_P1__getScene, 0); I_SimpleProperty(osg::Node *, SceneData,