From 116e7f49a44bdf09e9a29fa4a79235b36984a9a9 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 30 Jan 2007 11:47:44 +0000 Subject: [PATCH] Updated wrappers --- src/osgWrappers/osg/Stats.cpp | 22 +++++++++++++++++++++- src/osgWrappers/osgViewer/Viewer.cpp | 8 ++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/src/osgWrappers/osg/Stats.cpp b/src/osgWrappers/osg/Stats.cpp index 532606605..55639f2e8 100644 --- a/src/osgWrappers/osg/Stats.cpp +++ b/src/osgWrappers/osg/Stats.cpp @@ -24,9 +24,11 @@ TYPE_NAME_ALIAS(std::map< std::string COMMA double >, osg::Stats::AttributeMap) TYPE_NAME_ALIAS(std::vector< osg::Stats::AttributeMap >, osg::Stats::AttributeMapList); +TYPE_NAME_ALIAS(std::map< std::string COMMA bool >, osg::Stats::CollectMap); + BEGIN_OBJECT_REFLECTOR(osg::Stats) I_BaseType(osg::Referenced); - I_ConstructorWithDefaults2(IN, const std::string &, name, , IN, unsigned int, numberOfFrames, 100, + I_ConstructorWithDefaults2(IN, const std::string &, name, , IN, unsigned int, numberOfFrames, 50, ____Stats__C5_std_string_R1__unsigned_int, "", ""); @@ -58,6 +60,14 @@ BEGIN_OBJECT_REFLECTOR(osg::Stats) __bool__getAttribute__int__C5_std_string_R1__double_R1, "", ""); + I_Method2(bool, getAveragedAttribute, IN, const std::string &, attributeName, IN, double &, value, + __bool__getAveragedAttribute__C5_std_string_R1__double_R1, + "", + ""); + I_Method4(bool, getAveragedAttribute, IN, int, startFrameNumber, IN, int, endFrameNumber, IN, const std::string &, attributeName, IN, double &, value, + __bool__getAveragedAttribute__int__int__C5_std_string_R1__double_R1, + "", + ""); I_Method1(osg::Stats::AttributeMap &, getAttributeMap, IN, int, frameNumber, __AttributeMap_R1__getAttributeMap__int, "", @@ -66,6 +76,14 @@ BEGIN_OBJECT_REFLECTOR(osg::Stats) __C5_AttributeMap_R1__getAttributeMap__int, "", ""); + I_Method2(void, collectStats, IN, const std::string &, str, IN, bool, flag, + __void__collectStats__C5_std_string_R1__bool, + "", + ""); + I_Method1(bool, collectStats, IN, const std::string &, str, + __bool__collectStats__C5_std_string_R1, + "", + ""); I_MethodWithDefaults2(void, report, IN, std::ostream &, out, , IN, const char *, indent, 0, __void__report__std_ostream_R1__C5_char_P1, "", @@ -85,6 +103,8 @@ BEGIN_OBJECT_REFLECTOR(osg::Stats) __void__setName__C5_std_string_R1); END_REFLECTOR +STD_MAP_REFLECTOR(std::map< std::string COMMA bool >); + STD_MAP_REFLECTOR(std::map< std::string COMMA double >); STD_VECTOR_REFLECTOR(std::vector< osg::Stats::AttributeMap >); diff --git a/src/osgWrappers/osgViewer/Viewer.cpp b/src/osgWrappers/osgViewer/Viewer.cpp index b66d2b3e3..3e8396b2b 100644 --- a/src/osgWrappers/osgViewer/Viewer.cpp +++ b/src/osgWrappers/osgViewer/Viewer.cpp @@ -29,6 +29,8 @@ TYPE_NAME_ALIAS(std::vector< osg::GraphicsContext * >, osgViewer::Viewer::Contex TYPE_NAME_ALIAS(std::vector< osgViewer::GraphicsWindow * >, osgViewer::Viewer::Windows); +TYPE_NAME_ALIAS(std::vector< osg::Camera * >, osgViewer::Viewer::Cameras); + BEGIN_ENUM_REFLECTOR(osgViewer::Viewer::ThreadingModel) I_EnumLabel(osgViewer::Viewer::SingleThreaded); I_EnumLabel(osgViewer::Viewer::ThreadPerContext); @@ -173,6 +175,10 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::Viewer) __void__getWindows__Windows_R1__bool, "", ""); + I_MethodWithDefaults2(void, getCameras, IN, osgViewer::Viewer::Cameras &, cameras, , IN, bool, onlyActive, true, + __void__getCameras__Cameras_R1__bool, + "", + ""); I_Method1(void, setRealizeOperation, IN, osg::GraphicsOperation *, op, __void__setRealizeOperation__osg_GraphicsOperation_P1, "Set the graphics operation to call on realization of the viewers graphics windows. ", @@ -231,3 +237,5 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::Viewer) __void__setUseMainThreadForRenderingTraversals__bool); END_REFLECTOR +STD_VECTOR_REFLECTOR(std::vector< osg::Camera * >); +