diff --git a/src/osgWrappers/osgUtil/StateGraph.cpp b/src/osgWrappers/osgUtil/StateGraph.cpp index f0a6fb422..67e671618 100644 --- a/src/osgWrappers/osgUtil/StateGraph.cpp +++ b/src/osgWrappers/osgUtil/StateGraph.cpp @@ -121,8 +121,8 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::StateGraph) __void__moveToRootStateGraph__osg_State_R1__StateGraph_P1_S, "", ""); - I_StaticMethod2(int, numToPop, IN, osg::State &, state, IN, osgUtil::StateGraph *, sg_curr, - __int__numToPop__osg_State_R1__StateGraph_P1_S, + I_StaticMethod1(int, numToPop, IN, osgUtil::StateGraph *, sg_curr, + __int__numToPop__StateGraph_P1_S, "", ""); I_SimpleProperty(float, AverageDistance, diff --git a/src/osgWrappers/osgViewer/GraphicsWindow.cpp b/src/osgWrappers/osgViewer/GraphicsWindow.cpp index d9606000f..ed6832464 100644 --- a/src/osgWrappers/osgViewer/GraphicsWindow.cpp +++ b/src/osgWrappers/osgViewer/GraphicsWindow.cpp @@ -48,7 +48,7 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::GraphicsWindow) __void__checkEvents, "", ""); - I_Method4(void, setWindowRectangle, IN, int, x, IN, int, y, IN, int, width, IN, int, height, + I_Method4(void, setWindowRectangle, IN, int, x, IN, int, x, IN, int, x, IN, int, x, Properties::VIRTUAL, __void__setWindowRectangle__int__int__int__int, "Set the window's position and size. ", diff --git a/src/osgWrappers/osgViewer/HelpHandler.cpp b/src/osgWrappers/osgViewer/HelpHandler.cpp index a927f1268..4b9c97df6 100644 --- a/src/osgWrappers/osgViewer/HelpHandler.cpp +++ b/src/osgWrappers/osgViewer/HelpHandler.cpp @@ -11,6 +11,7 @@ #include #include +#include #include #include #include @@ -55,6 +56,21 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::HelpHandler) __int__getKeyEventTogglesOnScreenHelp, "", ""); + I_Method0(void, reset, + Properties::NON_VIRTUAL, + __void__reset, + "", + ""); + I_Method0(osg::Camera *, getCamera, + Properties::NON_VIRTUAL, + __osg_Camera_P1__getCamera, + "", + ""); + I_Method0(const osg::Camera *, getCamera, + Properties::NON_VIRTUAL, + __C5_osg_Camera_P1__getCamera, + "", + ""); I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, Properties::VIRTUAL, __bool__handle__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, @@ -80,6 +96,9 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::HelpHandler) I_SimpleProperty(osg::ApplicationUsage *, ApplicationUsage, __osg_ApplicationUsage_P1__getApplicationUsage, __void__setApplicationUsage__osg_ApplicationUsage_P1); + I_SimpleProperty(osg::Camera *, Camera, + __osg_Camera_P1__getCamera, + 0); I_SimpleProperty(int, KeyEventTogglesOnScreenHelp, __int__getKeyEventTogglesOnScreenHelp, __void__setKeyEventTogglesOnScreenHelp__int); diff --git a/src/osgWrappers/osgViewer/StatsHandler.cpp b/src/osgWrappers/osgViewer/StatsHandler.cpp index 011f50a8d..6ea0069d7 100644 --- a/src/osgWrappers/osgViewer/StatsHandler.cpp +++ b/src/osgWrappers/osgViewer/StatsHandler.cpp @@ -11,6 +11,7 @@ #include #include +#include #include #include #include @@ -56,16 +57,31 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::StatsHandler) __int__getKeyEventPrintsOutStats, "", ""); - I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, - Properties::VIRTUAL, - __bool__handle__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, - "deprecated, Handle events, return true if handled, false otherwise. ", - ""); I_Method0(double, getBlockMultiplier, Properties::NON_VIRTUAL, __double__getBlockMultiplier, "", ""); + I_Method0(void, reset, + Properties::NON_VIRTUAL, + __void__reset, + "", + ""); + I_Method0(osg::Camera *, getCamera, + Properties::NON_VIRTUAL, + __osg_Camera_P1__getCamera, + "", + ""); + I_Method0(const osg::Camera *, getCamera, + Properties::NON_VIRTUAL, + __C5_osg_Camera_P1__getCamera, + "", + ""); + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, + Properties::VIRTUAL, + __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, Properties::VIRTUAL, __void__getUsage__osg_ApplicationUsage_R1, @@ -116,6 +132,9 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::StatsHandler) I_SimpleProperty(double, BlockMultiplier, __double__getBlockMultiplier, 0); + I_SimpleProperty(osg::Camera *, Camera, + __osg_Camera_P1__getCamera, + 0); I_SimpleProperty(int, KeyEventPrintsOutStats, __int__getKeyEventPrintsOutStats, __void__setKeyEventPrintsOutStats__int);