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

Changed the ordering of comparing modes and attributes in

Browse Source 
osg::StateAttribute::compare() as part of an investigration into state sorting.
This commit is contained in:
Robert Osfield 2001-10-04 14:39:24 +00:00
parent d5ed4e2305
commit d5bff10797
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/osg/StateSet.cpp
View File

@ -31,25 +31,6 @@ StateSet::~StateSet()
int StateSet::compare(const StateSet& rhs) const int StateSet::compare(const StateSet& rhs) const
{ {
// check to see how the modes compare.
ModeList::const_iterator lhs_mode_itr = _modeList.begin();
ModeList::const_iterator rhs_mode_itr = rhs._modeList.begin();
while (lhs_mode_itr!=_modeList.end() && rhs_mode_itr!=rhs._modeList.end())
{
if (lhs_mode_itr->first<rhs_mode_itr->first) return -1;
else if (rhs_mode_itr->first<lhs_mode_itr->first) return 1;
if (lhs_mode_itr->second<rhs_mode_itr->second) return -1;
else if (rhs_mode_itr->second<lhs_mode_itr->second) return 1;
++lhs_mode_itr;
++rhs_mode_itr;
}
if (lhs_mode_itr==_modeList.end())
{
if (rhs_mode_itr!=rhs._modeList.end()) return -1;
}
else if (rhs_mode_itr == rhs._modeList.end()) return 1;
// we've got here so modes must be equal...
// now check to see how the attributes compare. // now check to see how the attributes compare.
AttributeList::const_iterator lhs_attr_itr = _attributeList.begin(); AttributeList::const_iterator lhs_attr_itr = _attributeList.begin();
@ -71,6 +52,27 @@ int StateSet::compare(const StateSet& rhs) const
} }
else if (rhs_attr_itr == rhs._attributeList.end()) return 1; else if (rhs_attr_itr == rhs._attributeList.end()) return 1;
// we've got here so attributes must be equal...
// check to see how the modes compare.
ModeList::const_iterator lhs_mode_itr = _modeList.begin();
ModeList::const_iterator rhs_mode_itr = rhs._modeList.begin();
while (lhs_mode_itr!=_modeList.end() && rhs_mode_itr!=rhs._modeList.end())
{
if (lhs_mode_itr->first<rhs_mode_itr->first) return -1;
else if (rhs_mode_itr->first<lhs_mode_itr->first) return 1;
if (lhs_mode_itr->second<rhs_mode_itr->second) return -1;
else if (rhs_mode_itr->second<lhs_mode_itr->second) return 1;
++lhs_mode_itr;
++rhs_mode_itr;
}
if (lhs_mode_itr==_modeList.end())
{
if (rhs_mode_itr!=rhs._modeList.end()) return -1;
}
else if (rhs_mode_itr == rhs._modeList.end()) return 1;
return 0; return 0;
} }