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

Renamed have_applied_mode, have_applied_attribute, apply_mode, apply_attribute

Browse Source 
to haveAppliedMode, haveAppliedAttribute, applyMode, applyAttribute to make
it more consistent with the general OSG name convetion.
This commit is contained in:
Robert Osfield
2002-03-21 12:36:05 +00:00
parent a364875afb
commit 03cda7d3f8
3 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/osg/State
View File

@@ -55,16 +55,16 @@ class SG_EXPORT State : public Referenced
/** apply an OpenGL mode if required. */
inline const bool apply_mode(const StateAttribute::GLMode mode,const bool enabled)
inline const bool applyMode(const StateAttribute::GLMode mode,const bool enabled)
{
return apply_mode(mode,enabled,_modeMap[mode]);
return applyMode(mode,enabled,_modeMap[mode]);
}
/** apply an attribute if required. */
inline const bool apply_attribute(const StateAttribute* attribute)
inline const bool applyAttribute(const StateAttribute* attribute)
{
return apply_attribute(attribute,_attributeMap[attribute->getType()]);
return applyAttribute(attribute,_attributeMap[attribute->getType()]);
}
@@ -75,14 +75,14 @@ class SG_EXPORT State : public Referenced
void apply();
/** mode has been set externally, update state to reflect this setting.*/
void have_applied_mode(const StateAttribute::GLMode mode,const StateAttribute::GLModeValue value);
void haveAppliedMode(const StateAttribute::GLMode mode,const StateAttribute::GLModeValue value);
/** mode has been set externally, therefore dirty the associated mode in osg::State
* so it is applied on next call to osg::State::apply(..)*/
void have_applied_mode(const StateAttribute::GLMode mode);
void haveAppliedMode(const StateAttribute::GLMode mode);
/** attribute has been applied externally, update state to reflect this setting.*/
void have_applied_attribute(const StateAttribute* attribute);
void haveAppliedAttribute(const StateAttribute* attribute);
/** attribute has been applied externally,
* and therefore this attribute type has been dirtied
@@ -91,7 +91,7 @@ class SG_EXPORT State : public Referenced
* then use the have_applied(attribute) method as this will the osg::State to
* track the current state more accuratly and enable lazy state updating such
* that only changed state will be applied.*/
void have_applied_attribute(const StateAttribute::Type type);
void haveAppliedAttribute(const StateAttribute::Type type);
/** Set the current OpenGL context uniqueID.
@@ -176,7 +176,7 @@ class SG_EXPORT State : public Referenced
};
/** apply an OpenGL mode if required, passing in mode, enable flag and appropriate mode stack */
inline const bool apply_mode(const StateAttribute::GLMode mode,const bool enabled,ModeStack& ms)
inline const bool applyMode(const StateAttribute::GLMode mode,const bool enabled,ModeStack& ms)
{
if (ms.last_applied_value != enabled)
{
@@ -192,7 +192,7 @@ class SG_EXPORT State : public Referenced
}
/** apply an attribute if required, passing in attribute and appropriate attribute stack */
inline const bool apply_attribute(const StateAttribute* attribute,AttributeStack& as)
inline const bool applyAttribute(const StateAttribute* attribute,AttributeStack& as)
{
if (as.last_applied_attribute != attribute)
{
@@ -206,7 +206,7 @@ class SG_EXPORT State : public Referenced
return false;
}
inline const bool apply_global_default_attribute(AttributeStack& as)
inline const bool applyGlobalDefaultAttribute(AttributeStack& as)
{
if (as.last_applied_attribute != as.global_default_attribute.get())
{

48
src/osg/State.cpp
View File

@@ -222,12 +222,12 @@ void State::apply(const StateSet* dstate)
if (!ms.valueVec.empty())
{
bool new_value = ms.valueVec.back() & StateAttribute::ON;
apply_mode(this_mitr->first,new_value,ms);
applyMode(this_mitr->first,new_value,ms);
}
else
{
// assume default of disabled.
apply_mode(this_mitr->first,ms.global_default_value,ms);
applyMode(this_mitr->first,ms.global_default_value,ms);
}
@@ -244,7 +244,7 @@ void State::apply(const StateSet* dstate)
ModeStack& ms = _modeMap[ds_mitr->first];
bool new_value = ds_mitr->second & StateAttribute::ON;
apply_mode(ds_mitr->first,new_value,ms);
applyMode(ds_mitr->first,new_value,ms);
// will need to disable this mode on next apply so set it to changed.
ms.changed = true;
@@ -267,7 +267,7 @@ void State::apply(const StateSet* dstate)
{
ms.changed = false;
bool new_value = ms.valueVec.back() & StateAttribute::ON;
apply_mode(this_mitr->first,new_value,ms);
applyMode(this_mitr->first,new_value,ms);
}
}
@@ -275,7 +275,7 @@ void State::apply(const StateSet* dstate)
{
// no override on or no previous entry, therefore consider incomming mode.
bool new_value = ds_mitr->second & StateAttribute::ON;
if (apply_mode(ds_mitr->first,new_value,ms))
if (applyMode(ds_mitr->first,new_value,ms))
{
ms.changed = true;
}
@@ -299,12 +299,12 @@ void State::apply(const StateSet* dstate)
if (!ms.valueVec.empty())
{
bool new_value = ms.valueVec.back() & StateAttribute::ON;
apply_mode(this_mitr->first,new_value,ms);
applyMode(this_mitr->first,new_value,ms);
}
else
{
// assume default of disabled.
apply_mode(this_mitr->first,ms.global_default_value,ms);
applyMode(this_mitr->first,ms.global_default_value,ms);
}
@@ -319,7 +319,7 @@ void State::apply(const StateSet* dstate)
ModeStack& ms = _modeMap[ds_mitr->first];
bool new_value = ds_mitr->second & StateAttribute::ON;
apply_mode(ds_mitr->first,new_value,ms);
applyMode(ds_mitr->first,new_value,ms);
// will need to disable this mode on next apply so set it to changed.
ms.changed = true;
@@ -348,11 +348,11 @@ void State::apply(const StateSet* dstate)
if (!as.attributeVec.empty())
{
const StateAttribute* new_attr = as.attributeVec.back().first;
apply_attribute(new_attr,as);
applyAttribute(new_attr,as);
}
else
{
apply_global_default_attribute(as);
applyGlobalDefaultAttribute(as);
}
}
@@ -367,7 +367,7 @@ void State::apply(const StateSet* dstate)
AttributeStack& as = _attributeMap[ds_aitr->first];
const StateAttribute* new_attr = ds_aitr->second.first.get();
apply_attribute(new_attr,as);
applyAttribute(new_attr,as);
// will need to disable this mode on next apply so set it to changed.
as.changed = true;
@@ -390,14 +390,14 @@ void State::apply(const StateSet* dstate)
{
as.changed = false;
const StateAttribute* new_attr = as.attributeVec.back().first;
apply_attribute(new_attr,as);
applyAttribute(new_attr,as);
}
}
else
{
// no override on or no previous entry, therefore consider incomming mode.
const StateAttribute* new_attr = ds_aitr->second.first.get();
if (apply_attribute(new_attr,as))
if (applyAttribute(new_attr,as))
{
as.changed = true;
}
@@ -421,11 +421,11 @@ void State::apply(const StateSet* dstate)
if (!as.attributeVec.empty())
{
const StateAttribute* new_attr = as.attributeVec.back().first;
apply_attribute(new_attr,as);
applyAttribute(new_attr,as);
}
else
{
apply_global_default_attribute(as);
applyGlobalDefaultAttribute(as);
}
}
}
@@ -440,7 +440,7 @@ void State::apply(const StateSet* dstate)
AttributeStack& as = _attributeMap[ds_aitr->first];
const StateAttribute* new_attr = ds_aitr->second.first.get();
apply_attribute(new_attr,as);
applyAttribute(new_attr,as);
// will need to update this attribute on next apply so set it to changed.
as.changed = true;
@@ -475,12 +475,12 @@ void State::apply()
if (!ms.valueVec.empty())
{
bool new_value = ms.valueVec.back() & StateAttribute::ON;
apply_mode(mitr->first,new_value,ms);
applyMode(mitr->first,new_value,ms);
}
else
{
// assume default of disabled.
apply_mode(mitr->first,ms.global_default_value,ms);
applyMode(mitr->first,ms.global_default_value,ms);
}
}
@@ -499,11 +499,11 @@ void State::apply()
if (!as.attributeVec.empty())
{
const StateAttribute* new_attr = as.attributeVec.back().first;
apply_attribute(new_attr,as);
applyAttribute(new_attr,as);
}
else
{
apply_global_default_attribute(as);
applyGlobalDefaultAttribute(as);
}
}
@@ -512,7 +512,7 @@ void State::apply()
}
/** mode has been set externally, update state to reflect this setting.*/
void State::have_applied_mode(const StateAttribute::GLMode mode,const StateAttribute::GLModeValue value)
void State::haveAppliedMode(const StateAttribute::GLMode mode,const StateAttribute::GLModeValue value)
{
ModeStack& ms = _modeMap[mode];
@@ -523,7 +523,7 @@ void State::have_applied_mode(const StateAttribute::GLMode mode,const StateAttri
}
/** mode has been set externally, update state to reflect this setting.*/
void State::have_applied_mode(const StateAttribute::GLMode mode)
void State::haveAppliedMode(const StateAttribute::GLMode mode)
{
ModeStack& ms = _modeMap[mode];
@@ -536,7 +536,7 @@ void State::have_applied_mode(const StateAttribute::GLMode mode)
}
/** attribute has been applied externally, update state to reflect this setting.*/
void State::have_applied_attribute(const StateAttribute* attribute)
void State::haveAppliedAttribute(const StateAttribute* attribute)
{
if (attribute)
{
@@ -549,7 +549,7 @@ void State::have_applied_attribute(const StateAttribute* attribute)
}
}
void State::have_applied_attribute(const StateAttribute::Type type)
void State::haveAppliedAttribute(const StateAttribute::Type type)
{
AttributeMap::iterator itr = _attributeMap.find(type);

4
src/osg/Texture.cpp
View File

@@ -565,7 +565,7 @@ void Texture::copyTexImage2D(State& state, int x, int y, int width, int height )
// cout<<"copyTexImage2D x="<<x<<" y="<<y<<" w="<<width<<" h="<<height<< std::endl;
// inform state that this texture is the current one bound.
state.have_applied_attribute(this);
state.haveAppliedAttribute(this);
}
void Texture::copyTexSubImage2D(State& state, int xoffset, int yoffset, int x, int y, int width, int height )
@@ -586,7 +586,7 @@ void Texture::copyTexSubImage2D(State& state, int xoffset, int yoffset, int x, i
glBindTexture( _target, handle );
// inform state that this texture is the current one bound.
state.have_applied_attribute(this);
state.haveAppliedAttribute(this);
}
else