From 984ac9374956a6401b6c5d2ac6a04ab4ca17c2f0 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 2 Nov 2006 12:32:41 +0000 Subject: [PATCH] Updated wrappers --- .../osgWrappers/osgGA/wrapper_osgGA.dsp | 4 - .../osgWrappers/osgSim/wrapper_osgSim.dsp | 8 ++ .../osgViewer/wrapper_osgViewer.dsp | 121 ++++++++++++++++++ src/osgWrappers/osgGA/GNUmakefile | 1 - src/osgWrappers/osgGA/GraphicsWindow.cpp | 44 ------- src/osgWrappers/osgProducer/Viewer.cpp | 36 ++++++ src/osgWrappers/osgSim/GNUmakefile | 2 + src/osgWrappers/osgViewer/Export.cpp | 22 ++++ src/osgWrappers/osgViewer/GNUmakefile | 17 +++ src/osgWrappers/osgViewer/GraphicsWindow.cpp | 87 +++++++++++++ .../{osgGA => osgViewer}/SimpleViewer.cpp | 61 ++------- 11 files changed, 306 insertions(+), 97 deletions(-) create mode 100644 VisualStudio/osgWrappers/osgViewer/wrapper_osgViewer.dsp delete mode 100644 src/osgWrappers/osgGA/GraphicsWindow.cpp create mode 100644 src/osgWrappers/osgViewer/Export.cpp create mode 100644 src/osgWrappers/osgViewer/GNUmakefile create mode 100644 src/osgWrappers/osgViewer/GraphicsWindow.cpp rename src/osgWrappers/{osgGA => osgViewer}/SimpleViewer.cpp (74%) diff --git a/VisualStudio/osgWrappers/osgGA/wrapper_osgGA.dsp b/VisualStudio/osgWrappers/osgGA/wrapper_osgGA.dsp index 705ca74e2..a81d232e2 100644 --- a/VisualStudio/osgWrappers/osgGA/wrapper_osgGA.dsp +++ b/VisualStudio/osgWrappers/osgGA/wrapper_osgGA.dsp @@ -139,10 +139,6 @@ SOURCE=..\..\..\src\osgWrappers\osgGA\MatrixManipulator.cpp SOURCE=..\..\..\src\osgWrappers\osgGA\NodeTrackerManipulator.cpp # End Source File -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osgGA\SimpleViewer.cpp -# End Source File - # Begin Source File SOURCE=..\..\..\src\osgWrappers\osgGA\StateSetManipulator.cpp # End Source File diff --git a/VisualStudio/osgWrappers/osgSim/wrapper_osgSim.dsp b/VisualStudio/osgWrappers/osgSim/wrapper_osgSim.dsp index 8dda24803..126d37e08 100644 --- a/VisualStudio/osgWrappers/osgSim/wrapper_osgSim.dsp +++ b/VisualStudio/osgWrappers/osgSim/wrapper_osgSim.dsp @@ -111,6 +111,10 @@ SOURCE=..\..\..\src\osgWrappers\osgSim\DOFTransform.cpp SOURCE=..\..\..\src\osgWrappers\osgSim\GeographicLocation.cpp # End Source File +# Begin Source File +SOURCE=..\..\..\src\osgWrappers\osgSim\HeightAboveTerrain.cpp +# End Source File + # Begin Source File SOURCE=..\..\..\src\osgWrappers\osgSim\Impostor.cpp # End Source File @@ -135,6 +139,10 @@ SOURCE=..\..\..\src\osgWrappers\osgSim\LightPointNode.cpp SOURCE=..\..\..\src\osgWrappers\osgSim\LightPointSystem.cpp # End Source File +# Begin Source File +SOURCE=..\..\..\src\osgWrappers\osgSim\LineOfSight.cpp +# End Source File + # Begin Source File SOURCE=..\..\..\src\osgWrappers\osgSim\MultiSwitch.cpp # End Source File diff --git a/VisualStudio/osgWrappers/osgViewer/wrapper_osgViewer.dsp b/VisualStudio/osgWrappers/osgViewer/wrapper_osgViewer.dsp new file mode 100644 index 000000000..6fbd8e853 --- /dev/null +++ b/VisualStudio/osgWrappers/osgViewer/wrapper_osgViewer.dsp @@ -0,0 +1,121 @@ +# Microsoft Developer Studio Project File - Name="osgWrapper osgViewer" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=osgWrapper osgViewer - Win32 Release +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "wrapper_osgViewer.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "wrapper_osgViewer.mak" CFG="osgWrapper osgViewer - Win32 Release" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "osgWrapper osgViewer - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "osgWrapper osgViewer - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "osgWrapper osgViewer - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "../../../bin/$(PlatformName)" +# PROP Intermediate_Dir "$(PlatformName)/$(ConfigurationName)" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +F90=df.exe +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x809 /d "NDEBUG" +# ADD RSC /l 0x809 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept +# ADD LINK32 opengl32.lib OpenThreadsWin32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /opt:ref /opt:icf /out:"$(OutDir)/osgwrapper_osgViewer.dll" /implib:"../../../lib/$(PlatformName)/osgwrapper_osgViewer.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# SUBTRACT LINK32 /nodefaultlib + +!ELSEIF "$(CFG)" == "osgWrapper osgViewer - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "../../../bin/$(PlatformName)" +# PROP Intermediate_Dir "$(PlatformName)/$(ConfigurationName)" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +F90=df.exe +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /vmg /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /GZ /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x809 /d "_DEBUG" +# ADD RSC /l 0x809 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept +# ADD LINK32 opengl32.lib OpenThreadsWin32d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"$(OutDir)/osgwrapper_osgViewerd.dll" /pdbtype:sept /implib:"../../../lib/$(PlatformName)/osgwrapper_osgViewerd.lib" /libpath:"../../../lib/$(PlatformName)" /libpath:"../../../../OpenThreads/lib/$(PlatformName)" /libpath:"../../../../Producer/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib/$(PlatformName)" /libpath:"../../../../3rdParty/lib" +# SUBTRACT LINK32 /pdb:none /nodefaultlib + +!ENDIF + +# Begin Target + +# Name "osgWrapper osgViewer - Win32 Release" +# Name "osgWrapper osgViewer - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + +# Begin Source File +SOURCE=..\..\..\src\osgWrappers\osgViewer\Export.cpp +# End Source File + +# Begin Source File +SOURCE=..\..\..\src\osgWrappers\osgViewer\GraphicsWindow.cpp +# End Source File + +# Begin Source File +SOURCE=..\..\..\src\osgWrappers\osgViewer\SimpleViewer.cpp +# End Source File + +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project + diff --git a/src/osgWrappers/osgGA/GNUmakefile b/src/osgWrappers/osgGA/GNUmakefile index 3c69ce4fd..973bd6c2e 100644 --- a/src/osgWrappers/osgGA/GNUmakefile +++ b/src/osgWrappers/osgGA/GNUmakefile @@ -13,7 +13,6 @@ CXXFILES =\ KeySwitchMatrixManipulator.cpp\ MatrixManipulator.cpp\ NodeTrackerManipulator.cpp\ - SimpleViewer.cpp\ StateSetManipulator.cpp\ TerrainManipulator.cpp\ TrackballManipulator.cpp\ diff --git a/src/osgWrappers/osgGA/GraphicsWindow.cpp b/src/osgWrappers/osgGA/GraphicsWindow.cpp deleted file mode 100644 index 27286b4a9..000000000 --- a/src/osgWrappers/osgGA/GraphicsWindow.cpp +++ /dev/null @@ -1,44 +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(osgGA::GraphicsWindow) - I_BaseType(osg::GraphicsContext); - I_BaseType(osgGA::GUIActionAdapter); - I_Constructor0(); - I_Method1(void, setEventQueue, IN, osgGA::EventQueue *, eventQueue); - I_Method0(osgGA::EventQueue *, getEventQueue); - I_Method0(const osgGA::EventQueue *, getEventQueue); - I_Method0(bool, realizeImplementation); - I_Method0(bool, isRealizedImplementation); - I_Method0(void, closeImplementation); - I_Method0(void, makeCurrentImplementation); - I_Method1(void, makeContextCurrentImplementation, IN, osg::GraphicsContext *, x); - I_Method1(void, bindPBufferToTextureImplementation, IN, GLenum, x); - I_Method0(void, swapBuffersImplementation); - I_Method0(void, requestRedraw); - I_MethodWithDefaults1(void, requestContinuousUpdate, IN, bool, x, true); - I_Method2(void, requestWarpPointer, IN, float, x, IN, float, x); - I_Property(osgGA::EventQueue *, EventQueue); -END_REFLECTOR - diff --git a/src/osgWrappers/osgProducer/Viewer.cpp b/src/osgWrappers/osgProducer/Viewer.cpp index 83d28ad2e..9e2b1e0f8 100644 --- a/src/osgWrappers/osgProducer/Viewer.cpp +++ b/src/osgWrappers/osgProducer/Viewer.cpp @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -410,5 +411,40 @@ BEGIN_OBJECT_REFLECTOR(osgProducer::Viewer) __void__setWriteImageWhenDone__bool); END_REFLECTOR +BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgGA::GUIEventHandler >) + I_Constructor0(____ref_ptr, + "", + ""); + I_Constructor1(IN, osgGA::GUIEventHandler *, ptr, + ____ref_ptr__T_P1, + "", + ""); + I_Constructor1(IN, const osg::ref_ptr< osgGA::GUIEventHandler > &, rp, + ____ref_ptr__C5_ref_ptr_R1, + "", + ""); + I_Method0(osgGA::GUIEventHandler *, get, + __T_P1__get, + "", + ""); + I_Method0(bool, valid, + __bool__valid, + "", + ""); + I_Method0(osgGA::GUIEventHandler *, release, + __T_P1__release, + "", + ""); + I_Method1(void, swap, IN, osg::ref_ptr< osgGA::GUIEventHandler > &, rp, + __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 > >); + STD_LIST_REFLECTOR(std::list< std::string >); diff --git a/src/osgWrappers/osgSim/GNUmakefile b/src/osgWrappers/osgSim/GNUmakefile index 5dc215a42..b47a5d094 100644 --- a/src/osgWrappers/osgSim/GNUmakefile +++ b/src/osgWrappers/osgSim/GNUmakefile @@ -6,12 +6,14 @@ CXXFILES =\ ColorRange.cpp\ DOFTransform.cpp\ GeographicLocation.cpp\ + HeightAboveTerrain.cpp\ Impostor.cpp\ ImpostorSprite.cpp\ InsertImpostorsVisitor.cpp\ LightPoint.cpp\ LightPointNode.cpp\ LightPointSystem.cpp\ + LineOfSight.cpp\ MultiSwitch.cpp\ OpenFlightOptimizer.cpp\ OverlayNode.cpp\ diff --git a/src/osgWrappers/osgViewer/Export.cpp b/src/osgWrappers/osgViewer/Export.cpp new file mode 100644 index 000000000..c0556fa55 --- /dev/null +++ b/src/osgWrappers/osgViewer/Export.cpp @@ -0,0 +1,22 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#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/GNUmakefile b/src/osgWrappers/osgViewer/GNUmakefile new file mode 100644 index 000000000..abb49341b --- /dev/null +++ b/src/osgWrappers/osgViewer/GNUmakefile @@ -0,0 +1,17 @@ +TOPDIR = ../../.. +include $(TOPDIR)/Make/makedefs + +CXXFILES =\ + Export.cpp\ + GraphicsWindow.cpp\ + SimpleViewer.cpp\ + +LIBS += -losgViewer -losg -losgIntrospection $(GL_LIBS) $(OTHER_LIBS) + +OPTF = -O + +TARGET_BASENAME = osgViewer +include $(TOPDIR)/Make/cygwin_wrapper_def +WRAPPER = $(WRAPPER_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT) + +include $(TOPDIR)/Make/makerules diff --git a/src/osgWrappers/osgViewer/GraphicsWindow.cpp b/src/osgWrappers/osgViewer/GraphicsWindow.cpp new file mode 100644 index 000000000..662642350 --- /dev/null +++ b/src/osgWrappers/osgViewer/GraphicsWindow.cpp @@ -0,0 +1,87 @@ +// *************************************************************************** +// +// 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::GraphicsWindow) + I_BaseType(osg::GraphicsContext); + I_BaseType(osgGA::GUIActionAdapter); + I_Constructor0(____GraphicsWindow, + "", + ""); + I_Method1(void, setEventQueue, IN, osgGA::EventQueue *, eventQueue, + __void__setEventQueue__osgGA_EventQueue_P1, + "", + ""); + I_Method0(osgGA::EventQueue *, getEventQueue, + __osgGA_EventQueue_P1__getEventQueue, + "", + ""); + I_Method0(const osgGA::EventQueue *, getEventQueue, + __C5_osgGA_EventQueue_P1__getEventQueue, + "", + ""); + I_Method0(bool, realizeImplementation, + __bool__realizeImplementation, + "Realise the GraphicsContext implementation, Pure virtual - must be implemented by concrate implementations of GraphicsContext. ", + ""); + I_Method0(bool, isRealizedImplementation, + __bool__isRealizedImplementation, + "Return true if the graphics context has been realised, and is ready to use, implementation. ", + "Pure virtual - must be implemented by concrate implementations of GraphicsContext. "); + I_Method0(void, closeImplementation, + __void__closeImplementation, + "Close the graphics context implementation. ", + "Pure virtual - must be implemented by concrate implementations of GraphicsContext. "); + I_Method0(void, makeCurrentImplementation, + __void__makeCurrentImplementation, + "Make this graphics context current implementation. ", + "Pure virtual - must be implemented by concrate implementations of GraphicsContext. "); + I_Method1(void, makeContextCurrentImplementation, IN, osg::GraphicsContext *, x, + __void__makeContextCurrentImplementation__GraphicsContext_P1, + "Make this graphics context current with specified read context implementation. ", + "Pure virtual - must be implemented by concrate implementations of GraphicsContext. "); + I_Method1(void, bindPBufferToTextureImplementation, IN, GLenum, x, + __void__bindPBufferToTextureImplementation__GLenum, + "Pure virtual, Bind the graphics context to associated texture implementation. ", + "Pure virtual - must be implemented by concrate implementations of GraphicsContext. "); + I_Method0(void, swapBuffersImplementation, + __void__swapBuffersImplementation, + "Swap the front and back buffers implementation. ", + "Pure virtual - must be implemented by Concrate implementations of GraphicsContext. "); + I_Method0(void, requestRedraw, + __void__requestRedraw, + "requestRedraw() requests a single redraw. ", + ""); + I_MethodWithDefaults1(void, requestContinuousUpdate, IN, bool, x, true, + __void__requestContinuousUpdate__bool, + "requestContinousUpdate(bool) is for en/disabling a throw or idle callback to be requested by a GUIEventHandler (typically a MatrixManipulator, though other GUIEventHandler's may also provide functionality). ", + "GUI toolkits can respond to this immediately by registering an idle/timed callback, or can delay setting the callback and update at their own leisure."); + I_Method2(void, requestWarpPointer, IN, float, x, IN, float, x, + __void__requestWarpPointer__float__float, + "requestWarpPointer(int,int) is requesting a repositioning of the mouse pointer to a specified x,y location on the window. ", + "This is used by some camera manipulators to initialise the mouse pointer when mouse position relative to a controls neutral mouse position is required, i.e when mimicking a aircrafts joystick."); + I_SimpleProperty(osgGA::EventQueue *, EventQueue, + __osgGA_EventQueue_P1__getEventQueue, + __void__setEventQueue__osgGA_EventQueue_P1); +END_REFLECTOR + diff --git a/src/osgWrappers/osgGA/SimpleViewer.cpp b/src/osgWrappers/osgViewer/SimpleViewer.cpp similarity index 74% rename from src/osgWrappers/osgGA/SimpleViewer.cpp rename to src/osgWrappers/osgViewer/SimpleViewer.cpp index 4cc24cee3..c96e29f56 100644 --- a/src/osgWrappers/osgGA/SimpleViewer.cpp +++ b/src/osgWrappers/osgViewer/SimpleViewer.cpp @@ -15,8 +15,8 @@ #include #include #include -#include #include +#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -26,10 +26,10 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osgGA::GUIEventHandler > >, osgGA::SimpleViewer::EventHandlers); +TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osgGA::GUIEventHandler > >, osgViewer::SimpleViewer::EventHandlers); -BEGIN_OBJECT_REFLECTOR(osgGA::SimpleViewer) - I_VirtualBaseType(osgGA::GraphicsWindow); +BEGIN_OBJECT_REFLECTOR(osgViewer::SimpleViewer) + I_VirtualBaseType(osgViewer::GraphicsWindow); I_Constructor0(____SimpleViewer, "", ""); @@ -54,26 +54,26 @@ BEGIN_OBJECT_REFLECTOR(osgGA::SimpleViewer) "", ""); I_Method1(void, setCameraManipulator, IN, osgGA::MatrixManipulator *, manipulator, - __void__setCameraManipulator__MatrixManipulator_P1, + __void__setCameraManipulator__osgGA_MatrixManipulator_P1, "", ""); I_Method0(osgGA::MatrixManipulator *, getCameraManipulator, - __MatrixManipulator_P1__getCameraManipulator, + __osgGA_MatrixManipulator_P1__getCameraManipulator, "", ""); I_Method0(const osgGA::MatrixManipulator *, getCameraManipulator, - __C5_MatrixManipulator_P1__getCameraManipulator, + __C5_osgGA_MatrixManipulator_P1__getCameraManipulator, "", ""); I_Method1(void, addEventHandler, IN, osgGA::GUIEventHandler *, eventHandler, - __void__addEventHandler__GUIEventHandler_P1, + __void__addEventHandler__osgGA_GUIEventHandler_P1, "", ""); - I_Method0(osgGA::SimpleViewer::EventHandlers &, getEventHandlers, + I_Method0(osgViewer::SimpleViewer::EventHandlers &, getEventHandlers, __EventHandlers_R1__getEventHandlers, "", ""); - I_Method0(const osgGA::SimpleViewer::EventHandlers &, getEventHandlers, + I_Method0(const osgViewer::SimpleViewer::EventHandlers &, getEventHandlers, __C5_EventHandlers_R1__getEventHandlers, "", ""); @@ -137,12 +137,12 @@ BEGIN_OBJECT_REFLECTOR(osgGA::SimpleViewer) __osg_CameraNode_P1__getCamera, 0); I_SimpleProperty(osgGA::MatrixManipulator *, CameraManipulator, - __MatrixManipulator_P1__getCameraManipulator, - __void__setCameraManipulator__MatrixManipulator_P1); + __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(osgGA::SimpleViewer::EventHandlers &, EventHandlers, + I_SimpleProperty(osgViewer::SimpleViewer::EventHandlers &, EventHandlers, __EventHandlers_R1__getEventHandlers, 0); I_SimpleProperty(osg::Node *, SceneData, @@ -153,38 +153,3 @@ BEGIN_OBJECT_REFLECTOR(osgGA::SimpleViewer) 0); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgGA::GUIEventHandler >) - I_Constructor0(____ref_ptr, - "", - ""); - I_Constructor1(IN, osgGA::GUIEventHandler *, ptr, - ____ref_ptr__T_P1, - "", - ""); - I_Constructor1(IN, const osg::ref_ptr< osgGA::GUIEventHandler > &, rp, - ____ref_ptr__C5_ref_ptr_R1, - "", - ""); - I_Method0(osgGA::GUIEventHandler *, get, - __T_P1__get, - "", - ""); - I_Method0(bool, valid, - __bool__valid, - "", - ""); - I_Method0(osgGA::GUIEventHandler *, release, - __T_P1__release, - "", - ""); - I_Method1(void, swap, IN, osg::ref_ptr< osgGA::GUIEventHandler > &, rp, - __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 > >); -