From ae7dfc57964f87b166d7a6aa9ee014ea8b809b93 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 7 Oct 2009 09:39:45 +0000 Subject: [PATCH] Fixed warnigns --- include/osg/BufferObject | 4 ++-- src/osg/BufferObject.cpp | 2 +- src/osgWrappers/osg/BufferObject.cpp | 9 +++++++-- src/osgWrappers/osg/Texture.cpp | 5 +++++ 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/include/osg/BufferObject b/include/osg/BufferObject index b185746d1..13c1cb6e1 100644 --- a/include/osg/BufferObject +++ b/include/osg/BufferObject @@ -197,8 +197,8 @@ class OSG_EXPORT GLBufferObject : public Referenced } unsigned int modifiedCount; - GLsizeiptrARB dataSize; - GLsizeiptrARB offset; + unsigned int dataSize; + unsigned int offset; BufferData* dataSource; }; diff --git a/src/osg/BufferObject.cpp b/src/osg/BufferObject.cpp index 6db92e18b..510bba588 100644 --- a/src/osg/BufferObject.cpp +++ b/src/osg/BufferObject.cpp @@ -1451,4 +1451,4 @@ void PixelDataBufferObject::resizeGLObjectBuffers(unsigned int maxSize) BufferObject::resizeGLObjectBuffers(maxSize); _mode.resize(maxSize); -} \ No newline at end of file +} diff --git a/src/osgWrappers/osg/BufferObject.cpp b/src/osgWrappers/osg/BufferObject.cpp index 49d6be653..7222ba1a5 100644 --- a/src/osgWrappers/osg/BufferObject.cpp +++ b/src/osgWrappers/osg/BufferObject.cpp @@ -520,8 +520,8 @@ BEGIN_VALUE_REFLECTOR(osg::GLBufferObject::BufferEntry) "", ""); I_PublicMemberProperty(unsigned int, modifiedCount); - I_PublicMemberProperty(GLsizeiptrARB, dataSize); - I_PublicMemberProperty(GLsizeiptrARB, offset); + I_PublicMemberProperty(unsigned int, dataSize); + I_PublicMemberProperty(unsigned int, offset); I_PublicMemberProperty(osg::BufferData *, dataSource); END_REFLECTOR @@ -795,6 +795,11 @@ BEGIN_OBJECT_REFLECTOR(osg::GLBufferObjectSet) __void__remove__GLBufferObject_P1, "", ""); + I_Method2(void, moveToSet, IN, osg::GLBufferObject *, to, IN, osg::GLBufferObjectSet *, set, + Properties::NON_VIRTUAL, + __void__moveToSet__GLBufferObject_P1__GLBufferObjectSet_P1, + "", + ""); I_Method0(unsigned int, size, Properties::NON_VIRTUAL, __unsigned_int__size, diff --git a/src/osgWrappers/osg/Texture.cpp b/src/osgWrappers/osg/Texture.cpp index 4d7fc5998..f0570b548 100644 --- a/src/osgWrappers/osg/Texture.cpp +++ b/src/osgWrappers/osg/Texture.cpp @@ -1043,6 +1043,11 @@ BEGIN_OBJECT_REFLECTOR(osg::Texture::TextureObjectSet) __void__remove__TextureObject_P1, "", ""); + I_Method2(void, moveToSet, IN, osg::Texture::TextureObject *, to, IN, osg::Texture::TextureObjectSet *, set, + Properties::NON_VIRTUAL, + __void__moveToSet__TextureObject_P1__TextureObjectSet_P1, + "", + ""); I_Method0(unsigned int, size, Properties::NON_VIRTUAL, __unsigned_int__size,