From dcd7fd837fc3084dfbd3417756b45019624f6c9f Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 26 Sep 2007 11:32:51 +0000 Subject: [PATCH] Tweaked the wrapping of osgViewer::Scene to fix build problems --- genwrapper.conf | 2 +- src/osgWrappers/osgViewer/Scene.cpp | 24 ++++++++++++++++++++++++ src/osgWrappers/osgViewer/View.cpp | 7 ++++--- 3 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 src/osgWrappers/osgViewer/Scene.cpp diff --git a/genwrapper.conf b/genwrapper.conf index 033051cca..c8743d8a7 100644 --- a/genwrapper.conf +++ b/genwrapper.conf @@ -41,8 +41,8 @@ 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 "osgViewer::Scene" suppress reflector "CPluginFunction" suppress reflector "PluginFunctionProxy" diff --git a/src/osgWrappers/osgViewer/Scene.cpp b/src/osgWrappers/osgViewer/Scene.cpp new file mode 100644 index 000000000..7cab83acd --- /dev/null +++ b/src/osgWrappers/osgViewer/Scene.cpp @@ -0,0 +1,24 @@ +// *************************************************************************** +// +// 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 + diff --git a/src/osgWrappers/osgViewer/View.cpp b/src/osgWrappers/osgViewer/View.cpp index c668c0bd3..f137c7e00 100644 --- a/src/osgWrappers/osgViewer/View.cpp +++ b/src/osgWrappers/osgViewer/View.cpp @@ -25,6 +25,7 @@ #include #include #include +#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -103,12 +104,12 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::View) __C5_osg_FrameStamp_P1__getFrameStamp, "", ""); - I_Method0(Scene *, getScene, + I_Method0(osgViewer::Scene *, getScene, Properties::NON_VIRTUAL, __Scene_P1__getScene, "", ""); - I_Method0(const Scene *, getScene, + I_Method0(const osgViewer::Scene *, getScene, Properties::NON_VIRTUAL, __C5_Scene_P1__getScene, "", @@ -341,7 +342,7 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::View) I_SimpleProperty(float, FusionDistanceValue, __float__getFusionDistanceValue, 0); - I_SimpleProperty(Scene *, Scene, + I_SimpleProperty(osgViewer::Scene *, Scene, __Scene_P1__getScene, 0); I_SimpleProperty(osg::Node *, SceneData,