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

Fixed compare(ProgramObject) and added UniformeValue::compare and ShaderObject::compare

Browse Source 
to support proper sorting of shaders.
This commit is contained in:
Robert Osfield
2004-07-28 19:56:22 +00:00
parent 40a1a39bff
commit 3d61e25cce
4 changed files with 77 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/osgGL2/ProgramObject
View File

@@ -68,18 +68,7 @@ class OSGGL2_EXPORT ProgramObject : public osg::StateAttribute
META_StateAttribute(osgGL2, ProgramObject, PROGRAMOBJECT);
/** 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,
* performing any shader program rebuild operations that might
@@ -182,7 +171,9 @@ class OSGGL2_EXPORT ProgramObject : public osg::StateAttribute
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;
mutable UniformValueList _univalList;
@@ -219,6 +210,8 @@ class OSGGL2_EXPORT ShaderObject : public osg::Object
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.
/** Load the ShaderObject's source code text from a string. */

21
include/osgGL2/UniformValue
View File

@@ -48,6 +48,8 @@ class UniformValue : public osg::Referenced
public:
virtual void apply( Extensions *ext, const GLhandleARB progObj ) const = 0;
virtual int compare(const UniformValue& uv) const;
protected:
UniformValue( const char* uniformName ) : _name( uniformName ) {};
virtual ~UniformValue() {};
@@ -73,8 +75,27 @@ class UniformValueTemplate: public UniformValue
public:
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:
UniformValueTemplate();
const T _value;