diff --git a/src/osgWrappers/osgTerrain/GeometryTechnique.cpp b/src/osgWrappers/osgTerrain/GeometryTechnique.cpp index 6fe4db982..3be4d16d1 100644 --- a/src/osgWrappers/osgTerrain/GeometryTechnique.cpp +++ b/src/osgWrappers/osgTerrain/GeometryTechnique.cpp @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -165,6 +166,11 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::GeometryTechnique) __void__setFilterMatrixAs__FilterType, "", ""); + I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, x, 0, + Properties::VIRTUAL, + __void__releaseGLObjects__osg_State_P1, + "If State is non-zero, this function releases any associated OpenGL objects for the specified graphics context. ", + "Otherwise, releases OpenGL objects for all graphics contexts. "); I_SimpleProperty(float, FilterBias, __float__getFilterBias, __void__setFilterBias__float); diff --git a/src/osgWrappers/osgTerrain/TerrainTechnique.cpp b/src/osgWrappers/osgTerrain/TerrainTechnique.cpp index d1ac6d98b..7bcbdf7a4 100644 --- a/src/osgWrappers/osgTerrain/TerrainTechnique.cpp +++ b/src/osgWrappers/osgTerrain/TerrainTechnique.cpp @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -96,6 +97,11 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::TerrainTechnique) __void__traverse__osg_NodeVisitor_R1, "Traverse the terrain subgraph. ", ""); + I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, x, 0, + Properties::VIRTUAL, + __void__releaseGLObjects__osg_State_P1, + "If State is non-zero, this function releases any associated OpenGL objects for the specified graphics context. ", + "Otherwise, releases OpenGL objects for all graphics contexts. "); I_ProtectedMethod1(void, setDirty, IN, bool, dirty, Properties::NON_VIRTUAL, Properties::NON_CONST, diff --git a/src/osgWrappers/osgTerrain/TerrainTile.cpp b/src/osgWrappers/osgTerrain/TerrainTile.cpp index c5bc0395a..148c1367b 100644 --- a/src/osgWrappers/osgTerrain/TerrainTile.cpp +++ b/src/osgWrappers/osgTerrain/TerrainTile.cpp @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -204,6 +205,11 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::TerrainTile) __osg_BoundingSphere__computeBound, "Compute the bounding volume of the terrain by computing the union of the bounding volumes of all layers. ", ""); + I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, x, 0, + Properties::VIRTUAL, + __void__releaseGLObjects__osg_State_P1, + "If State is non-zero, this function releases any associated OpenGL objects for the specified graphics context. ", + "Otherwise, releases OpenGL objects for all graphics contexts. "); I_StaticMethod1(void, setTileLoadedCallback, IN, osgTerrain::TerrainTile::TileLoadedCallback *, lc, __void__setTileLoadedCallback__TileLoadedCallback_P1_S, "", diff --git a/src/osgWrappers/osgViewer/ViewerEventHandlers.cpp b/src/osgWrappers/osgViewer/ViewerEventHandlers.cpp index af20259f1..5061b1bd8 100644 --- a/src/osgWrappers/osgViewer/ViewerEventHandlers.cpp +++ b/src/osgWrappers/osgViewer/ViewerEventHandlers.cpp @@ -271,11 +271,10 @@ END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgViewer::ScreenCaptureHandler) I_DeclaringFile("osgViewer/ViewerEventHandlers"); I_BaseType(osgGA::GUIEventHandler); - I_ConstructorWithDefaults1(IN, osgViewer::ScreenCaptureHandler::CaptureOperation *, defaultOperation, 0, - Properties::NON_EXPLICIT, - ____ScreenCaptureHandler__CaptureOperation_P1, + I_ConstructorWithDefaults2(IN, osgViewer::ScreenCaptureHandler::CaptureOperation *, defaultOperation, 0, IN, int, numFrames, 1, + ____ScreenCaptureHandler__CaptureOperation_P1__int, "", - ""); + " param numFrames >0: capture that number of frames. <0: capture all frames, call stopCapture() to stop it. "); I_Method1(void, setKeyEventTakeScreenShot, IN, int, key, Properties::NON_VIRTUAL, __void__setKeyEventTakeScreenShot__int, @@ -286,6 +285,16 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::ScreenCaptureHandler) __int__getKeyEventTakeScreenShot, "", ""); + I_Method1(void, setKeyEventToggleContinuousCapture, IN, int, key, + Properties::NON_VIRTUAL, + __void__setKeyEventToggleContinuousCapture__int, + "", + ""); + I_Method0(int, getKeyEventToggleContinuousCapture, + Properties::NON_VIRTUAL, + __int__getKeyEventToggleContinuousCapture, + "", + ""); I_Method1(void, setCaptureOperation, IN, osgViewer::ScreenCaptureHandler::CaptureOperation *, operation, Properties::NON_VIRTUAL, __void__setCaptureOperation__CaptureOperation_P1, @@ -306,6 +315,26 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::ScreenCaptureHandler) __void__captureNextFrame__osgViewer_ViewerBase_R1, "Capture the given viewer's views on the next frame. ", ""); + I_Method1(void, setFramesToCapture, IN, int, numFrames, + Properties::NON_VIRTUAL, + __void__setFramesToCapture__int, + "Set the number of frames to capture. ", + " param numFrames >0: capture that number of frames. <0: capture all frames, call stopCapture() to stop it. "); + I_Method0(int, getFramesToCapture, + Properties::NON_VIRTUAL, + __int__getFramesToCapture, + "Get the number of frames to capture. ", + ""); + I_Method0(void, startCapture, + Properties::NON_VIRTUAL, + __void__startCapture, + "Start capturing any viewer(s) the handler is attached to at the end of the next frame. ", + ""); + I_Method0(void, stopCapture, + Properties::NON_VIRTUAL, + __void__stopCapture, + "Stop capturing. ", + ""); I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage, Properties::VIRTUAL, __void__getUsage__osg_ApplicationUsage_R1, @@ -317,12 +346,30 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::ScreenCaptureHandler) __void__addCallbackToViewer__osgViewer_ViewerBase_R1, "", ""); + I_ProtectedMethod1(void, removeCallbackFromViewer, IN, osgViewer::ViewerBase &, viewer, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__removeCallbackFromViewer__osgViewer_ViewerBase_R1, + "", + ""); + I_ProtectedMethod1(osg::Camera *, findAppropriateCameraForCallback, IN, osgViewer::ViewerBase &, viewer, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __osg_Camera_P1__findAppropriateCameraForCallback__osgViewer_ViewerBase_R1, + "", + ""); I_SimpleProperty(osgViewer::ScreenCaptureHandler::CaptureOperation *, CaptureOperation, __CaptureOperation_P1__getCaptureOperation, __void__setCaptureOperation__CaptureOperation_P1); + I_SimpleProperty(int, FramesToCapture, + __int__getFramesToCapture, + __void__setFramesToCapture__int); I_SimpleProperty(int, KeyEventTakeScreenShot, __int__getKeyEventTakeScreenShot, __void__setKeyEventTakeScreenShot__int); + I_SimpleProperty(int, KeyEventToggleContinuousCapture, + __int__getKeyEventToggleContinuousCapture, + __void__setKeyEventToggleContinuousCapture__int); END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgViewer::ScreenCaptureHandler::CaptureOperation) @@ -342,7 +389,7 @@ END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgViewer::ScreenCaptureHandler::WriteToFile) I_DeclaringFile("osgViewer/ViewerEventHandlers"); I_BaseType(osgViewer::ScreenCaptureHandler::CaptureOperation); - I_ConstructorWithDefaults3(IN, const std::string &, filename, , IN, const std::string &, extension, , IN, osgViewer::ScreenCaptureHandler::WriteToFile::SavePolicy, savePolicy, osgViewer::ScreenCaptureHandler::WriteToFile::OVERWRITE, + I_ConstructorWithDefaults3(IN, const std::string &, filename, , IN, const std::string &, extension, , IN, osgViewer::ScreenCaptureHandler::WriteToFile::SavePolicy, savePolicy, osgViewer::ScreenCaptureHandler::WriteToFile::SEQUENTIAL_NUMBER, ____WriteToFile__C5_std_string_R1__C5_std_string_R1__SavePolicy, "", "");