Changeset 9989 for OpenSceneGraph/trunk/src/osg/StateSet.cpp

Timestamp:

04/08/09 14:32:52 (4 years ago)

Author:

robert

Message:

From Simon Carmody, "Patches for compare and copy of Programs and related state
-Added copying of shaders and attributes in osg::Program copy constructor.
-Changed StateSet::compare function to compare Uniforms and their
override values. Previously it compared a RefUniformPair?."

Files:

• OpenSceneGraph/trunk/src/osg/StateSet.cpp (modified) (1 diff)

OpenSceneGraph/trunk/src/osg/StateSet.cpp

@@ -426 +426 @@
         if      (lhs_uniform_itr->first<rhs_uniform_itr->first) return -1;
         else if (rhs_uniform_itr->first<lhs_uniform_itr->first) return 1;
-        if      (lhs_uniform_itr->second<rhs_uniform_itr->second) return -1;
-        else if (rhs_uniform_itr->second<lhs_uniform_itr->second) return 1;
+        if      (*lhs_uniform_itr->second.first<*rhs_uniform_itr->second.first) return -1;
+        else if (*rhs_uniform_itr->second.first<*lhs_uniform_itr->second.first) return 1;
+        if      (lhs_uniform_itr->second.second<rhs_uniform_itr->second.second) return -1;
+        else if (rhs_uniform_itr->second.second<lhs_uniform_itr->second.second) return 1;
         ++lhs_uniform_itr;
         ++rhs_uniform_itr;