From bf872fa7ac3338bd096bc84bbe231491c784e891 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 21 May 2002 09:16:31 +0000 Subject: [PATCH] Renamed osg::State::getCurrentMode/Attribute(..) to getLastAppliedMode/Attribute() to make it more consistent with the internal workings of osg::State. --- include/osg/State | 4 ++-- src/osg/State.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/osg/State b/include/osg/State index 880e535f1..8154caec9 100644 --- a/include/osg/State +++ b/include/osg/State @@ -145,10 +145,10 @@ class SG_EXPORT State : public Referenced void haveAppliedAttribute(const StateAttribute::Type type); /** Get whether the current specified mode is enabled (true) or disabled (false).*/ - const bool getCurrentMode(const StateAttribute::GLMode mode) const; + const bool getLastAppliedMode(const StateAttribute::GLMode mode) const; /** Get the current specified attribute, return NULL is one has not yet been applied.*/ - const StateAttribute* getCurrentAttribute(const StateAttribute::Type type) const; + const StateAttribute* getLastAppliedAttribute(const StateAttribute::Type type) const; /** Set the current OpenGL context uniqueID. diff --git a/src/osg/State.cpp b/src/osg/State.cpp index d1f5566ea..eb4ef32f9 100644 --- a/src/osg/State.cpp +++ b/src/osg/State.cpp @@ -570,7 +570,7 @@ void State::haveAppliedAttribute(const StateAttribute::Type type) } } -const bool State::getCurrentMode(const StateAttribute::GLMode mode) const +const bool State::getLastAppliedMode(const StateAttribute::GLMode mode) const { ModeMap::const_iterator itr = _modeMap.find(mode); if (itr!=_modeMap.end()) @@ -584,7 +584,7 @@ const bool State::getCurrentMode(const StateAttribute::GLMode mode) const } } -const StateAttribute* State::getCurrentAttribute(const StateAttribute::Type type) const +const StateAttribute* State::getLastAppliedAttribute(const StateAttribute::Type type) const { AttributeMap::const_iterator itr = _attributeMap.find(type); if (itr!=_attributeMap.end())