From 5889052f5acfc03cda1ef7cd9f551b99df0dfddf Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 3 Aug 2006 16:04:43 +0000 Subject: [PATCH] Updated wrappers --- src/osgWrappers/osg/CameraNode.cpp | 3 +++ src/osgWrappers/osg/Texture.cpp | 6 ++++++ src/osgWrappers/osg/Texture1D.cpp | 4 ++++ src/osgWrappers/osg/Texture2D.cpp | 4 +++- src/osgWrappers/osg/Texture3D.cpp | 4 ++-- src/osgWrappers/osg/TextureCubeMap.cpp | 4 +++- src/osgWrappers/osg/TextureRectangle.cpp | 4 +++- 7 files changed, 24 insertions(+), 5 deletions(-) diff --git a/src/osgWrappers/osg/CameraNode.cpp b/src/osgWrappers/osg/CameraNode.cpp index 7b1f21bfd..266855ce4 100644 --- a/src/osgWrappers/osg/CameraNode.cpp +++ b/src/osgWrappers/osg/CameraNode.cpp @@ -163,6 +163,9 @@ END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::CameraNode::Attachment) I_Constructor0(); + I_Method0(int, width); + I_Method0(int, height); + I_Method0(int, depth); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::CameraNode::DrawCallback) diff --git a/src/osgWrappers/osg/Texture.cpp b/src/osgWrappers/osg/Texture.cpp index 91d9b657d..4d7445472 100644 --- a/src/osgWrappers/osg/Texture.cpp +++ b/src/osgWrappers/osg/Texture.cpp @@ -91,6 +91,9 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture) I_Method0(bool, isTextureAttribute); I_Method0(GLenum, getTextureTarget); I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage); + I_Method0(int, getTextureWidth); + I_Method0(int, getTextureHeight); + I_Method0(int, getTextureDepth); I_Method2(void, setWrap, IN, osg::Texture::WrapParameter, which, IN, osg::Texture::WrapMode, wrap); I_Method1(osg::Texture::WrapMode, getWrap, IN, osg::Texture::WrapParameter, which); I_Method1(void, setBorderColor, IN, const osg::Vec4 &, color); @@ -158,7 +161,10 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture) I_Property(osg::Texture::ShadowTextureMode, ShadowTextureMode); I_Property(GLenum, SourceFormat); I_Property(GLenum, SourceType); + I_ReadOnlyProperty(int, TextureDepth); + I_ReadOnlyProperty(int, TextureHeight); I_ReadOnlyProperty(GLenum, TextureTarget); + I_ReadOnlyProperty(int, TextureWidth); I_ReadOnlyProperty(osg::StateAttribute::Type, Type); I_Property(bool, UnRefImageDataAfterApply); I_Property(bool, UseHardwareMipMapGeneration); diff --git a/src/osgWrappers/osg/Texture1D.cpp b/src/osgWrappers/osg/Texture1D.cpp index 6a315cef8..ef4a6536f 100644 --- a/src/osgWrappers/osg/Texture1D.cpp +++ b/src/osgWrappers/osg/Texture1D.cpp @@ -46,6 +46,8 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture1D) I_Method0(unsigned int, getNumImages); I_Method1(void, setTextureWidth, IN, int, width); I_Method0(int, getTextureWidth); + I_Method0(int, getTextureHeight); + I_Method0(int, getTextureDepth); I_Method1(void, setSubloadCallback, IN, osg::Texture1D::SubloadCallback *, cb); I_Method0(osg::Texture1D::SubloadCallback *, getSubloadCallback); I_Method0(const osg::Texture1D::SubloadCallback *, getSubloadCallback); @@ -57,6 +59,8 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture1D) I_Property(osg::Image *, Image); I_WriteOnlyProperty(unsigned int, NumMipmapLevels); I_Property(osg::Texture1D::SubloadCallback *, SubloadCallback); + I_ReadOnlyProperty(int, TextureDepth); + I_ReadOnlyProperty(int, TextureHeight); I_ReadOnlyProperty(GLenum, TextureTarget); I_Property(int, TextureWidth); I_ReadOnlyProperty(osg::StateAttribute::Type, Type); diff --git a/src/osgWrappers/osg/Texture2D.cpp b/src/osgWrappers/osg/Texture2D.cpp index 8fcbcaa22..0714e4fb7 100644 --- a/src/osgWrappers/osg/Texture2D.cpp +++ b/src/osgWrappers/osg/Texture2D.cpp @@ -47,9 +47,10 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture2D) I_Method0(unsigned int, getNumImages); I_Method2(void, setTextureSize, IN, int, width, IN, int, height); I_Method1(void, setTextureWidth, IN, int, width); - I_Method0(int, getTextureWidth); I_Method1(void, setTextureHeight, IN, int, height); + I_Method0(int, getTextureWidth); I_Method0(int, getTextureHeight); + I_Method0(int, getTextureDepth); I_Method1(void, setSubloadCallback, IN, osg::Texture2D::SubloadCallback *, cb); I_Method0(osg::Texture2D::SubloadCallback *, getSubloadCallback); I_Method0(const osg::Texture2D::SubloadCallback *, getSubloadCallback); @@ -61,6 +62,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture2D) I_Property(osg::Image *, Image); I_WriteOnlyProperty(unsigned int, NumMipmapLevels); I_Property(osg::Texture2D::SubloadCallback *, SubloadCallback); + I_ReadOnlyProperty(int, TextureDepth); I_Property(int, TextureHeight); I_ReadOnlyProperty(GLenum, TextureTarget); I_Property(int, TextureWidth); diff --git a/src/osgWrappers/osg/Texture3D.cpp b/src/osgWrappers/osg/Texture3D.cpp index aa9133053..778fb3f5f 100644 --- a/src/osgWrappers/osg/Texture3D.cpp +++ b/src/osgWrappers/osg/Texture3D.cpp @@ -47,10 +47,10 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture3D) I_Method3(void, setTextureSize, IN, int, width, IN, int, height, IN, int, depth); I_Method3(void, getTextureSize, IN, int &, width, IN, int &, height, IN, int &, depth); I_Method1(void, setTextureWidth, IN, int, width); - I_Method0(int, getTextureWidth); I_Method1(void, setTextureHeight, IN, int, height); - I_Method0(int, getTextureHeight); I_Method1(void, setTextureDepth, IN, int, depth); + I_Method0(int, getTextureWidth); + I_Method0(int, getTextureHeight); I_Method0(int, getTextureDepth); I_Method1(void, setSubloadCallback, IN, osg::Texture3D::SubloadCallback *, cb); I_Method0(osg::Texture3D::SubloadCallback *, getSubloadCallback); diff --git a/src/osgWrappers/osg/TextureCubeMap.cpp b/src/osgWrappers/osg/TextureCubeMap.cpp index 79497af3f..085ff233b 100644 --- a/src/osgWrappers/osg/TextureCubeMap.cpp +++ b/src/osgWrappers/osg/TextureCubeMap.cpp @@ -52,9 +52,10 @@ BEGIN_OBJECT_REFLECTOR(osg::TextureCubeMap) I_Method2(unsigned int &, getModifiedCount, IN, unsigned int, face, IN, unsigned int, contextID); I_Method2(void, setTextureSize, IN, int, width, IN, int, height); I_Method1(void, setTextureWidth, IN, int, width); - I_Method0(int, getTextureWidth); I_Method1(void, setTextureHeight, IN, int, height); + I_Method0(int, getTextureWidth); I_Method0(int, getTextureHeight); + I_Method0(int, getTextureDepth); I_Method1(void, setSubloadCallback, IN, osg::TextureCubeMap::SubloadCallback *, cb); I_Method0(osg::TextureCubeMap::SubloadCallback *, getSubloadCallback); I_Method0(const osg::TextureCubeMap::SubloadCallback *, getSubloadCallback); @@ -65,6 +66,7 @@ BEGIN_OBJECT_REFLECTOR(osg::TextureCubeMap) I_ArrayProperty_G(osg::Image *, Image, Images, unsigned int, void); I_WriteOnlyProperty(unsigned int, NumMipmapLevels); I_Property(osg::TextureCubeMap::SubloadCallback *, SubloadCallback); + I_ReadOnlyProperty(int, TextureDepth); I_Property(int, TextureHeight); I_ReadOnlyProperty(GLenum, TextureTarget); I_Property(int, TextureWidth); diff --git a/src/osgWrappers/osg/TextureRectangle.cpp b/src/osgWrappers/osg/TextureRectangle.cpp index 346890895..3b7b3c6be 100644 --- a/src/osgWrappers/osg/TextureRectangle.cpp +++ b/src/osgWrappers/osg/TextureRectangle.cpp @@ -47,9 +47,10 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TextureRectangle) I_Method0(unsigned int, getNumImages); I_Method2(void, setTextureSize, IN, int, width, IN, int, height); I_Method1(void, setTextureWidth, IN, int, width); - I_Method0(int, getTextureWidth); I_Method1(void, setTextureHeight, IN, int, height); + I_Method0(int, getTextureWidth); I_Method0(int, getTextureHeight); + I_Method0(int, getTextureDepth); I_Method1(void, setSubloadCallback, IN, osg::TextureRectangle::SubloadCallback *, cb); I_Method0(osg::TextureRectangle::SubloadCallback *, getSubloadCallback); I_Method0(const osg::TextureRectangle::SubloadCallback *, getSubloadCallback); @@ -58,6 +59,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TextureRectangle) I_Method1(void, apply, IN, osg::State &, state); I_Property(osg::Image *, Image); I_Property(osg::TextureRectangle::SubloadCallback *, SubloadCallback); + I_ReadOnlyProperty(int, TextureDepth); I_Property(int, TextureHeight); I_ReadOnlyProperty(GLenum, TextureTarget); I_Property(int, TextureWidth);