From 7b9474e33e26eec75ee4d3fcd865ff1cae8066c2 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 6 Nov 2008 14:46:11 +0000 Subject: [PATCH] Fixed constness of getTexture/getRenderBuffer() const and added non cost version. --- include/osg/FrameBufferObject | 8 ++++++-- src/osg/FrameBufferObject.cpp | 14 ++++++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/include/osg/FrameBufferObject b/include/osg/FrameBufferObject index fbbd27d61..8edc1605d 100644 --- a/include/osg/FrameBufferObject +++ b/include/osg/FrameBufferObject @@ -350,8 +350,12 @@ namespace osg void attach(State &state, GLenum target, GLenum attachment_point, const FBOExtensions* ext) const; int compare(const FrameBufferAttachment &fa) const; - RenderBuffer* getRenderBuffer() const; - Texture* getTexture() const; + RenderBuffer* getRenderBuffer(); + const RenderBuffer* getRenderBuffer() const; + + Texture* getTexture(); + const Texture* getTexture() const; + int getCubeMapFace() const; int getTextureLevel() const; int getTexture3DZOffset() const; diff --git a/src/osg/FrameBufferObject.cpp b/src/osg/FrameBufferObject.cpp index b491f76fa..f7038ec71 100644 --- a/src/osg/FrameBufferObject.cpp +++ b/src/osg/FrameBufferObject.cpp @@ -575,12 +575,22 @@ int FrameBufferAttachment::compare(const FrameBufferAttachment &fa) const return 0; } -RenderBuffer* FrameBufferAttachment::getRenderBuffer() const +RenderBuffer* FrameBufferAttachment::getRenderBuffer() { return _ximpl->renderbufferTarget.get(); } -Texture* FrameBufferAttachment::getTexture() const +Texture* FrameBufferAttachment::getTexture() +{ + return _ximpl->textureTarget.get(); +} + +const RenderBuffer* FrameBufferAttachment::getRenderBuffer() const +{ + return _ximpl->renderbufferTarget.get(); +} + +const Texture* FrameBufferAttachment::getTexture() const { return _ximpl->textureTarget.get(); }