Added support for osg_FrameNumber, osg_FrameTime, osg_ViewMatrix, osg_InverseViewMatrix

into SceneView, controlled via a setActiveUniforms(.) method.
This commit is contained in:
Robert Osfield
2005-05-05 12:30:54 +00:00
parent c4e2e85aa1
commit 2798d58a41
6 changed files with 88 additions and 8 deletions

View File

@@ -307,6 +307,9 @@ class OSG_EXPORT StateSet : public Object
* Returns NULL if no matching Uniform is contained within StateSet.*/
Uniform* getUniform(const std::string& name);
/** Get Uniform for specified name, if one is not available create it, add it to this StateSet and return a pointer to it.*/
Uniform* getOrCreateUniform(const std::string& name, Uniform::Type type);
/** Get const Uniform for specified name.
* Returns NULL if no matching Uniform is contained within StateSet.*/
const Uniform* getUniform(const std::string& name) const;

View File

@@ -153,7 +153,7 @@ class OSG_EXPORT Uniform : public Object
public:
Uniform();
Uniform( const char* name, Type type );
Uniform( const std::string& name, Type type );
/** Copy constructor using CopyOp to manage deep vs shallow copy. */
Uniform(const Uniform& rhs, const CopyOp& copyop=CopyOp::SHALLOW_COPY);