diff --git a/src/osgWrappers/osg/GraphicsThread.cpp b/src/osgWrappers/osg/GraphicsThread.cpp index c165f68eb..ebb78653d 100644 --- a/src/osgWrappers/osg/GraphicsThread.cpp +++ b/src/osgWrappers/osg/GraphicsThread.cpp @@ -13,6 +13,7 @@ #include #include #include +#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -59,6 +60,22 @@ BEGIN_OBJECT_REFLECTOR(osg::BlockAndFlushOperation) ""); END_REFLECTOR +BEGIN_OBJECT_REFLECTOR(osg::EndOfDynamicDrawBlock) + I_DeclaringFile("osg/GraphicsThread"); + I_BaseType(OpenThreads::BlockCount); + I_BaseType(osg::State::DynamicObjectRenderingCompletedCallback); + I_Constructor1(IN, unsigned, int, + Properties::NON_EXPLICIT, + ____EndOfDynamicDrawBlock__unsigned, + "", + ""); + I_Method1(void, completed, IN, osg::State *, state, + Properties::VIRTUAL, + __void__completed__osg_State_P1, + "", + ""); +END_REFLECTOR + BEGIN_OBJECT_REFLECTOR(osg::FlushDeletedGLObjectsOperation) I_DeclaringFile("osg/GraphicsThread"); I_BaseType(osg::GraphicsOperation); diff --git a/src/osgWrappers/osgUtil/CullVisitor.cpp b/src/osgWrappers/osgUtil/CullVisitor.cpp index 031af8726..dea0a4d4e 100644 --- a/src/osgWrappers/osgUtil/CullVisitor.cpp +++ b/src/osgWrappers/osgUtil/CullVisitor.cpp @@ -65,7 +65,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::CullVisitor) I_Method0(osgUtil::CullVisitor *, clone, Properties::VIRTUAL, __CullVisitor_P1__clone, - "Create a shallow copy on the CullVisitor. ", + "Create a shallow copy of the CullVisitor, used by CullVisitor::create() to clone the prototype. ", ""); I_Method0(void, reset, Properties::VIRTUAL, diff --git a/src/osgWrappers/osgViewer/Scene.cpp b/src/osgWrappers/osgViewer/Scene.cpp index c6e9feee2..fceb690da 100644 --- a/src/osgWrappers/osgViewer/Scene.cpp +++ b/src/osgWrappers/osgViewer/Scene.cpp @@ -10,10 +10,8 @@ #include #include -#include #include #include -#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -26,7 +24,7 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::Scene) I_DeclaringFile("osgViewer/Scene"); - I_VirtualBaseType(osg::Referenced); + I_BaseType(osg::Referenced); I_Constructor0(____Scene, "", ""); @@ -45,21 +43,6 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::Scene) __C5_osg_Node_P1__getSceneData, "", ""); - I_Method1(void, setFrameStamp, IN, osg::FrameStamp *, frameStamp, - Properties::NON_VIRTUAL, - __void__setFrameStamp__osg_FrameStamp_P1, - "", - ""); - I_Method0(osg::FrameStamp *, getFrameStamp, - Properties::NON_VIRTUAL, - __osg_FrameStamp_P1__getFrameStamp, - "", - ""); - I_Method0(const osg::FrameStamp *, getFrameStamp, - Properties::NON_VIRTUAL, - __C5_osg_FrameStamp_P1__getFrameStamp, - "", - ""); I_Method1(void, setDatabasePager, IN, osgDB::DatabasePager *, dp, Properties::NON_VIRTUAL, __void__setDatabasePager__osgDB_DatabasePager_P1, @@ -75,47 +58,15 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::Scene) __C5_osgDB_DatabasePager_P1__getDatabasePager, "", ""); - I_Method1(void, setUpdateVisitor, IN, osgUtil::UpdateVisitor *, uv, - Properties::NON_VIRTUAL, - __void__setUpdateVisitor__osgUtil_UpdateVisitor_P1, - "", - ""); - I_Method0(osgUtil::UpdateVisitor *, getUpdateVisitor, - Properties::NON_VIRTUAL, - __osgUtil_UpdateVisitor_P1__getUpdateVisitor, - "", - ""); - I_Method0(const osgUtil::UpdateVisitor *, getUpdateVisitor, - Properties::NON_VIRTUAL, - __C5_osgUtil_UpdateVisitor_P1__getUpdateVisitor, - "", - ""); - I_Method0(void, advance, - Properties::VIRTUAL, - __void__advance, - "", - ""); - I_Method0(void, updateTraversal, - Properties::VIRTUAL, - __void__updateTraversal, - "", - ""); - I_Method0(void, init, - Properties::NON_VIRTUAL, - __void__init, - "", - ""); + I_StaticMethod1(osgViewer::Scene *, getScene, IN, osg::Node *, node, + __Scene_P1__getScene__osg_Node_P1_S, + "Get the Scene object that has the specified node assigned to it. ", + "return 0 if no Scene has yet been assigned the specified node. "); I_SimpleProperty(osgDB::DatabasePager *, DatabasePager, __osgDB_DatabasePager_P1__getDatabasePager, __void__setDatabasePager__osgDB_DatabasePager_P1); - I_SimpleProperty(osg::FrameStamp *, FrameStamp, - __osg_FrameStamp_P1__getFrameStamp, - __void__setFrameStamp__osg_FrameStamp_P1); I_SimpleProperty(osg::Node *, SceneData, __osg_Node_P1__getSceneData, __void__setSceneData__osg_Node_P1); - I_SimpleProperty(osgUtil::UpdateVisitor *, UpdateVisitor, - __osgUtil_UpdateVisitor_P1__getUpdateVisitor, - __void__setUpdateVisitor__osgUtil_UpdateVisitor_P1); END_REFLECTOR diff --git a/src/osgWrappers/osgViewer/View.cpp b/src/osgWrappers/osgViewer/View.cpp index 7e8d5d56a..5de7c1383 100644 --- a/src/osgWrappers/osgViewer/View.cpp +++ b/src/osgWrappers/osgViewer/View.cpp @@ -13,9 +13,11 @@ #include #include #include +#include #include #include -#include +#include +#include #include #include #include @@ -32,44 +34,6 @@ #undef OUT #endif -BEGIN_OBJECT_REFLECTOR(osgViewer::EndOfDynamicDrawBlock) - I_DeclaringFile("osgViewer/View"); - I_BaseType(osg::State::DynamicObjectRenderingCompletedCallback); - I_Constructor1(IN, unsigned, int, - Properties::NON_EXPLICIT, - ____EndOfDynamicDrawBlock__unsigned, - "", - ""); - I_Method1(void, completed, IN, osg::State *, state, - Properties::VIRTUAL, - __void__completed__osg_State_P1, - "", - ""); - I_Method0(void, block, - Properties::NON_VIRTUAL, - __void__block, - "", - ""); - I_Method0(void, reset, - Properties::NON_VIRTUAL, - __void__reset, - "", - ""); - I_Method0(void, release, - Properties::NON_VIRTUAL, - __void__release, - "", - ""); - I_Method1(void, setNumOfBlocks, IN, unsigned int, blockCount, - Properties::NON_VIRTUAL, - __void__setNumOfBlocks__unsigned_int, - "", - ""); - I_SimpleProperty(unsigned int, NumOfBlocks, - 0, - __void__setNumOfBlocks__unsigned_int); -END_REFLECTOR - TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osgGA::GUIEventHandler > >, osgViewer::View::EventHandlers) BEGIN_OBJECT_REFLECTOR(osgViewer::View) @@ -108,6 +72,31 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::View) __C5_char_P1__className, "return the name of the object's class type. ", "Must be defined by derived classes. "); + I_Method1(void, setStartTick, IN, osg::Timer_t, tick, + Properties::VIRTUAL, + __void__setStartTick__osg_Timer_t, + "", + ""); + I_Method0(osg::Timer_t, getStartTick, + Properties::NON_VIRTUAL, + __osg_Timer_t__getStartTick, + "", + ""); + I_Method1(void, setFrameStamp, IN, osg::FrameStamp *, fs, + Properties::NON_VIRTUAL, + __void__setFrameStamp__osg_FrameStamp_P1, + "", + ""); + I_Method0(osg::FrameStamp *, getFrameStamp, + Properties::NON_VIRTUAL, + __osg_FrameStamp_P1__getFrameStamp, + "", + ""); + I_Method0(const osg::FrameStamp *, getFrameStamp, + Properties::NON_VIRTUAL, + __C5_osg_FrameStamp_P1__getFrameStamp, + "", + ""); I_Method0(osgViewer::Scene *, getScene, Properties::NON_VIRTUAL, __Scene_P1__getScene, @@ -133,6 +122,21 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::View) __C5_osg_Node_P1__getSceneData, "Get the const View's scene graph. ", ""); + I_Method1(void, setDatabasePager, IN, osgDB::DatabasePager *, dp, + Properties::NON_VIRTUAL, + __void__setDatabasePager__osgDB_DatabasePager_P1, + "Set the View's database pager. ", + ""); + I_Method0(osgDB::DatabasePager *, getDatabasePager, + Properties::NON_VIRTUAL, + __osgDB_DatabasePager_P1__getDatabasePager, + "Get the View's database pager. ", + ""); + I_Method0(const osgDB::DatabasePager *, getDatabasePager, + Properties::NON_VIRTUAL, + __C5_osgDB_DatabasePager_P1__getDatabasePager, + "Get the const View's database pager. ", + ""); I_Method1(void, setEventQueue, IN, osgGA::EventQueue *, eventQueue, Properties::NON_VIRTUAL, __void__setEventQueue__osgGA_EventQueue_P1, @@ -300,6 +304,9 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::View) I_SimpleProperty(osg::NodePath, CoordinateSystemNodePath, __osg_NodePath__getCoordinateSystemNodePath, __void__setCoordinateSystemNodePath__C5_osg_NodePath_R1); + I_SimpleProperty(osgDB::DatabasePager *, DatabasePager, + __osgDB_DatabasePager_P1__getDatabasePager, + __void__setDatabasePager__osgDB_DatabasePager_P1); I_SimpleProperty(osg::DisplaySettings *, DisplaySettings, __osg_DisplaySettings_P1__getDisplaySettings, __void__setDisplaySettings__osg_DisplaySettings_P1); @@ -309,6 +316,9 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::View) I_SimpleProperty(osgGA::EventQueue *, EventQueue, __osgGA_EventQueue_P1__getEventQueue, __void__setEventQueue__osgGA_EventQueue_P1); + I_SimpleProperty(osg::FrameStamp *, FrameStamp, + __osg_FrameStamp_P1__getFrameStamp, + __void__setFrameStamp__osg_FrameStamp_P1); I_SimpleProperty(osgUtil::SceneView::FusionDistanceMode, FusionDistanceMode, __osgUtil_SceneView_FusionDistanceMode__getFusionDistanceMode, 0); @@ -321,6 +331,9 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::View) I_SimpleProperty(osg::Node *, SceneData, __osg_Node_P1__getSceneData, __void__setSceneData__osg_Node_P1); + I_SimpleProperty(osg::Timer_t, StartTick, + __osg_Timer_t__getStartTick, + __void__setStartTick__osg_Timer_t); I_SimpleProperty(unsigned int, UpViewOnSingleScreen, 0, __void__setUpViewOnSingleScreen__unsigned_int); diff --git a/src/osgWrappers/osgViewer/Viewer.cpp b/src/osgWrappers/osgViewer/Viewer.cpp index 3375c3e33..7984bcc3f 100644 --- a/src/osgWrappers/osgViewer/Viewer.cpp +++ b/src/osgWrappers/osgViewer/Viewer.cpp @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include @@ -85,30 +84,15 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::Viewer) "", ""); I_Method1(void, setStartTick, IN, osg::Timer_t, tick, - Properties::NON_VIRTUAL, + Properties::VIRTUAL, __void__setStartTick__osg_Timer_t, "", ""); - I_Method0(osg::Timer_t, getStartTick, - Properties::NON_VIRTUAL, - __osg_Timer_t__getStartTick, - "", - ""); I_MethodWithDefaults1(void, setReferenceTime, IN, double, time, 0.0, Properties::NON_VIRTUAL, __void__setReferenceTime__double, "", ""); - I_Method0(osg::FrameStamp *, getFrameStamp, - Properties::NON_VIRTUAL, - __osg_FrameStamp_P1__getFrameStamp, - "", - ""); - I_Method0(const osg::FrameStamp *, getFrameStamp, - Properties::NON_VIRTUAL, - __C5_osg_FrameStamp_P1__getFrameStamp, - "", - ""); I_Method1(void, setSceneData, IN, osg::Node *, node, Properties::VIRTUAL, __void__setSceneData__osg_Node_P1, @@ -312,9 +296,6 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::Viewer) I_SimpleProperty(osgViewer::Viewer::BarrierPosition, EndBarrierPosition, __BarrierPosition__getEndBarrierPosition, __void__setEndBarrierPosition__BarrierPosition); - I_SimpleProperty(osg::FrameStamp *, FrameStamp, - __osg_FrameStamp_P1__getFrameStamp, - 0); I_SimpleProperty(int, KeyEventSetsDone, __int__getKeyEventSetsDone, __void__setKeyEventSetsDone__int); @@ -331,7 +312,7 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::Viewer) 0, __void__setSceneData__osg_Node_P1); I_SimpleProperty(osg::Timer_t, StartTick, - __osg_Timer_t__getStartTick, + 0, __void__setStartTick__osg_Timer_t); I_SimpleProperty(osgViewer::Viewer::ThreadingModel, ThreadingModel, __ThreadingModel__getThreadingModel,