From 35b9317baf496ad20dbbdb3f782c7850763e70d5 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 11 Nov 2002 16:11:48 +0000 Subject: [PATCH] Fixes to typo of *Dirty() --- include/osg/Texture | 4 ++-- src/osg/Texture.cpp | 2 +- src/osg/Texture1D.cpp | 2 +- src/osg/Texture2D.cpp | 2 +- src/osg/Texture3D.cpp | 2 +- src/osg/TextureCubeMap.cpp | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/osg/Texture b/include/osg/Texture index fd1206053..7bcdca8a3 100644 --- a/include/osg/Texture +++ b/include/osg/Texture @@ -199,7 +199,7 @@ class SG_EXPORT Texture : public osg::StateAttribute // return _modifiedTag[contextID]; // } // -// inline uint& getTextureParameterDity(uint contextID) const +// inline uint& getTextureParameterDirty(uint contextID) const // { // // pad out handle list if required. // if (_texParametersDirtyList.size()<=contextID) @@ -224,7 +224,7 @@ class SG_EXPORT Texture : public osg::StateAttribute return _modifiedTag[contextID]; } - inline uint& getTextureParameterDity(uint contextID) const + inline uint& getTextureParameterDirty(uint contextID) const { // get the dirty flag for the current contextID. return _texParametersDirtyList[contextID]; diff --git a/src/osg/Texture.cpp b/src/osg/Texture.cpp index 9a9a69dd7..dfbda2c3a 100644 --- a/src/osg/Texture.cpp +++ b/src/osg/Texture.cpp @@ -305,7 +305,7 @@ void Texture::applyTexParameters(GLenum target, State& state) const glTexParameterfv(target, GL_TEXTURE_BORDER_COLOR, _borderColor.ptr()); } - getTextureParameterDity(state.getContextID()) = false; + getTextureParameterDirty(state.getContextID()) = false; } diff --git a/src/osg/Texture1D.cpp b/src/osg/Texture1D.cpp index 6be7295b0..32305b693 100644 --- a/src/osg/Texture1D.cpp +++ b/src/osg/Texture1D.cpp @@ -85,7 +85,7 @@ void Texture1D::apply(State& state) const { glBindTexture( GL_TEXTURE_1D, handle ); - if (getTextureParameterDity(state.getContextID())) applyTexParameters(GL_TEXTURE_1D,state); + if (getTextureParameterDirty(state.getContextID())) applyTexParameters(GL_TEXTURE_1D,state); if (_subloadCallback.valid()) { diff --git a/src/osg/Texture2D.cpp b/src/osg/Texture2D.cpp index 414bbf122..0e778822e 100644 --- a/src/osg/Texture2D.cpp +++ b/src/osg/Texture2D.cpp @@ -88,7 +88,7 @@ void Texture2D::apply(State& state) const { glBindTexture( GL_TEXTURE_2D, handle ); - if (getTextureParameterDity(state.getContextID())) applyTexParameters(GL_TEXTURE_2D,state); + if (getTextureParameterDirty(state.getContextID())) applyTexParameters(GL_TEXTURE_2D,state); if (_subloadCallback.valid()) { diff --git a/src/osg/Texture3D.cpp b/src/osg/Texture3D.cpp index 41b2c10eb..4859b70c5 100644 --- a/src/osg/Texture3D.cpp +++ b/src/osg/Texture3D.cpp @@ -102,7 +102,7 @@ void Texture3D::apply(State& state) const { glBindTexture( GL_TEXTURE_3D, handle ); - if (getTextureParameterDity(state.getContextID())) applyTexParameters(GL_TEXTURE_3D,state); + if (getTextureParameterDirty(state.getContextID())) applyTexParameters(GL_TEXTURE_3D,state); if (_subloadCallback.valid()) { diff --git a/src/osg/TextureCubeMap.cpp b/src/osg/TextureCubeMap.cpp index 6cb403795..56d27c8d5 100644 --- a/src/osg/TextureCubeMap.cpp +++ b/src/osg/TextureCubeMap.cpp @@ -191,7 +191,7 @@ void TextureCubeMap::apply(State& state) const if (handle != 0) { glBindTexture( GL_TEXTURE_CUBE_MAP, handle ); - if (getTextureParameterDity(state.getContextID())) applyTexParameters(GL_TEXTURE_CUBE_MAP,state); + if (getTextureParameterDirty(state.getContextID())) applyTexParameters(GL_TEXTURE_CUBE_MAP,state); if (_subloadCallback.valid()) {