Changeset 3202

Timestamp:

07/28/04 21:56:22 (9 years ago)

Author:

robert

Message:

Fixed compare(ProgramObject?) and added UniformeValue::compare and ShaderObject::compare
to support proper sorting of shaders.

Location:

OpenSceneGraph/trunk

Files:

• include/osgGL2/ProgramObject (modified) (3 diffs)
• include/osgGL2/UniformValue (modified) (2 diffs)
• src/osgGL2/ProgramObject.cpp (modified) (2 diffs)
• src/osgGL2/UniformValue.cpp (modified) (1 diff)

OpenSceneGraph/trunk/include/osgGL2/ProgramObject

@@ -69 +69 @@
 
         /** return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs.*/
-        virtual int compare(const osg::StateAttribute& sa) const
-        {
-            // check the types are equal and then create the rhs variable
-            // used by the COMPARE_StateAttribute_Paramter macro's below.
-            COMPARE_StateAttribute_Types(ProgramObject,sa)
-
-            // compare each parameter in turn against the rhs.
-            COMPARE_StateAttribute_Parameter(_shaderObjectList);
-            // COMPARE_StateAttribute_Parameter(_pcpoList);
-
-            return 0; // passed all the above comparison macro's, must be equal.
-        }
+        virtual int compare(const osg::StateAttribute& sa) const;
 
         /** If enabled, install our shader program in the GL pipeline,
@@ -183 +172 @@
     protected:  /*data*/
         bool _enabled;
-        std::vector< ShaderObjectPtr > _shaderObjectList;
+        
+        typedef std::vector< ShaderObjectPtr > ShaderObjectList;
+        ShaderObjectList _shaderObjectList;
         mutable osg::buffered_value< osg::ref_ptr<PerContextProgObj> > _pcpoList;
         mutable int _frameNumberOfLastPCPOUpdate;
@@ -219 +210 @@
         ShaderObject(const ShaderObject& rhs, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
         META_Object(osgGL2, ShaderObject);
+
+        int compare(const ShaderObject& sa) const;
 
         // data access methods.

OpenSceneGraph/trunk/include/osgGL2/UniformValue

@@ -49 +49 @@
         virtual void apply( Extensions *ext, const GLhandleARB progObj ) const = 0;
 
+        virtual int compare(const UniformValue& uv) const;
+
     protected:
         UniformValue( const char* uniformName ) : _name( uniformName ) {};
@@ -74 +76 @@
         UniformValueTemplate( const char* uniformName, T value ) :
                 UniformValue( uniformName ), _value( value ) {}
+
         virtual void apply( Extensions *ext, const GLhandleARB progObj ) const;
+
+        virtual int compare(const UniformValue& uv) const 
+        {
+            if (this==&uv) return 0;
+            const std::type_info* type_lhs = &typeid(*this);
+            const std::type_info* type_rhs = &typeid(uv);
+            if (type_lhs->before(*type_rhs)) return -1;
+            if (*type_lhs != *type_rhs) return 1;
+            const UniformValueTemplate& rhs = static_cast<const UniformValueTemplate&>(uv);
+
+            if (_name<rhs._name) return -1;
+            if (rhs._name<_name) return 1;
+
+            if (_value<rhs._value) return -1;
+            if (rhs._value<_value) return 1;
+
+            return 0;
+        }
 
     protected:

OpenSceneGraph/trunk/src/osgGL2/ProgramObject.cpp

@@ -172 +172 @@
 }
 
+int ProgramObject::compare(const osg::StateAttribute& sa) const
+{
+    // check the types are equal and then create the rhs variable
+    // used by the COMPARE_StateAttribute_Paramter macro's below.
+    COMPARE_StateAttribute_Types(ProgramObject,sa)
+    
+    if (_shaderObjectList.size()<rhs._shaderObjectList.size()) return -1;
+    if (_shaderObjectList.size()>rhs._shaderObjectList.size()) return 1;
+    
+    ShaderObjectList::const_iterator litr=_shaderObjectList.begin();
+    ShaderObjectList::const_iterator ritr=rhs._shaderObjectList.begin();
+    for(;
+        litr!=_shaderObjectList.end();
+        ++litr,++ritr)
+    {
+        int result = (*litr)->compare(*(*ritr));
+        if (result!=0) return result;
+    }
+    
+
+    if (_univalList.size()<rhs._univalList.size()) return -1;
+    if (_univalList.size()>rhs._univalList.size()) return 1;
+
+    UniformValueList::const_iterator luitr=_univalList.begin();
+    UniformValueList::const_iterator ruitr=rhs._univalList.begin();
+    for(;
+        luitr!=_univalList.end();
+        ++luitr,++ruitr)
+    {
+        int result = (*luitr)->compare(*(*ruitr));
+        if (result!=0) return result;
+    }
+
+    return 0; // passed all the above comparison macro's, must be equal.
+}
+
 
 // mark all PCPOs as needing a relink
@@ -414 +450 @@
 {
     /*TODO*/
+}
+
+int ShaderObject::compare(const ShaderObject& so) const
+{
+    if (getShaderSource()<so.getShaderSource()) return -1;
+    if (so.getShaderSource()<getShaderSource()) return 1;
+    return 0;
 }
 

OpenSceneGraph/trunk/src/osgGL2/UniformValue.cpp

@@ -25 +25 @@
 using namespace osgGL2;
 using namespace osg;
+
+int UniformValue::compare(const UniformValue& uv) const
+{
+    if (_name<uv._name) return -1;
+    if (uv._name<_name) return 1;
+    return 0;
+}
 
 int UniformValue::getLocation( Extensions *ext, const GLhandleARB progObj ) const