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

Fixes for win32 build

Browse Source
This commit is contained in:
Robert Osfield
2002-07-11 12:57:53 +00:00
parent cd3c2c0b77
commit b015d80d68
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/osgPlugins/osg/StateSet.cpp
View File

@@ -467,6 +467,13 @@ bool StateSet_readLocalData(Object& obj, Input& fr)
return iteratorAdvanced;
}
// visual studio 6.0 doesn't appear to define std::max?!? So do our own here..
template<class T>
T mymax(const T& a,const T& b)
{
return (((a) > (b)) ? (a) : (b));
}
bool StateSet_writeLocalData(const Object& obj, Output& fw)
{
@@ -528,7 +535,7 @@ bool StateSet_writeLocalData(const Object& obj, Output& fw)
const StateSet::TextureModeList& tml = stateset.getTextureModeList();
const StateSet::TextureAttributeList& tal = stateset.getTextureAttributeList();
unsigned int maxUnit = std::max(tml.size(),tal.size());
unsigned int maxUnit = mymax(tml.size(),tal.size());
for(unsigned int unit=0;unit<maxUnit;++unit)
{
fw.indent()<<"textureUnit "<<unit<<" {"<< std::endl;