diff --git a/VisualStudio/osgWrappers/osgViewer/wrapper_osgViewer.dsp b/VisualStudio/osgWrappers/osgViewer/wrapper_osgViewer.dsp index f78e72f34..9b8df95a3 100644 --- a/VisualStudio/osgWrappers/osgViewer/wrapper_osgViewer.dsp +++ b/VisualStudio/osgWrappers/osgViewer/wrapper_osgViewer.dsp @@ -103,6 +103,10 @@ SOURCE=..\..\..\src\osgWrappers\osgViewer\CompositeViewer.cpp SOURCE=..\..\..\src\osgWrappers\osgViewer\GraphicsWindow.cpp # End Source File +# Begin Source File +SOURCE=..\..\..\src\osgWrappers\osgViewer\HelpHandler.cpp +# End Source File + # Begin Source File SOURCE=..\..\..\src\osgWrappers\osgViewer\Scene.cpp # End Source File diff --git a/src/osgWrappers/osg/ApplicationUsage.cpp b/src/osgWrappers/osg/ApplicationUsage.cpp index 279f9b469..c91bf696d 100644 --- a/src/osgWrappers/osg/ApplicationUsage.cpp +++ b/src/osgWrappers/osg/ApplicationUsage.cpp @@ -28,7 +28,8 @@ BEGIN_ENUM_REFLECTOR(osg::ApplicationUsage::Type) I_EnumLabel(osg::ApplicationUsage::KEYBOARD_MOUSE_BINDING); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osg::ApplicationUsage) +BEGIN_OBJECT_REFLECTOR(osg::ApplicationUsage) + I_BaseType(osg::Referenced); I_Constructor0(____ApplicationUsage, "", ""); diff --git a/src/osgWrappers/osgViewer/GNUmakefile b/src/osgWrappers/osgViewer/GNUmakefile index f805d4e49..898d1b5ec 100644 --- a/src/osgWrappers/osgViewer/GNUmakefile +++ b/src/osgWrappers/osgViewer/GNUmakefile @@ -4,6 +4,7 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ CompositeViewer.cpp\ GraphicsWindow.cpp\ + HelpHandler.cpp\ Scene.cpp\ SimpleViewer.cpp\ StatsHandler.cpp\ diff --git a/src/osgWrappers/osgViewer/HelpHandler.cpp b/src/osgWrappers/osgViewer/HelpHandler.cpp new file mode 100644 index 000000000..631a980e7 --- /dev/null +++ b/src/osgWrappers/osgViewer/HelpHandler.cpp @@ -0,0 +1,67 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#include +#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::HelpHandler) + I_BaseType(osgGA::GUIEventHandler); + I_ConstructorWithDefaults1(IN, osg::ApplicationUsage *, au, 0, + ____HelpHandler__osg_ApplicationUsage_P1, + "", + ""); + I_Method1(void, setApplicationUsage, IN, osg::ApplicationUsage *, au, + __void__setApplicationUsage__osg_ApplicationUsage_P1, + "", + ""); + I_Method0(osg::ApplicationUsage *, getApplicationUsage, + __osg_ApplicationUsage_P1__getApplicationUsage, + "", + ""); + I_Method0(const osg::ApplicationUsage *, getApplicationUsage, + __C5_osg_ApplicationUsage_P1__getApplicationUsage, + "", + ""); + I_Method1(void, setKeyEventTogglesOnScreenHelp, IN, int, key, + __void__setKeyEventTogglesOnScreenHelp__int, + "", + ""); + I_Method0(int, getKeyEventTogglesOnScreenHelp, + __int__getKeyEventTogglesOnScreenHelp, + "", + ""); + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, + __bool__handle__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, + "deprecated, Handle events, return true if handled, false otherwise. ", + ""); + I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage, + __void__getUsage__osg_ApplicationUsage_R1, + "Get the keyboard and mouse usage of this manipulator. ", + ""); + I_SimpleProperty(osg::ApplicationUsage *, ApplicationUsage, + __osg_ApplicationUsage_P1__getApplicationUsage, + __void__setApplicationUsage__osg_ApplicationUsage_P1); + I_SimpleProperty(int, KeyEventTogglesOnScreenHelp, + __int__getKeyEventTogglesOnScreenHelp, + __void__setKeyEventTogglesOnScreenHelp__int); +END_REFLECTOR + diff --git a/src/osgWrappers/osgViewer/StatsHandler.cpp b/src/osgWrappers/osgViewer/StatsHandler.cpp index 5bcbb5f87..9a775e98d 100644 --- a/src/osgWrappers/osgViewer/StatsHandler.cpp +++ b/src/osgWrappers/osgViewer/StatsHandler.cpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -59,6 +60,10 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::StatsHandler) __double__getBlockMultiplier, "", ""); + I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage, + __void__getUsage__osg_ApplicationUsage_R1, + "Get the keyboard and mouse usage of this manipulator. ", + ""); I_SimpleProperty(double, BlockMultiplier, __double__getBlockMultiplier, 0); diff --git a/src/osgWrappers/osgViewer/Viewer.cpp b/src/osgWrappers/osgViewer/Viewer.cpp index 461d229c3..4216158bf 100644 --- a/src/osgWrappers/osgViewer/Viewer.cpp +++ b/src/osgWrappers/osgViewer/Viewer.cpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -221,6 +222,10 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::Viewer) __void__setUpRenderingSupport, "Set up the Operations to render the various viewer cameras on the viewers graphics windows. ", ""); + I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage, + __void__getUsage__osg_ApplicationUsage_R1, + "Get the keyboard and mouse usage of this viewer. ", + ""); I_SimpleProperty(osg::Camera *, CameraWithFocus, __osg_Camera_P1__getCameraWithFocus, __void__setCameraWithFocus__osg_Camera_P1);