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

Fixed typo of Validity.

Browse Source
This commit is contained in:
Robert Osfield 2006-02-22 19:14:01 +00:00
parent 94b4432831
commit def7a78842
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/osg/PointSprite
View File

@ -46,7 +46,7 @@ public:
return true; return true;
} }
virtual bool checkValididityOfAssociatedModes(osg::State&) const; virtual bool checkValidityOfAssociatedModes(osg::State&) const;
virtual bool isTextureAttribute() const { return true; } virtual bool isTextureAttribute() const { return true; }

2
include/osg/StateAttribute
View File

@ -273,7 +273,7 @@ class OSG_EXPORT StateAttribute : public Object
/** Check the modes associated with this StateAttribute are supported by current OpenGL drivers, /** 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. * and if not set the associated mode in osg::State to be black listed/invalid.
* Return true if all associated modes are valid.*/ * 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. // default to no black listed GLMode's associated with use of the StateAttribute.
return true; return true;

2
include/osg/StateSet
View File

@ -413,7 +413,7 @@ class OSG_EXPORT StateSet : public Object
/** Check the modes associated with this StateSet are supported by current OpenGL drivers, /** 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. * and if not set the associated mode in osg::State to be black listed/invalid.
* Return true if all associated modes are valid.*/ * 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.*/ /** call compile on all StateAttributes contained within this StateSet.*/
void compileGLObjects(State& state) const; void compileGLObjects(State& state) const;

2
src/osg/PointSprite.cpp
View File

@ -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()); bool modeValid = isPointSpriteSupported(state.getContextID());

6
src/osg/StateSet.cpp
View File

@ -1131,7 +1131,7 @@ const StateSet::RefAttributePair* StateSet::getTextureAttributePair(unsigned int
return getAttributePair(_textureAttributeList[unit],type,0); 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!=_attributeList.end();
++itr) ++itr)
{ {
if (!itr->second.first->checkValididityOfAssociatedModes(state)) modesValid = false; if (!itr->second.first->checkValidityOfAssociatedModes(state)) modesValid = false;
} }
for(TextureAttributeList::const_iterator taitr=_textureAttributeList.begin(); for(TextureAttributeList::const_iterator taitr=_textureAttributeList.begin();
@ -1151,7 +1151,7 @@ bool StateSet::checkValididityOfAssociatedModes(osg::State& state) const
itr!=taitr->end(); itr!=taitr->end();
++itr) ++itr)
{ {
if (!itr->second.first->checkValididityOfAssociatedModes(state)) modesValid = false; if (!itr->second.first->checkValidityOfAssociatedModes(state)) modesValid = false;
} }
} }

2
src/osgUtil/GLObjectsVisitor.cpp
View File

@ -113,6 +113,6 @@ void GLObjectsVisitor::apply(osg::StateSet& stateset)
if (_mode & CHECK_BLACK_LISTED_MODES) if (_mode & CHECK_BLACK_LISTED_MODES)
{ {
stateset.checkValididityOfAssociatedModes(*_state.get()); stateset.checkValidityOfAssociatedModes(*_state.get());
} }
} }