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

Tidied up the types in osg::GeoSet so that the index pointers use GLushort

Browse Source 
and GLuint to get round compile issues under MacOSX.
This commit is contained in:
Robert Osfield
2002-07-10 22:33:08 +00:00
parent 8b1e9345df
commit 5d18f0ee11
4 changed files with 54 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/osg/State.cpp
View File

@@ -3,6 +3,8 @@
#include <osg/GLU>
#include <algorithm>
using namespace osg;
State::State()
@@ -188,9 +190,9 @@ void State::apply(const StateSet* dstate)
const StateSet::TextureAttributeList& ds_textureAttributeList = dstate->getTextureAttributeList();
unsigned int unit;
unsigned int unitMax = std::max(ds_textureModeList.size(),ds_textureAttributeList.size());
unitMax = std::max(unitMax,_textureModeMapList.size());
unitMax = std::max(unitMax,_textureAttributeMapList.size());
unsigned int unitMax = std::max(static_cast<unsigned int>(ds_textureModeList.size()),static_cast<unsigned int>(ds_textureAttributeList.size()));
unitMax = std::max(static_cast<unsigned int>(unitMax),static_cast<unsigned int>(_textureModeMapList.size()));
unitMax = std::max(static_cast<unsigned int>(unitMax),static_cast<unsigned int>(_textureAttributeMapList.size()));
for(unit=0;unit<unitMax;++unit)
{
if (setActiveTextureUnit(unit))