From 3c52c2578fe861c7da7924880878a22ae3c4a40f Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 3 Oct 2008 15:15:33 +0000 Subject: [PATCH] Updated wrappers --- src/osgWrappers/osgDB/Registry.cpp | 11 +++++++++-- src/osgWrappers/osgViewer/CompositeViewer.cpp | 19 ------------------- .../osgViewer/ViewerEventHandlers.cpp | 12 ++++++++++-- 3 files changed, 19 insertions(+), 23 deletions(-) diff --git a/src/osgWrappers/osgDB/Registry.cpp b/src/osgWrappers/osgDB/Registry.cpp index a11c46d3c..c3da6a8c6 100644 --- a/src/osgWrappers/osgDB/Registry.cpp +++ b/src/osgWrappers/osgDB/Registry.cpp @@ -71,6 +71,13 @@ END_REFLECTOR TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgDB::ReaderWriter > >, osgDB::Registry::ReaderWriterList) +BEGIN_ENUM_REFLECTOR(osgDB::Registry::LoadStatus) + I_DeclaringFile("osgDB/Registry"); + I_EnumLabel(osgDB::Registry::NOT_LOADED); + I_EnumLabel(osgDB::Registry::PREVIOUSLY_LOADED); + I_EnumLabel(osgDB::Registry::LOADED); +END_REFLECTOR + BEGIN_OBJECT_REFLECTOR(osgDB::Registry) I_DeclaringFile("osgDB/Registry"); I_BaseType(osg::Referenced); @@ -124,9 +131,9 @@ BEGIN_OBJECT_REFLECTOR(osgDB::Registry) __std_string__createLibraryNameForNodeKit__C5_std_string_R1, "create the platform specific library name associated with nodekit library name. ", ""); - I_Method1(bool, loadLibrary, IN, const std::string &, fileName, + I_Method1(osgDB::Registry::LoadStatus, loadLibrary, IN, const std::string &, fileName, Properties::NON_VIRTUAL, - __bool__loadLibrary__C5_std_string_R1, + __LoadStatus__loadLibrary__C5_std_string_R1, "find the library in the OSG_LIBRARY_PATH and load it. ", ""); I_Method1(bool, closeLibrary, IN, const std::string &, fileName, diff --git a/src/osgWrappers/osgViewer/CompositeViewer.cpp b/src/osgWrappers/osgViewer/CompositeViewer.cpp index bf0beb521..81bfd1d06 100644 --- a/src/osgWrappers/osgViewer/CompositeViewer.cpp +++ b/src/osgWrappers/osgViewer/CompositeViewer.cpp @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include @@ -141,21 +140,6 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::CompositeViewer) __osg_FrameStamp_P1__getViewerFrameStamp, "", ""); - I_Method1(void, setEventQueue, IN, osgGA::EventQueue *, eventQueue, - Properties::NON_VIRTUAL, - __void__setEventQueue__osgGA_EventQueue_P1, - "", - ""); - I_Method0(osgGA::EventQueue *, getEventQueue, - Properties::NON_VIRTUAL, - __osgGA_EventQueue_P1__getEventQueue, - "", - ""); - I_Method0(const osgGA::EventQueue *, getEventQueue, - Properties::NON_VIRTUAL, - __C5_osgGA_EventQueue_P1__getEventQueue, - "", - ""); I_Method0(int, run, Properties::VIRTUAL, __int__run, @@ -251,9 +235,6 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::CompositeViewer) I_SimpleProperty(osg::Camera *, CameraWithFocus, __osg_Camera_P1__getCameraWithFocus, __void__setCameraWithFocus__osg_Camera_P1); - I_SimpleProperty(osgGA::EventQueue *, EventQueue, - __osgGA_EventQueue_P1__getEventQueue, - __void__setEventQueue__osgGA_EventQueue_P1); I_SimpleProperty(osg::FrameStamp *, FrameStamp, __osg_FrameStamp_P1__getFrameStamp, 0); diff --git a/src/osgWrappers/osgViewer/ViewerEventHandlers.cpp b/src/osgWrappers/osgViewer/ViewerEventHandlers.cpp index 7ce478d8e..c9aa1b6ae 100644 --- a/src/osgWrappers/osgViewer/ViewerEventHandlers.cpp +++ b/src/osgWrappers/osgViewer/ViewerEventHandlers.cpp @@ -297,6 +297,8 @@ 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::CAMERA_SCENE_STATS); + I_EnumLabel(osgViewer::StatsHandler::VIEWER_SCENE_STATS); I_EnumLabel(osgViewer::StatsHandler::LAST); END_REFLECTOR @@ -362,6 +364,12 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::StatsHandler) __void__setUpHUDCamera__osgViewer_ViewerBase_P1, "", ""); + I_ProtectedMethod4(osg::Geometry *, createBackgroundRectangle, IN, const osg::Vec3 &, pos, IN, const float, width, IN, const float, height, IN, osg::Vec4 &, color, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __osg_Geometry_P1__createBackgroundRectangle__C5_osg_Vec3_R1__C5_float__C5_float__osg_Vec4_R1, + "", + ""); I_ProtectedMethod4(osg::Geometry *, createGeometry, IN, const osg::Vec3 &, pos, IN, float, height, IN, const osg::Vec4 &, colour, IN, unsigned int, numBlocks, Properties::NON_VIRTUAL, Properties::NON_CONST, @@ -380,10 +388,10 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::StatsHandler) __osg_Geometry_P1__createTick__C5_osg_Vec3_R1__float__C5_osg_Vec4_R1__unsigned_int, "", ""); - I_ProtectedMethod7(osg::Node *, createCameraStats, IN, const std::string &, font, IN, osg::Vec3 &, pos, IN, float, startBlocks, IN, bool, aquireGPUStats, IN, float, characterSize, IN, osg::Stats *, viewerStats, IN, osg::Camera *, camera, + I_ProtectedMethod7(osg::Node *, createCameraTimeStats, IN, const std::string &, font, IN, osg::Vec3 &, pos, IN, float, startBlocks, IN, bool, acquireGPUStats, IN, float, characterSize, IN, osg::Stats *, viewerStats, IN, osg::Camera *, camera, Properties::NON_VIRTUAL, Properties::NON_CONST, - __osg_Node_P1__createCameraStats__C5_std_string_R1__osg_Vec3_R1__float__bool__float__osg_Stats_P1__osg_Camera_P1, + __osg_Node_P1__createCameraTimeStats__C5_std_string_R1__osg_Vec3_R1__float__bool__float__osg_Stats_P1__osg_Camera_P1, "", ""); I_ProtectedMethod1(void, setUpScene, IN, osgViewer::ViewerBase *, viewer,