Updated wrappers

VisualStudio/osgWrappers/osgViewer/wrapper_osgViewer.dsp

@@ -111,6 +111,10 @@ SOURCE=..\..\..\src\osgWrappers\osgViewer\Scene.cpp
 SOURCE=..\..\..\src\osgWrappers\osgViewer\SimpleViewer.cpp
 # End Source File
 
+# Begin Source File
+SOURCE=..\..\..\src\osgWrappers\osgViewer\StatsHandler.cpp
+# End Source File
+
 # Begin Source File
 SOURCE=..\..\..\src\osgWrappers\osgViewer\View.cpp
 # End Source File

applications/osgviewer/osgviewer.cpp

@@ -157,12 +157,7 @@ int main(int argc, char** argv)
     }
 
     // add the state manipulator
-    {
+    viewer.addEventHandler( new osgGA::StateSetManipulator(viewer.getCamera()->getOrCreateStateSet()) );
-        osg::ref_ptr<osgGA::StateSetManipulator> statesetManipulator = new osgGA::StateSetManipulator;
-        statesetManipulator->setStateSet(viewer.getCamera()->getOrCreateStateSet());
-
-        viewer.addEventHandler( statesetManipulator.get() );
-    }
     
     // add the thread model handler
     viewer.addEventHandler(new ThreadingHandler);

src/osgWrappers/osg/Stats.cpp

@@ -66,10 +66,14 @@ BEGIN_OBJECT_REFLECTOR(osg::Stats)
 	          __C5_AttributeMap_R1__getAttributeMap__int,
 	          "",
 	          "");
-	I_Method1(void, report, IN, std::ostream &, out,
+	I_MethodWithDefaults2(void, report, IN, std::ostream &, out, , IN, const char *, indent, 0,
-	          __void__report__std_ostream_R1,
+	                      __void__report__std_ostream_R1__C5_char_P1,
-	          "",
+	                      "",
-	          "");
+	                      "");
+	I_MethodWithDefaults3(void, report, IN, std::ostream &, out, , IN, unsigned int, frameNumber, , IN, const char *, indent, 0,
+	                      __void__report__std_ostream_R1__unsigned_int__C5_char_P1,
+	                      "",
+	                      "");
 	I_SimpleProperty(int, EarliestFrameNumber, 
 	                 __int__getEarliestFrameNumber, 
 	                 0);

src/osgWrappers/osgGA/StateSetManipulator.cpp

@@ -27,9 +27,10 @@
 
 BEGIN_OBJECT_REFLECTOR(osgGA::StateSetManipulator)
 	I_BaseType(osgGA::GUIEventHandler);
-	I_Constructor0(____StateSetManipulator,
+	I_ConstructorWithDefaults1(IN, osg::StateSet *, stateset, 0,
-	               "",
+	                           ____StateSetManipulator__osg_StateSet_P1,
-	               "");
+	                           "",
+	                           "");
 	I_Method0(const char *, className,
 	          __C5_char_P1__className,
 	          "return the name of the object's class type. ",

src/osgWrappers/osgViewer/GNUmakefile

@@ -6,6 +6,7 @@ CXXFILES =\
 	GraphicsWindow.cpp\
 	Scene.cpp\
 	SimpleViewer.cpp\
+	StatsHandler.cpp\
 	View.cpp\
 	Viewer.cpp\
 

src/osgWrappers/osgViewer/StatsHandler.cpp

@@ -0,0 +1,72 @@
+// ***************************************************************************
+//
+//   Generated automatically by genwrapper.
+//   Please DO NOT EDIT this file!
+//
+// ***************************************************************************
+
+#include <osgIntrospection/ReflectionMacros>
+#include <osgIntrospection/TypedMethodInfo>
+#include <osgIntrospection/StaticMethodInfo>
+#include <osgIntrospection/Attributes>
+
+#include <osgGA/GUIActionAdapter>
+#include <osgGA/GUIEventAdapter>
+#include <osgViewer/StatsHandler>
+
+// Must undefine IN and OUT macros defined in Windows headers
+#ifdef IN
+#undef IN
+#endif
+#ifdef OUT
+#undef OUT
+#endif
+
+BEGIN_ENUM_REFLECTOR(osgViewer::StatsHandler::StatsType)
+	I_EnumLabel(osgViewer::StatsHandler::NO_STATS);
+	I_EnumLabel(osgViewer::StatsHandler::FRAME_RATE);
+	I_EnumLabel(osgViewer::StatsHandler::VIEWER_STATS);
+	I_EnumLabel(osgViewer::StatsHandler::SCENE_STATS);
+	I_EnumLabel(osgViewer::StatsHandler::LAST);
+END_REFLECTOR
+
+BEGIN_OBJECT_REFLECTOR(osgViewer::StatsHandler)
+	I_BaseType(osgGA::GUIEventHandler);
+	I_Constructor0(____StatsHandler,
+	               "",
+	               "");
+	I_Method1(void, setKeyEventTogglesOnScreenStats, IN, int, key,
+	          __void__setKeyEventTogglesOnScreenStats__int,
+	          "",
+	          "");
+	I_Method0(int, getKeyEventTogglesOnScreenStats,
+	          __int__getKeyEventTogglesOnScreenStats,
+	          "",
+	          "");
+	I_Method1(void, setKeyEventPrintsOutStats, IN, int, key,
+	          __void__setKeyEventPrintsOutStats__int,
+	          "",
+	          "");
+	I_Method0(int, getKeyEventPrintsOutStats,
+	          __int__getKeyEventPrintsOutStats,
+	          "",
+	          "");
+	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_Method0(double, getBlockMultiplier,
+	          __double__getBlockMultiplier,
+	          "",
+	          "");
+	I_SimpleProperty(double, BlockMultiplier, 
+	                 __double__getBlockMultiplier, 
+	                 0);
+	I_SimpleProperty(int, KeyEventPrintsOutStats, 
+	                 __int__getKeyEventPrintsOutStats, 
+	                 __void__setKeyEventPrintsOutStats__int);
+	I_SimpleProperty(int, KeyEventTogglesOnScreenStats, 
+	                 __int__getKeyEventTogglesOnScreenStats, 
+	                 __void__setKeyEventTogglesOnScreenStats__int);
+END_REFLECTOR
+