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

@@ -34,7 +34,7 @@ Uniform::Uniform() :
}
Uniform::Uniform( const char* name, Type type ) :
Uniform::Uniform( const std::string& name, Type type ) :
_name(name), _type(type),_modifiedCount(0)
{
setDataVariance(STATIC);
@@ -89,6 +89,8 @@ void Uniform::removeParent(osg::StateSet* object)
bool Uniform::setType( Type t )
{
if (_type==t) return true;
if( _type != UNDEFINED )
{
osg::notify(osg::WARN) << "cannot change Uniform type" << std::endl;
@@ -721,6 +723,7 @@ bool Uniform::get( bool& b0, bool& b1, bool& b2, bool& b3 ) const
void Uniform::apply(const GL2Extensions* ext, GLint location) const
{
// osg::notify(osg::NOTICE) << "uniform at "<<location<<" "<<_name<< std::endl;
switch( getGlApiType(getType()) )
{
case FLOAT: