diff --git a/src/osgWrappers/osg/Camera.cpp b/src/osgWrappers/osg/Camera.cpp index f8b4ef10e..93dec2066 100644 --- a/src/osgWrappers/osg/Camera.cpp +++ b/src/osgWrappers/osg/Camera.cpp @@ -86,6 +86,14 @@ BEGIN_ENUM_REFLECTOR(osg::Camera::BufferComponent) I_EnumLabel(osg::Camera::COLOR_BUFFER5); I_EnumLabel(osg::Camera::COLOR_BUFFER6); I_EnumLabel(osg::Camera::COLOR_BUFFER7); + I_EnumLabel(osg::Camera::COLOR_BUFFER8); + I_EnumLabel(osg::Camera::COLOR_BUFFER9); + I_EnumLabel(osg::Camera::COLOR_BUFFER10); + I_EnumLabel(osg::Camera::COLOR_BUFFER11); + I_EnumLabel(osg::Camera::COLOR_BUFFER12); + I_EnumLabel(osg::Camera::COLOR_BUFFER13); + I_EnumLabel(osg::Camera::COLOR_BUFFER14); + I_EnumLabel(osg::Camera::COLOR_BUFFER15); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::Camera) diff --git a/src/osgWrappers/osg/CullSettings.cpp b/src/osgWrappers/osg/CullSettings.cpp index fd3808317..6cffe7bac 100644 --- a/src/osgWrappers/osg/CullSettings.cpp +++ b/src/osgWrappers/osg/CullSettings.cpp @@ -280,6 +280,11 @@ BEGIN_VALUE_REFLECTOR(osg::CullSettings) __C5_ClampProjectionMatrixCallback_P1__getClampProjectionMatrixCallback, "get the const ClampProjectionMatrixCallback. ", ""); + I_Method1(void, write, IN, std::ostream &, out, + Properties::NON_VIRTUAL, + __void__write__std_ostream_R1, + "Write out internal settings of CullSettings. ", + ""); I_SimpleProperty(osg::CullSettings::ClampProjectionMatrixCallback *, ClampProjectionMatrixCallback, __ClampProjectionMatrixCallback_P1__getClampProjectionMatrixCallback, __void__setClampProjectionMatrixCallback__ClampProjectionMatrixCallback_P1); diff --git a/src/osgWrappers/osg/FrameBufferObject.cpp b/src/osgWrappers/osg/FrameBufferObject.cpp index 0cc6bbe94..9f72ee8ed 100644 --- a/src/osgWrappers/osg/FrameBufferObject.cpp +++ b/src/osgWrappers/osg/FrameBufferObject.cpp @@ -157,10 +157,12 @@ BEGIN_VALUE_REFLECTOR(osg::FrameBufferAttachment) ""); END_REFLECTOR -TYPE_NAME_ALIAS(std::map< GLenum COMMA osg::FrameBufferAttachment >, osg::FrameBufferObject::AttachmentMap) +TYPE_NAME_ALIAS(std::map< osg::Camera::BufferComponent COMMA osg::FrameBufferAttachment >, osg::FrameBufferObject::AttachmentMap) TYPE_NAME_ALIAS(std::vector< GLenum >, osg::FrameBufferObject::MultipleRenderingTargets) +TYPE_NAME_ALIAS(osg::Camera::BufferComponent, osg::FrameBufferObject::BufferComponent) + BEGIN_OBJECT_REFLECTOR(osg::FrameBufferObject) I_DeclaringFile("osg/FrameBufferObject"); I_BaseType(osg::StateAttribute); @@ -206,11 +208,6 @@ BEGIN_OBJECT_REFLECTOR(osg::FrameBufferObject) __C5_AttachmentMap_R1__getAttachmentMap, "", ""); - I_Method1(bool, hasAttachment, IN, GLenum, attachment_point, - Properties::NON_VIRTUAL, - __bool__hasAttachment__GLenum, - "", - ""); I_Method2(void, setAttachment, IN, GLenum, attachment_point, IN, const osg::FrameBufferAttachment &, attachment, Properties::NON_VIRTUAL, __void__setAttachment__GLenum__C5_FrameBufferAttachment_R1, @@ -221,6 +218,36 @@ BEGIN_OBJECT_REFLECTOR(osg::FrameBufferObject) __C5_FrameBufferAttachment_R1__getAttachment__GLenum, "", ""); + I_Method1(bool, hasAttachment, IN, GLenum, attachment_point, + Properties::NON_VIRTUAL, + __bool__hasAttachment__GLenum, + "", + ""); + I_Method2(void, setAttachment, IN, osg::FrameBufferObject::BufferComponent, attachment_point, IN, const osg::FrameBufferAttachment &, attachment, + Properties::NON_VIRTUAL, + __void__setAttachment__BufferComponent__C5_FrameBufferAttachment_R1, + "", + ""); + I_Method1(const osg::FrameBufferAttachment &, getAttachment, IN, osg::FrameBufferObject::BufferComponent, attachment_point, + Properties::NON_VIRTUAL, + __C5_FrameBufferAttachment_R1__getAttachment__BufferComponent, + "", + ""); + I_Method1(bool, hasAttachment, IN, osg::FrameBufferObject::BufferComponent, attachment_point, + Properties::NON_VIRTUAL, + __bool__hasAttachment__BufferComponent, + "", + ""); + I_Method1(GLenum, convertBufferComponentToGLenum, IN, osg::FrameBufferObject::BufferComponent, attachment_point, + Properties::NON_VIRTUAL, + __GLenum__convertBufferComponentToGLenum__BufferComponent, + "", + ""); + I_Method1(osg::FrameBufferObject::BufferComponent, convertGLenumToBufferComponent, IN, GLenum, attachment_point, + Properties::NON_VIRTUAL, + __BufferComponent__convertGLenumToBufferComponent__GLenum, + "", + ""); I_Method0(bool, hasMultipleRenderingTargets, Properties::NON_VIRTUAL, __bool__hasMultipleRenderingTargets, @@ -253,6 +280,12 @@ BEGIN_OBJECT_REFLECTOR(osg::FrameBufferObject) __void__discardDeletedFrameBufferObjects__unsigned_int_S, "discard all the cached FBOs which need to be deleted in the OpenGL context related to contextID. ", ""); + I_ProtectedMethod0(void, updateDrawBuffers, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__updateDrawBuffers, + "", + ""); I_ProtectedMethod0(void, dirtyAll, Properties::NON_VIRTUAL, Properties::NON_CONST, @@ -260,8 +293,8 @@ BEGIN_OBJECT_REFLECTOR(osg::FrameBufferObject) "", ""); I_IndexedProperty(const osg::FrameBufferAttachment &, Attachment, - __C5_FrameBufferAttachment_R1__getAttachment__GLenum, - __void__setAttachment__GLenum__C5_FrameBufferAttachment_R1, + __C5_FrameBufferAttachment_R1__getAttachment__BufferComponent, + __void__setAttachment__BufferComponent__C5_FrameBufferAttachment_R1, 0); I_SimpleProperty(const osg::FrameBufferObject::AttachmentMap &, AttachmentMap, __C5_AttachmentMap_R1__getAttachmentMap, @@ -387,7 +420,7 @@ BEGIN_OBJECT_REFLECTOR(osg::RenderBuffer) __void__setWidth__int); END_REFLECTOR -STD_MAP_REFLECTOR(std::map< GLenum COMMA osg::FrameBufferAttachment >) +STD_MAP_REFLECTOR(std::map< osg::Camera::BufferComponent COMMA osg::FrameBufferAttachment >) STD_VECTOR_REFLECTOR(std::vector< GLenum >)