FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes to typo of *Dirty()

Browse Source
This commit is contained in:
Robert Osfield
2002-11-11 16:11:48 +00:00
parent 5c1c9ec0e9
commit 35b9317baf
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/osg/Texture
View File

@@ -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];

2
src/osg/Texture.cpp
View File

@@ -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;
}

2
src/osg/Texture1D.cpp
View File

@@ -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())
{

2
src/osg/Texture2D.cpp
View File

@@ -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())
{

2
src/osg/Texture3D.cpp
View File

@@ -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())
{

2
src/osg/TextureCubeMap.cpp
View File

@@ -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())
{