FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated wrappers

Browse Source
This commit is contained in:
Robert Osfield
2008-06-18 16:46:38 +00:00
parent 1e5783ece7
commit 0a0034aebb
3 changed files with 113 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/osgWrappers/osg/Camera.cpp
View File

@@ -463,16 +463,16 @@ BEGIN_OBJECT_REFLECTOR(osg::Camera)
__void__attach__BufferComponent__GLenum,
"Attach a buffer with specified OpenGL internal format. ",
"");
I_MethodWithDefaults5(void, attach, IN, osg::Camera::BufferComponent, buffer, , IN, osg::Texture *, texture, , IN, unsigned int, level, 0, IN, unsigned int, face, 0, IN, bool, mipMapGeneration, false,
I_MethodWithDefaults7(void, attach, IN, osg::Camera::BufferComponent, buffer, , IN, osg::Texture *, texture, , IN, unsigned int, level, 0, IN, unsigned int, face, 0, IN, bool, mipMapGeneration, false, IN, unsigned int, multisampleSamples, 0, IN, unsigned int, multisampleColorSamples, 0,
Properties::NON_VIRTUAL,
__void__attach__BufferComponent__osg_Texture_P1__unsigned_int__unsigned_int__bool,
__void__attach__BufferComponent__osg_Texture_P1__unsigned_int__unsigned_int__bool__unsigned_int__unsigned_int,
"Attach a Texture to specified buffer component. ",
"The level parameter controls the mip map level of the texture that is attached. The face parameter controls the face of texture cube map or z level of 3d texture. The mipMapGeneration flag controls whether mipmap generation should be done for texture. ");
I_Method2(void, attach, IN, osg::Camera::BufferComponent, buffer, IN, osg::Image *, image,
Properties::NON_VIRTUAL,
__void__attach__BufferComponent__osg_Image_P1,
"Attach a Image to specified buffer component. ",
"");
I_MethodWithDefaults4(void, attach, IN, osg::Camera::BufferComponent, buffer, , IN, osg::Image *, image, , IN, unsigned int, multisampleSamples, 0, IN, unsigned int, multisampleColorSamples, 0,
Properties::NON_VIRTUAL,
__void__attach__BufferComponent__osg_Image_P1__unsigned_int__unsigned_int,
"Attach a Image to specified buffer component. ",
"");
I_Method1(void, detach, IN, osg::Camera::BufferComponent, buffer,
Properties::NON_VIRTUAL,
__void__detach__BufferComponent,
@@ -767,6 +767,8 @@ BEGIN_VALUE_REFLECTOR(osg::Camera::Attachment)
I_PublicMemberProperty(unsigned int, _level);
I_PublicMemberProperty(unsigned int, _face);
I_PublicMemberProperty(bool, _mipMapGeneration);
I_PublicMemberProperty(unsigned int, _multisampleSamples);
I_PublicMemberProperty(unsigned int, _multisampleColorSamples);
END_REFLECTOR
BEGIN_OBJECT_REFLECTOR(osg::Camera::DrawCallback)

78
src/osgWrappers/osg/FrameBufferObject.cpp
View File

@@ -39,6 +39,10 @@ TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglGenRenderbuffersEXT)
TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglRenderbufferStorageEXT)
TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglRenderbufferStorageMultisampleEXT)
TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglRenderbufferStorageMultisampleCoverageNV)
TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglBindFramebufferEXT)
TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglDeleteFramebuffersEXT)
@@ -59,7 +63,7 @@ TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglFramebufferRenderbufferEXT)
TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglGenerateMipmapEXT)
TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglRenderbufferStorageMultisampleCoverageNV)
TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglBlitFramebufferEXT)
BEGIN_OBJECT_REFLECTOR(osg::FBOExtensions)
I_DeclaringFile("osg/FrameBufferObject");
@@ -69,6 +73,16 @@ BEGIN_OBJECT_REFLECTOR(osg::FBOExtensions)
__bool__isSupported,
"",
"");
I_Method0(bool, isMultisampleSupported,
Properties::NON_VIRTUAL,
__bool__isMultisampleSupported,
"",
"");
I_Method0(bool, isMultisampleCoverageSupported,
Properties::NON_VIRTUAL,
__bool__isMultisampleCoverageSupported,
"",
"");
I_StaticMethod2(osg::FBOExtensions *, instance, IN, unsigned, contextID, IN, bool, createIfNotInitalized,
__FBOExtensions_P1__instance__unsigned__bool_S,
"",
@@ -82,6 +96,7 @@ BEGIN_OBJECT_REFLECTOR(osg::FBOExtensions)
I_PublicMemberProperty(osg::FBOExtensions::TglGenRenderbuffersEXT *, glGenRenderbuffersEXT);
I_PublicMemberProperty(osg::FBOExtensions::TglDeleteRenderbuffersEXT *, glDeleteRenderbuffersEXT);
I_PublicMemberProperty(osg::FBOExtensions::TglRenderbufferStorageEXT *, glRenderbufferStorageEXT);
I_PublicMemberProperty(osg::FBOExtensions::TglRenderbufferStorageMultisampleEXT *, glRenderbufferStorageMultisampleEXT);
I_PublicMemberProperty(osg::FBOExtensions::TglRenderbufferStorageMultisampleCoverageNV *, glRenderbufferStorageMultisampleCoverageNV);
I_PublicMemberProperty(osg::FBOExtensions::TglBindFramebufferEXT *, glBindFramebufferEXT);
I_PublicMemberProperty(osg::FBOExtensions::TglDeleteFramebuffersEXT *, glDeleteFramebuffersEXT);
@@ -93,6 +108,7 @@ BEGIN_OBJECT_REFLECTOR(osg::FBOExtensions)
I_PublicMemberProperty(osg::FBOExtensions::TglFramebufferTextureLayerEXT *, glFramebufferTextureLayerEXT);
I_PublicMemberProperty(osg::FBOExtensions::TglFramebufferRenderbufferEXT *, glFramebufferRenderbufferEXT);
I_PublicMemberProperty(osg::FBOExtensions::TglGenerateMipmapEXT *, glGenerateMipmapEXT);
I_PublicMemberProperty(osg::FBOExtensions::TglBlitFramebufferEXT *, glBlitFramebufferEXT);
END_REFLECTOR
BEGIN_VALUE_REFLECTOR(osg::FrameBufferAttachment)
@@ -140,14 +156,19 @@ BEGIN_VALUE_REFLECTOR(osg::FrameBufferAttachment)
____FrameBufferAttachment__Camera_Attachment_R1,
"",
"");
I_Method0(bool, isMultisample,
Properties::NON_VIRTUAL,
__bool__isMultisample,
"",
"");
I_Method2(void, createRequiredTexturesAndApplyGenerateMipMap, IN, osg::State &, state, IN, const osg::FBOExtensions *, ext,
Properties::NON_VIRTUAL,
__void__createRequiredTexturesAndApplyGenerateMipMap__State_R1__C5_FBOExtensions_P1,
"",
"");
I_Method3(void, attach, IN, osg::State &, state, IN, GLenum, attachment_point, IN, const osg::FBOExtensions *, ext,
I_Method4(void, attach, IN, osg::State &, state, IN, GLenum, target, IN, GLenum, attachment_point, IN, const osg::FBOExtensions *, ext,
Properties::NON_VIRTUAL,
__void__attach__State_R1__GLenum__C5_FBOExtensions_P1,
__void__attach__State_R1__GLenum__GLenum__C5_FBOExtensions_P1,
"",
"");
I_Method1(int, compare, IN, const osg::FrameBufferAttachment &, fa,
@@ -163,6 +184,13 @@ TYPE_NAME_ALIAS(std::vector< GLenum >, osg::FrameBufferObject::MultipleRendering
TYPE_NAME_ALIAS(osg::Camera::BufferComponent, osg::FrameBufferObject::BufferComponent)
BEGIN_ENUM_REFLECTOR(osg::FrameBufferObject::BindTarget)
I_DeclaringFile("osg/FrameBufferObject");
I_EnumLabel(osg::FrameBufferObject::READ_FRAMEBUFFER);
I_EnumLabel(osg::FrameBufferObject::DRAW_FRAMEBUFFER);
I_EnumLabel(osg::FrameBufferObject::READ_DRAW_FRAMEBUFFER);
END_REFLECTOR
BEGIN_OBJECT_REFLECTOR(osg::FrameBufferObject)
I_DeclaringFile("osg/FrameBufferObject");
I_BaseType(osg::StateAttribute);
@@ -258,6 +286,11 @@ BEGIN_OBJECT_REFLECTOR(osg::FrameBufferObject)
__C5_MultipleRenderingTargets_R1__getMultipleRenderingTargets,
"",
"");
I_Method0(bool, isMultisample,
Properties::NON_VIRTUAL,
__bool__isMultisample,
"",
"");
I_Method1(int, compare, IN, const osg::StateAttribute &, sa,
Properties::VIRTUAL,
__int__compare__C5_StateAttribute_R1,
@@ -268,6 +301,11 @@ BEGIN_OBJECT_REFLECTOR(osg::FrameBufferObject)
__void__apply__State_R1,
"apply the OpenGL state attributes. ",
"The render info for the current OpenGL context is passed in to allow the StateAttribute to obtain details on the the current context and state. ");
I_Method2(void, apply, IN, osg::State &, state, IN, osg::FrameBufferObject::BindTarget, target,
Properties::NON_VIRTUAL,
__void__apply__State_R1__BindTarget,
"Bind the FBO as either the read or draw target, or both. ",
"");
I_StaticMethod2(void, deleteFrameBufferObject, IN, unsigned int, contextID, IN, GLuint, program,
__void__deleteFrameBufferObject__unsigned_int__GLuint_S,
"Mark internal FBO for deletion. ",
@@ -313,10 +351,10 @@ BEGIN_OBJECT_REFLECTOR(osg::RenderBuffer)
I_Constructor0(____RenderBuffer,
"",
"");
I_Constructor3(IN, int, width, IN, int, height, IN, GLenum, internalFormat,
____RenderBuffer__int__int__GLenum,
"",
"");
I_ConstructorWithDefaults5(IN, int, width, , IN, int, height, , IN, GLenum, internalFormat, , IN, int, samples, 0, IN, int, colorSamples, 0,
____RenderBuffer__int__int__GLenum__int__int,
"",
"");
I_ConstructorWithDefaults2(IN, const osg::RenderBuffer &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY,
____RenderBuffer__C5_RenderBuffer_R1__C5_CopyOp_R1,
"",
@@ -381,6 +419,26 @@ BEGIN_OBJECT_REFLECTOR(osg::RenderBuffer)
__void__setInternalFormat__GLenum,
"",
"");
I_Method0(int, getSamples,
Properties::NON_VIRTUAL,
__int__getSamples,
"",
"");
I_Method0(int, getColorSamples,
Properties::NON_VIRTUAL,
__int__getColorSamples,
"",
"");
I_Method1(void, setSamples, IN, int, samples,
Properties::NON_VIRTUAL,
__void__setSamples__int,
"",
"");
I_Method1(void, setColorSamples, IN, int, colorSamples,
Properties::NON_VIRTUAL,
__void__setColorSamples__int,
"",
"");
I_Method2(GLuint, getObjectID, IN, unsigned int, contextID, IN, const osg::FBOExtensions *, ext,
Properties::NON_VIRTUAL,
__GLuint__getObjectID__unsigned_int__C5_FBOExtensions_P1,
@@ -409,12 +467,18 @@ BEGIN_OBJECT_REFLECTOR(osg::RenderBuffer)
__void__dirtyAll,
"",
"");
I_SimpleProperty(int, ColorSamples,
__int__getColorSamples,
__void__setColorSamples__int);
I_SimpleProperty(int, Height,
__int__getHeight,
__void__setHeight__int);
I_SimpleProperty(GLenum, InternalFormat,
__GLenum__getInternalFormat,
__void__setInternalFormat__GLenum);
I_SimpleProperty(int, Samples,
__int__getSamples,
__void__setSamples__int);
I_SimpleProperty(int, Width,
__int__getWidth,
__void__setWidth__int);

35
src/osgWrappers/osgUtil/RenderStage.cpp
View File

@@ -250,8 +250,8 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::RenderStage)
I_Method1(void, setFrameBufferObject, IN, osg::FrameBufferObject *, fbo,
Properties::NON_VIRTUAL,
__void__setFrameBufferObject__osg_FrameBufferObject_P1,
"",
"");
"Set a framebuffer object to render into. ",
"It is permissible for the framebuffer object to be multisampled, in which case you should also set a resolve framebuffer object - see setMultisampleResolveFramebufferObject(). ");
I_Method0(osg::FrameBufferObject *, getFrameBufferObject,
Properties::NON_VIRTUAL,
__osg_FrameBufferObject_P1__getFrameBufferObject,
@@ -262,6 +262,31 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::RenderStage)
__C5_osg_FrameBufferObject_P1__getFrameBufferObject,
"",
"");
I_Method1(void, setMultisampleResolveFramebufferObject, IN, osg::FrameBufferObject *, fbo,
Properties::NON_VIRTUAL,
__void__setMultisampleResolveFramebufferObject__osg_FrameBufferObject_P1,
"Sets the destination framebuffer object for glBlitFramebufferEXT to resolve a multisampled framebuffer object after the RenderStage is drawn. ",
"The resolve framebuffer object must not be multisampled. The resolve framebuffer object is only necessary if the primary framebuffer object is multisampled, if not then leave it set to null. ");
I_Method0(osg::FrameBufferObject *, getMultisampleResolveFramebufferObject,
Properties::NON_VIRTUAL,
__osg_FrameBufferObject_P1__getMultisampleResolveFramebufferObject,
"",
"");
I_Method0(const osg::FrameBufferObject *, getMultisampleResolveFramebufferObject,
Properties::NON_VIRTUAL,
__C5_osg_FrameBufferObject_P1__getMultisampleResolveFramebufferObject,
"",
"");
I_Method1(void, setDisableFboAfterRender, IN, bool, disable,
Properties::NON_VIRTUAL,
__void__setDisableFboAfterRender__bool,
"Set whether the framebuffer object should be unbound after rendering. ",
"By default this is set to true. Set it to false if the unbinding is not required. ");
I_Method0(bool, getDisableFboAfterRender,
Properties::NON_VIRTUAL,
__bool__getDisableFboAfterRender,
"",
"");
I_Method1(void, setGraphicsContext, IN, osg::GraphicsContext *, context,
Properties::NON_VIRTUAL,
__void__setGraphicsContext__osg_GraphicsContext_P1,
@@ -406,6 +431,9 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::RenderStage)
I_SimpleProperty(osg::ColorMask *, ColorMask,
__osg_ColorMask_P1__getColorMask,
__void__setColorMask__osg_ColorMask_P1);
I_SimpleProperty(bool, DisableFboAfterRender,
__bool__getDisableFboAfterRender,
__void__setDisableFboAfterRender__bool);
I_SimpleProperty(GLenum, DrawBuffer,
__GLenum__getDrawBuffer,
__void__setDrawBuffer__GLenum);
@@ -430,6 +458,9 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::RenderStage)
I_SimpleProperty(const osg::Matrix &, InheritedPositionalStateContainerMatrix,
__C5_osg_Matrix_R1__getInheritedPositionalStateContainerMatrix,
__void__setInheritedPositionalStateContainerMatrix__C5_osg_Matrix_R1);
I_SimpleProperty(osg::FrameBufferObject *, MultisampleResolveFramebufferObject,
__osg_FrameBufferObject_P1__getMultisampleResolveFramebufferObject,
__void__setMultisampleResolveFramebufferObject__osg_FrameBufferObject_P1);
I_SimpleProperty(osgUtil::PositionalStateContainer *, PositionalStateContainer,
__PositionalStateContainer_P1__getPositionalStateContainer,
__void__setPositionalStateContainer__PositionalStateContainer_P1);