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

Improvements to MultiTextureControl and texture layer handling in osgTerrain::DataSet.

Browse Source
This commit is contained in:
Robert Osfield
2005-03-09 20:40:31 +00:00
parent 6a103aa413
commit 929601f070
2 changed files with 53 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/osgFX/MultiTextureControl.cpp
View File

@@ -46,12 +46,31 @@ void MultiTextureControl::updateStateSet()
stateset->clear();
if (_textureWeightList.size()==1)
unsigned int numTextureUnitsOn = 0;
unsigned int unit;
for(unit=0;unit<_textureWeightList.size();++unit)
{
osg::TexEnv* texenv = new osg::TexEnv(osg::TexEnv::MODULATE);
stateset->setTextureAttribute(0, texenv);
if (_textureWeightList[unit]>0.0f) ++numTextureUnitsOn;
}
if (_textureWeightList.size()==2)
if (numTextureUnitsOn<=1)
{
for(unit=0;unit<_textureWeightList.size();++unit)
{
if (_textureWeightList[unit]>0.0f)
{
osg::TexEnv* texenv = new osg::TexEnv(osg::TexEnv::MODULATE);
stateset->setTextureAttribute(unit, texenv);
stateset->setTextureMode(unit, GL_TEXTURE_2D, osg::StateAttribute::ON);
}
else
{
stateset->setTextureMode(unit, GL_TEXTURE_2D, osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE);
}
}
}
else if (_textureWeightList.size()==2)
{
{
osg::TexEnvCombine* texenv = new osg::TexEnvCombine;
@@ -80,7 +99,7 @@ void MultiTextureControl::updateStateSet()
stateset->setTextureAttribute(1, texenv);
}
}
if (_textureWeightList.size()==3)
else if (_textureWeightList.size()==3)
{
float b = (_textureWeightList[0]+_textureWeightList[1])/(_textureWeightList[0]+_textureWeightList[1]+_textureWeightList[2]);
float a = _textureWeightList[0]/(_textureWeightList[0]+_textureWeightList[1]);