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

Added setting of the current texture unit into the applyTextureAttribute() method.

Browse Source
This commit is contained in:
Robert Osfield
2002-12-09 21:03:02 +00:00
parent 6efe79c33c
commit 8d0718e8da
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/osg/State
View File

@@ -140,10 +140,15 @@ class SG_EXPORT State : public Referenced
inline bool applyTextureMode(unsigned int unit, StateAttribute::GLMode mode,bool enabled)
{
ModeMap& modeMap = getOrCreateTextureModeMap(unit);
ModeStack& ms = modeMap[mode];
ms.changed = true;
return applyMode(mode,enabled,ms);
if (setActiveTextureUnit(unit))
{
ModeMap& modeMap = getOrCreateTextureModeMap(unit);
ModeStack& ms = modeMap[mode];
ms.changed = true;
return applyMode(mode,enabled,ms);
}
else
return false;
}
/** Apply an attribute if required. */
@@ -156,10 +161,15 @@ class SG_EXPORT State : public Referenced
inline bool applyTextureAttribute(unsigned int unit, const StateAttribute* attribute)
{
AttributeMap& attributeMap = getOrCreateTextureAttributeMap(unit);
AttributeStack& as = attributeMap[attribute->getType()];
as.changed = true;
return applyAttribute(attribute,as);
if (setActiveTextureUnit(unit))
{
AttributeMap& attributeMap = getOrCreateTextureAttributeMap(unit);
AttributeStack& as = attributeMap[attribute->getType()];
as.changed = true;
return applyAttribute(attribute,as);
}
else
return false;
}
/** Mode has been set externally, update state to reflect this setting.*/