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

Ported all the demos and loaders across to use the new multitexturing API.

Browse Source
This commit is contained in:
Robert Osfield
2002-07-10 11:22:24 +00:00
parent 46af97727a
commit c1fc3dcdb9
19 changed files with 105 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgPlugins/txp/TrPageParser.cpp
View File

@@ -672,7 +672,7 @@ void TrPageParser::LoadLocalMaterials()
break;
}
osg_state_set->setAttribute(osg_texenv);
osg_state_set->setTextureAttribute(0,osg_texenv);
Texture* osg_texture = GetLocalTexture(image_helper,&locmat, tex);
@@ -687,7 +687,7 @@ void TrPageParser::LoadLocalMaterials()
osg_state_set->setRenderingHint(StateSet::TRANSPARENT_BIN);
}
}
osg_state_set->setAttributeAndModes(osg_texture, StateAttribute::ON);
osg_state_set->setTextureAttributeAndModes(0,osg_texture, StateAttribute::ON);
int wrap_s, wrap_t;
texEnv.GetWrap(wrap_s, wrap_t);