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

Further work on uniforms support in .osg

Browse Source
This commit is contained in:
Robert Osfield
2005-04-18 13:36:10 +00:00
parent 59ec503fc9
commit b699c8e9ab
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/osgPlugins/osg/Uniform.cpp
View File

@@ -41,10 +41,10 @@ bool Uniform_readLocalData(Object& obj, Input& fr)
// TODO read uniform value based on type
if (fr.matchSequence("type %w"))
if (fr[0].isWord())
{
uniform.setType( Uniform::getTypeId(fr[1].getStr()) );
fr+=2;
uniform.setType( Uniform::getTypeId(fr[0].getStr()) );
fr+=1;
iteratorAdvanced = true;
}
@@ -227,6 +227,10 @@ bool Uniform_readLocalData(Object& obj, Input& fr)
osg::notify(osg::WARN)<<"Warning : type not supported for reading."<<std::endl;
break;
}
case(osg::Uniform::UNDEFINED):
{
break;
}
}
return iteratorAdvanced;
@@ -240,7 +244,7 @@ bool Uniform_writeLocalData(const Object& obj,Output& fw)
fw.indent() << "name "<< fw.wrapString(uniform.getName()) << std::endl;
fw.indent() << "type " << Uniform::getTypename( uniform.getType() ) << " ";
fw.indent() << Uniform::getTypename( uniform.getType() ) << " ";
switch(uniform.getType())
{
@@ -373,6 +377,10 @@ bool Uniform_writeLocalData(const Object& obj,Output& fw)
osg::notify(osg::WARN)<<"Warning : type not supported for writing."<<std::endl;
break;
}
case(osg::Uniform::UNDEFINED):
{
break;
}
}
fw << std::endl;