From 613c59ad3b9fc70dfe2afc1dc4032dccea889106 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 21 Aug 2009 09:42:54 +0000 Subject: [PATCH] Updated wrappers --- src/osgWrappers/osg/CoordinateSystemNode.cpp | 5 +++ src/osgWrappers/osg/CullSettings.cpp | 2 + src/osgWrappers/osgDB/XmlParser.cpp | 8 ++++ src/osgWrappers/osgUtil/RenderStage.cpp | 46 +++++++++++++++----- 4 files changed, 51 insertions(+), 10 deletions(-) diff --git a/src/osgWrappers/osg/CoordinateSystemNode.cpp b/src/osgWrappers/osg/CoordinateSystemNode.cpp index 0fbe89812..4968724f3 100644 --- a/src/osgWrappers/osg/CoordinateSystemNode.cpp +++ b/src/osgWrappers/osg/CoordinateSystemNode.cpp @@ -206,6 +206,11 @@ BEGIN_OBJECT_REFLECTOR(osg::EllipsoidModel) __void__computeLocalToWorldTransformFromXYZ__double__double__double__osg_Matrixd_R1, "", ""); + I_Method3(void, computeCoordinateFrame, IN, double, latitude, IN, double, longitude, IN, osg::Matrixd &, localToWorld, + Properties::NON_VIRTUAL, + __void__computeCoordinateFrame__double__double__osg_Matrixd_R1, + "", + ""); I_Method3(osg::Vec3d, computeLocalUpVector, IN, double, X, IN, double, Y, IN, double, Z, Properties::NON_VIRTUAL, __osg_Vec3d__computeLocalUpVector__double__double__double, diff --git a/src/osgWrappers/osg/CullSettings.cpp b/src/osgWrappers/osg/CullSettings.cpp index b9f70eb77..f3add4e4d 100644 --- a/src/osgWrappers/osg/CullSettings.cpp +++ b/src/osgWrappers/osg/CullSettings.cpp @@ -42,6 +42,8 @@ BEGIN_ENUM_REFLECTOR(osg::CullSettings::VariablesMask) I_EnumLabel(osg::CullSettings::CLEAR_COLOR); I_EnumLabel(osg::CullSettings::LIGHTING_MODE); I_EnumLabel(osg::CullSettings::LIGHT); + I_EnumLabel(osg::CullSettings::DRAW_BUFFER); + I_EnumLabel(osg::CullSettings::READ_BUFFER); I_EnumLabel(osg::CullSettings::NO_VARIABLES); I_EnumLabel(osg::CullSettings::ALL_VARIABLES); END_REFLECTOR diff --git a/src/osgWrappers/osgDB/XmlParser.cpp b/src/osgWrappers/osgDB/XmlParser.cpp index da314f2fb..9a22fdcd8 100644 --- a/src/osgWrappers/osgDB/XmlParser.cpp +++ b/src/osgWrappers/osgDB/XmlParser.cpp @@ -41,6 +41,11 @@ BEGIN_OBJECT_REFLECTOR(osgDB::XmlNode) I_Constructor0(____XmlNode, "", ""); + I_Method0(std::string, getTrimmedContents, + Properties::NON_VIRTUAL, + __std_string__getTrimmedContents, + "", + ""); I_Method1(bool, read, IN, osgDB::XmlNode::Input &, input, Properties::NON_VIRTUAL, __bool__read__Input_R1, @@ -56,6 +61,9 @@ BEGIN_OBJECT_REFLECTOR(osgDB::XmlNode) __bool__writeString__std_ostream_R1__C5_std_string_R1, "", ""); + I_SimpleProperty(std::string, TrimmedContents, + __std_string__getTrimmedContents, + 0); I_PublicMemberProperty(osgDB::XmlNode::NodeType, type); I_PublicMemberProperty(std::string, name); I_PublicMemberProperty(std::string, contents); diff --git a/src/osgWrappers/osgUtil/RenderStage.cpp b/src/osgWrappers/osgUtil/RenderStage.cpp index f41c2dbb6..eacddfa6a 100644 --- a/src/osgWrappers/osgUtil/RenderStage.cpp +++ b/src/osgWrappers/osgUtil/RenderStage.cpp @@ -77,26 +77,46 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::RenderStage) __void__reset, "", ""); - I_Method1(void, setDrawBuffer, IN, GLenum, buffer, - Properties::NON_VIRTUAL, - __void__setDrawBuffer__GLenum, - "Set the draw buffer used at the start of each frame draw. ", - ""); + I_MethodWithDefaults2(void, setDrawBuffer, IN, GLenum, buffer, , IN, bool, applyMask, true, + Properties::NON_VIRTUAL, + __void__setDrawBuffer__GLenum__bool, + "Set the draw buffer used at the start of each frame draw. ", + ""); I_Method0(GLenum, getDrawBuffer, Properties::NON_VIRTUAL, __GLenum__getDrawBuffer, "Get the draw buffer used at the start of each frame draw. ", ""); - I_Method1(void, setReadBuffer, IN, GLenum, buffer, + I_Method0(bool, getDrawBufferApplyMask, Properties::NON_VIRTUAL, - __void__setReadBuffer__GLenum, - "Set the read buffer for any required copy operations to use. ", + __bool__getDrawBufferApplyMask, + "Get the apply mask defining whether glDrawBuffer is called at each frame draw. ", ""); + I_Method1(void, setDrawBufferApplyMask, IN, bool, applyMask, + Properties::NON_VIRTUAL, + __void__setDrawBufferApplyMask__bool, + "Set the apply mask defining whether glDrawBuffer is called at each frame draw. ", + ""); + I_MethodWithDefaults2(void, setReadBuffer, IN, GLenum, buffer, , IN, bool, applyMask, true, + Properties::NON_VIRTUAL, + __void__setReadBuffer__GLenum__bool, + "Set the read buffer for any required copy operations to use. ", + ""); I_Method0(GLenum, getReadBuffer, Properties::NON_VIRTUAL, __GLenum__getReadBuffer, "Get the read buffer for any required copy operations to use. ", ""); + I_Method0(bool, getReadBufferApplyMask, + Properties::NON_VIRTUAL, + __bool__getReadBufferApplyMask, + "Get the apply mask defining whether glReadBuffer is called at each frame draw. ", + ""); + I_Method1(void, setReadBufferApplyMask, IN, bool, applyMask, + Properties::NON_VIRTUAL, + __void__setReadBufferApplyMask__bool, + "Set the apply mask defining whether glReadBuffer is called at each frame draw. ", + ""); I_Method1(void, setViewport, IN, osg::Viewport *, viewport, Properties::NON_VIRTUAL, __void__setViewport__osg_Viewport_P1, @@ -446,7 +466,10 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::RenderStage) __void__setDisableFboAfterRender__bool); I_SimpleProperty(GLenum, DrawBuffer, __GLenum__getDrawBuffer, - __void__setDrawBuffer__GLenum); + 0); + I_SimpleProperty(bool, DrawBufferApplyMask, + __bool__getDrawBufferApplyMask, + __void__setDrawBufferApplyMask__bool); I_SimpleProperty(osg::FrameBufferObject *, FrameBufferObject, __osg_FrameBufferObject_P1__getFrameBufferObject, __void__setFrameBufferObject__osg_FrameBufferObject_P1); @@ -476,7 +499,10 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::RenderStage) __void__setPositionalStateContainer__PositionalStateContainer_P1); I_SimpleProperty(GLenum, ReadBuffer, __GLenum__getReadBuffer, - __void__setReadBuffer__GLenum); + 0); + I_SimpleProperty(bool, ReadBufferApplyMask, + __bool__getReadBufferApplyMask, + __void__setReadBufferApplyMask__bool); I_SimpleProperty(osg::Texture *, Texture, __osg_Texture_P1__getTexture, 0);