From 501f28449ce53433f811d7842d1dcb2fd3e54fc8 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 26 Aug 2002 20:11:24 +0000 Subject: [PATCH] Fixed typo of _texParametersDirty. --- include/osg/TextureBase | 4 ++-- src/osg/Texture.cpp | 4 ++-- src/osg/Texture1D.cpp | 2 +- src/osg/Texture2D.cpp | 2 +- src/osg/Texture3D.cpp | 2 +- src/osg/TextureBase.cpp | 18 +++++++++--------- src/osg/TextureCubeMap.cpp | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/include/osg/TextureBase b/include/osg/TextureBase index 23676d5df..4a5094c4a 100644 --- a/include/osg/TextureBase +++ b/include/osg/TextureBase @@ -109,7 +109,7 @@ class SG_EXPORT TextureBase : public osg::StateAttribute /** Sets the border color for this texture. Makes difference only if * wrap mode is CLAMP_TO_BORDER */ - void setBorderColor(const Vec4& color) { _borderColor = color; _texParamtersDirty = true; } + void setBorderColor(const Vec4& color) { _borderColor = color; _texParametersDirty = true; } const Vec4& borderColor(void) const { return _borderColor; } @@ -265,7 +265,7 @@ class SG_EXPORT TextureBase : public osg::StateAttribute Vec4 _borderColor; // true if apply tex parameters required. - mutable bool _texParamtersDirty; + mutable bool _texParametersDirty; InternalFormatMode _internalFormatMode; diff --git a/src/osg/Texture.cpp b/src/osg/Texture.cpp index bc332d118..8a489efab 100644 --- a/src/osg/Texture.cpp +++ b/src/osg/Texture.cpp @@ -129,12 +129,12 @@ void Texture::apply(State& state) const if (_subloadMode == OFF) { glBindTexture( GL_TEXTURE_2D, handle ); - if (_texParamtersDirty) applyTexParameters(GL_TEXTURE_2D,state); + if (_texParametersDirty) applyTexParameters(GL_TEXTURE_2D,state); } else if (_image.valid() && _image->data()) { glBindTexture( GL_TEXTURE_2D, handle ); - if (_texParamtersDirty) applyTexParameters(GL_TEXTURE_2D,state); + if (_texParametersDirty) applyTexParameters(GL_TEXTURE_2D,state); uint& modifiedTag = getModifiedTag(contextID); if (_subloadMode == AUTO || diff --git a/src/osg/Texture1D.cpp b/src/osg/Texture1D.cpp index 00997280f..5a0fdb40a 100644 --- a/src/osg/Texture1D.cpp +++ b/src/osg/Texture1D.cpp @@ -96,7 +96,7 @@ void Texture1D::apply(State& state) const { glBindTexture( GL_TEXTURE_1D, handle ); - if (_texParamtersDirty) applyTexParameters(GL_TEXTURE_1D,state); + if (_texParametersDirty) applyTexParameters(GL_TEXTURE_1D,state); if (_subloadCallback.valid()) { diff --git a/src/osg/Texture2D.cpp b/src/osg/Texture2D.cpp index 0887c7a8d..4990d11f6 100644 --- a/src/osg/Texture2D.cpp +++ b/src/osg/Texture2D.cpp @@ -99,7 +99,7 @@ void Texture2D::apply(State& state) const { glBindTexture( GL_TEXTURE_2D, handle ); - if (_texParamtersDirty) applyTexParameters(GL_TEXTURE_2D,state); + if (_texParametersDirty) applyTexParameters(GL_TEXTURE_2D,state); if (_subloadCallback.valid()) { diff --git a/src/osg/Texture3D.cpp b/src/osg/Texture3D.cpp index ce6309489..71fe16873 100644 --- a/src/osg/Texture3D.cpp +++ b/src/osg/Texture3D.cpp @@ -117,7 +117,7 @@ void Texture3D::apply(State& state) const { glBindTexture( GL_TEXTURE_3D, handle ); - if (_texParamtersDirty) applyTexParameters(GL_TEXTURE_3D,state); + if (_texParametersDirty) applyTexParameters(GL_TEXTURE_3D,state); if (_subloadCallback.valid()) { diff --git a/src/osg/TextureBase.cpp b/src/osg/TextureBase.cpp index b3ed77f6e..e4be654cb 100644 --- a/src/osg/TextureBase.cpp +++ b/src/osg/TextureBase.cpp @@ -20,7 +20,7 @@ TextureBase::TextureBase(): _mag_filter(LINEAR), _maxAnisotropy(1.0f), _borderColor(0.0, 0.0, 0.0, 0.0), - _texParamtersDirty(true), + _texParametersDirty(true), _internalFormatMode(USE_IMAGE_DATA_FORMAT), _internalFormat(0) { @@ -37,7 +37,7 @@ TextureBase::TextureBase(const TextureBase& text,const CopyOp& copyop): _mag_filter(text._mag_filter), _maxAnisotropy(text._maxAnisotropy), _borderColor(text._borderColor), - _texParamtersDirty(false), + _texParametersDirty(false), _internalFormatMode(text._internalFormatMode), _internalFormat(text._internalFormat) { @@ -70,9 +70,9 @@ void TextureBase::setWrap(const WrapParameter which, const WrapMode wrap) { switch( which ) { - case WRAP_S : _wrap_s = wrap; _texParamtersDirty = true; break; - case WRAP_T : _wrap_t = wrap; _texParamtersDirty = true; break; - case WRAP_R : _wrap_r = wrap; _texParamtersDirty = true; break; + case WRAP_S : _wrap_s = wrap; _texParametersDirty = true; break; + case WRAP_T : _wrap_t = wrap; _texParametersDirty = true; break; + case WRAP_R : _wrap_r = wrap; _texParametersDirty = true; break; default : notify(WARN)<<"Error: invalid 'which' passed TextureBase::setWrap("<<(unsigned int)which<<","<<(unsigned int)wrap<<")"<