From 523337ea2008a317f60d317922282fa32910f845 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 1 Jun 2007 19:53:14 +0000 Subject: [PATCH] Updated wrappers --- src/osgWrappers/osg/Camera.cpp | 20 ++++++++++- src/osgWrappers/osg/ImageStream.cpp | 6 ++++ src/osgWrappers/osgViewer/GraphicsWindow.cpp | 35 ++++++++++++++++++- .../osgViewer/ViewerEventHandlers.cpp | 17 +++++++++ 4 files changed, 76 insertions(+), 2 deletions(-) diff --git a/src/osgWrappers/osg/Camera.cpp b/src/osgWrappers/osg/Camera.cpp index 9153a908d..50320c963 100644 --- a/src/osgWrappers/osg/Camera.cpp +++ b/src/osgWrappers/osg/Camera.cpp @@ -469,10 +469,25 @@ BEGIN_OBJECT_REFLECTOR(osg::Camera) __C5_osg_Object_P1__getRenderingCache__unsigned_int, "Get the const Rendering object that is used to implement rendering of the subgraph. ", ""); + I_Method1(void, setPreDrawCallback, IN, osg::Camera::DrawCallback *, cb, + Properties::NON_VIRTUAL, + __void__setPreDrawCallback__DrawCallback_P1, + "Set the pre draw callback for custom operations to be done before the drawing of the camera's subgraph has been completed. ", + ""); + I_Method0(osg::Camera::DrawCallback *, getPreDrawCallback, + Properties::NON_VIRTUAL, + __DrawCallback_P1__getPreDrawCallback, + "Get the pre draw callback. ", + ""); + I_Method0(const osg::Camera::DrawCallback *, getPreDrawCallback, + Properties::NON_VIRTUAL, + __C5_DrawCallback_P1__getPreDrawCallback, + "Get the const pre draw callback. ", + ""); I_Method1(void, setPostDrawCallback, IN, osg::Camera::DrawCallback *, cb, Properties::NON_VIRTUAL, __void__setPostDrawCallback__DrawCallback_P1, - "Set the post draw callback for custom operations to do done after the drawing of the camera's subgraph has been completed. ", + "Set the post draw callback for custom operations to be done after the drawing of the camera's subgraph has been completed. ", ""); I_Method0(osg::Camera::DrawCallback *, getPostDrawCallback, Properties::NON_VIRTUAL, @@ -542,6 +557,9 @@ BEGIN_OBJECT_REFLECTOR(osg::Camera) I_SimpleProperty(osg::Camera::DrawCallback *, PostDrawCallback, __DrawCallback_P1__getPostDrawCallback, __void__setPostDrawCallback__DrawCallback_P1); + I_SimpleProperty(osg::Camera::DrawCallback *, PreDrawCallback, + __DrawCallback_P1__getPreDrawCallback, + __void__setPreDrawCallback__DrawCallback_P1); I_SimpleProperty(const osg::Matrixd &, ProjectionMatrix, __C5_osg_Matrixd_R1__getProjectionMatrix, __void__setProjectionMatrix__C5_osg_Matrixd_R1); diff --git a/src/osgWrappers/osg/ImageStream.cpp b/src/osgWrappers/osg/ImageStream.cpp index 271cfadb9..bc70f2956 100644 --- a/src/osgWrappers/osg/ImageStream.cpp +++ b/src/osgWrappers/osg/ImageStream.cpp @@ -139,6 +139,12 @@ BEGIN_OBJECT_REFLECTOR(osg::ImageStream) __void__update, "", ""); + I_ProtectedMethod0(void, applyLoopingMode, + Properties::VIRTUAL, + Properties::NON_CONST, + __void__applyLoopingMode, + "", + ""); I_SimpleProperty(double, Length, __double__getLength, 0); diff --git a/src/osgWrappers/osgViewer/GraphicsWindow.cpp b/src/osgWrappers/osgViewer/GraphicsWindow.cpp index ed6832464..f89ad88ee 100644 --- a/src/osgWrappers/osgViewer/GraphicsWindow.cpp +++ b/src/osgWrappers/osgViewer/GraphicsWindow.cpp @@ -22,6 +22,31 @@ #undef OUT #endif +BEGIN_ENUM_REFLECTOR(osgViewer::GraphicsWindow::MouseCursor) + I_EnumLabel(osgViewer::GraphicsWindow::InheritCursor); + I_EnumLabel(osgViewer::GraphicsWindow::NoCursor); + I_EnumLabel(osgViewer::GraphicsWindow::RightArrowCursor); + I_EnumLabel(osgViewer::GraphicsWindow::LeftArrowCursor); + I_EnumLabel(osgViewer::GraphicsWindow::InfoCursor); + I_EnumLabel(osgViewer::GraphicsWindow::DestroyCursor); + I_EnumLabel(osgViewer::GraphicsWindow::HelpCursor); + I_EnumLabel(osgViewer::GraphicsWindow::CycleCursor); + I_EnumLabel(osgViewer::GraphicsWindow::SprayCursor); + I_EnumLabel(osgViewer::GraphicsWindow::WaitCursor); + I_EnumLabel(osgViewer::GraphicsWindow::TextCursor); + I_EnumLabel(osgViewer::GraphicsWindow::CrosshairCursor); + I_EnumLabel(osgViewer::GraphicsWindow::UpDownCursor); + I_EnumLabel(osgViewer::GraphicsWindow::LeftRightCursor); + I_EnumLabel(osgViewer::GraphicsWindow::TopSideCursor); + I_EnumLabel(osgViewer::GraphicsWindow::BottomSideCursor); + I_EnumLabel(osgViewer::GraphicsWindow::LeftSideCursor); + I_EnumLabel(osgViewer::GraphicsWindow::RightSideCursor); + I_EnumLabel(osgViewer::GraphicsWindow::TopLeftCorner); + I_EnumLabel(osgViewer::GraphicsWindow::TopRightCorner); + I_EnumLabel(osgViewer::GraphicsWindow::BottomRightCorner); + I_EnumLabel(osgViewer::GraphicsWindow::BottomLeftCorner); +END_REFLECTOR + BEGIN_OBJECT_REFLECTOR(osgViewer::GraphicsWindow) I_BaseType(osg::GraphicsContext); I_BaseType(osgGA::GUIActionAdapter); @@ -78,11 +103,16 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::GraphicsWindow) __void__grabFocusIfPointerInWindow, "Get focus on if the pointer is in this window. ", ""); - I_Method1(void, useCursor, IN, bool, x, + I_Method1(void, useCursor, IN, bool, cursorOn, Properties::VIRTUAL, __void__useCursor__bool, "Switch on/off the cursor. ", ""); + I_Method1(void, setCursor, IN, osgViewer::GraphicsWindow::MouseCursor, x, + Properties::VIRTUAL, + __void__setCursor__MouseCursor, + "Set mouse cursor to a specific shape. ", + ""); I_Method0(bool, valid, Properties::VIRTUAL, __bool__valid, @@ -143,6 +173,9 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::GraphicsWindow) __void__requestWarpPointer__float__float, "requestWarpPointer(int,int) is requesting a repositioning of the mouse pointer to a specified x,y location on the window. ", "This is used by some camera manipulators to initialise the mouse pointer when mouse position relative to a controls neutral mouse position is required, i.e when mimicking a aircrafts joystick."); + I_SimpleProperty(osgViewer::GraphicsWindow::MouseCursor, Cursor, + 0, + __void__setCursor__MouseCursor); I_SimpleProperty(osgGA::EventQueue *, EventQueue, __osgGA_EventQueue_P1__getEventQueue, __void__setEventQueue__osgGA_EventQueue_P1); diff --git a/src/osgWrappers/osgViewer/ViewerEventHandlers.cpp b/src/osgWrappers/osgViewer/ViewerEventHandlers.cpp index c40eaaec5..3710e3987 100644 --- a/src/osgWrappers/osgViewer/ViewerEventHandlers.cpp +++ b/src/osgWrappers/osgViewer/ViewerEventHandlers.cpp @@ -23,6 +23,23 @@ #undef OUT #endif +BEGIN_OBJECT_REFLECTOR(osgViewer::RecordCameraPathHandler) + I_BaseType(osgGA::GUIEventHandler); + I_Constructor0(____RecordCameraPathHandler, + "", + ""); + I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage, + Properties::VIRTUAL, + __void__getUsage__osg_ApplicationUsage_R1, + "Get the keyboard and mouse usage of this manipulator. ", + ""); + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, + Properties::VIRTUAL, + __bool__handle__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, + "deprecated, Handle events, return true if handled, false otherwise. ", + ""); +END_REFLECTOR + BEGIN_OBJECT_REFLECTOR(osgViewer::ThreadingHandler) I_BaseType(osgGA::GUIEventHandler); I_Constructor0(____ThreadingHandler,