From def7a78842131c58a0804098ca4b61f3ed9dca95 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 22 Feb 2006 19:14:01 +0000 Subject: [PATCH] Fixed typo of Validity. --- include/osg/PointSprite | 2 +- include/osg/StateAttribute | 2 +- include/osg/StateSet | 2 +- src/osg/PointSprite.cpp | 2 +- src/osg/StateSet.cpp | 6 +++--- src/osgUtil/GLObjectsVisitor.cpp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/osg/PointSprite b/include/osg/PointSprite index 83d826fff..d40b731fe 100644 --- a/include/osg/PointSprite +++ b/include/osg/PointSprite @@ -46,7 +46,7 @@ public: return true; } - virtual bool checkValididityOfAssociatedModes(osg::State&) const; + virtual bool checkValidityOfAssociatedModes(osg::State&) const; virtual bool isTextureAttribute() const { return true; } diff --git a/include/osg/StateAttribute b/include/osg/StateAttribute index ce147c448..f50bcf423 100644 --- a/include/osg/StateAttribute +++ b/include/osg/StateAttribute @@ -273,7 +273,7 @@ class OSG_EXPORT StateAttribute : public Object /** Check the modes associated with this StateAttribute are supported by current OpenGL drivers, * and if not set the associated mode in osg::State to be black listed/invalid. * Return true if all associated modes are valid.*/ - virtual bool checkValididityOfAssociatedModes(osg::State&) const + virtual bool checkValidityOfAssociatedModes(osg::State&) const { // default to no black listed GLMode's associated with use of the StateAttribute. return true; diff --git a/include/osg/StateSet b/include/osg/StateSet index 8910ddfc4..c0378e5f0 100644 --- a/include/osg/StateSet +++ b/include/osg/StateSet @@ -413,7 +413,7 @@ class OSG_EXPORT StateSet : public Object /** Check the modes associated with this StateSet are supported by current OpenGL drivers, * and if not set the associated mode in osg::State to be black listed/invalid. * Return true if all associated modes are valid.*/ - bool checkValididityOfAssociatedModes(State& state) const; + bool checkValidityOfAssociatedModes(State& state) const; /** call compile on all StateAttributes contained within this StateSet.*/ void compileGLObjects(State& state) const; diff --git a/src/osg/PointSprite.cpp b/src/osg/PointSprite.cpp index 7c6453e6c..f5e547269 100644 --- a/src/osg/PointSprite.cpp +++ b/src/osg/PointSprite.cpp @@ -32,7 +32,7 @@ int PointSprite::compare(const StateAttribute& sa) const } -bool PointSprite::checkValididityOfAssociatedModes(osg::State& state) const +bool PointSprite::checkValidityOfAssociatedModes(osg::State& state) const { bool modeValid = isPointSpriteSupported(state.getContextID()); diff --git a/src/osg/StateSet.cpp b/src/osg/StateSet.cpp index 99f84789b..ae225ed85 100644 --- a/src/osg/StateSet.cpp +++ b/src/osg/StateSet.cpp @@ -1131,7 +1131,7 @@ const StateSet::RefAttributePair* StateSet::getTextureAttributePair(unsigned int return getAttributePair(_textureAttributeList[unit],type,0); } -bool StateSet::checkValididityOfAssociatedModes(osg::State& state) const +bool StateSet::checkValidityOfAssociatedModes(osg::State& state) const { @@ -1140,7 +1140,7 @@ bool StateSet::checkValididityOfAssociatedModes(osg::State& state) const itr!=_attributeList.end(); ++itr) { - if (!itr->second.first->checkValididityOfAssociatedModes(state)) modesValid = false; + if (!itr->second.first->checkValidityOfAssociatedModes(state)) modesValid = false; } for(TextureAttributeList::const_iterator taitr=_textureAttributeList.begin(); @@ -1151,7 +1151,7 @@ bool StateSet::checkValididityOfAssociatedModes(osg::State& state) const itr!=taitr->end(); ++itr) { - if (!itr->second.first->checkValididityOfAssociatedModes(state)) modesValid = false; + if (!itr->second.first->checkValidityOfAssociatedModes(state)) modesValid = false; } } diff --git a/src/osgUtil/GLObjectsVisitor.cpp b/src/osgUtil/GLObjectsVisitor.cpp index c0790222a..a1f6481d9 100644 --- a/src/osgUtil/GLObjectsVisitor.cpp +++ b/src/osgUtil/GLObjectsVisitor.cpp @@ -113,6 +113,6 @@ void GLObjectsVisitor::apply(osg::StateSet& stateset) if (_mode & CHECK_BLACK_LISTED_MODES) { - stateset.checkValididityOfAssociatedModes(*_state.get()); + stateset.checkValidityOfAssociatedModes(*_state.get()); } }