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 11:36:25 +00:00
parent eca5797ae4
commit cd3c2c0b77
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/osg/Primitive
View File

@@ -34,7 +34,7 @@ public:
VectorSizei(): inherited() {}
explicit VectorSizei(size_type n): inherited(n) {}
VectorSizei(const VectorSizei &copy): inherited(copy) {}
VectorSizei(value_type *beg_, value_type *end_): inherited(beg_, end_) {}
//VectorSizei(value_type *beg_, value_type *end_): inherited(beg_, end_) {}
template<class InputIterator>
VectorSizei(InputIterator beg_, InputIterator end_): inherited(beg_, end_) {}
};
@@ -45,7 +45,7 @@ public:
VectorUByte(): inherited() {}
explicit VectorUByte(size_type n): inherited(n) {}
VectorUByte(const VectorUByte &copy): inherited(copy) {}
VectorUByte(value_type *beg_, value_type *end_): inherited(beg_, end_) {}
//VectorUByte(value_type *beg_, value_type *end_): inherited(beg_, end_) {}
template<class InputIterator>
VectorUByte(InputIterator beg_, InputIterator end_): inherited(beg_, end_) {}
};
@@ -56,7 +56,7 @@ public:
VectorUShort(): inherited() {}
explicit VectorUShort(size_type n): inherited(n) {}
VectorUShort(const VectorUShort &copy): inherited(copy) {}
VectorUShort(value_type *beg_, value_type *end_): inherited(beg_, end_) {}
//VectorUShort(value_type *beg_, value_type *end_): inherited(beg_, end_) {}
template<class InputIterator>
VectorUShort(InputIterator beg_, InputIterator end_): inherited(beg_, end_) {}
};
@@ -67,7 +67,7 @@ public:
VectorUInt(): inherited() {}
explicit VectorUInt(size_type n): inherited(n) {}
VectorUInt(const VectorUInt &copy): inherited(copy) {}
VectorUInt(value_type *beg_, value_type *end_): inherited(beg_, end_) {}
//VectorUInt(value_type *beg_, value_type *end_): inherited(beg_, end_) {}
template<class InputIterator>
VectorUInt(InputIterator beg_, InputIterator end_): inherited(beg_, end_) {}
};

14
src/osg/State.cpp
View File

@@ -172,6 +172,12 @@ void State::captureCurrentState(StateSet& stateset) const
}
// 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));
}
void State::apply(const StateSet* dstate)
{
@@ -190,9 +196,9 @@ void State::apply(const StateSet* dstate)
const StateSet::TextureAttributeList& ds_textureAttributeList = dstate->getTextureAttributeList();
unsigned int unit;
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()));
unsigned int unitMax = mymax(static_cast<unsigned int>(ds_textureModeList.size()),static_cast<unsigned int>(ds_textureAttributeList.size()));
unitMax = mymax(static_cast<unsigned int>(unitMax),static_cast<unsigned int>(_textureModeMapList.size()));
unitMax = mymax(static_cast<unsigned int>(unitMax),static_cast<unsigned int>(_textureAttributeMapList.size()));
for(unit=0;unit<unitMax;++unit)
{
if (setActiveTextureUnit(unit))
@@ -225,7 +231,7 @@ void State::apply()
applyAttributeMap(_attributeMap);
unsigned int unit;
unsigned int unitMax = std::max(_textureModeMapList.size(),_textureAttributeMapList.size());
unsigned int unitMax = mymax(_textureModeMapList.size(),_textureAttributeMapList.size());
for(unit=0;unit<unitMax;++unit)
{
if (setActiveTextureUnit(unit))