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

Added next stage of support for osg::Uniform in .osg plugin

Browse Source
This commit is contained in:
Robert Osfield
2005-04-18 12:34:28 +00:00
parent 0a995f8093
commit 648677ce44
5 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/osgPlugins/osg/StateSet.cpp
View File

@@ -385,6 +385,13 @@ bool StateSet_readLocalData(Object& obj, Input& fr)
}
}
// new code using osg::Registry's list of prototypes to loaded attributes.
Uniform* uniform = NULL;
while((uniform=fr.readUniform())!=NULL)
{
stateset.addUniform(uniform);
iteratorAdvanced = true;
}
// new code using osg::Registry's list of prototypes to loaded attributes.
@@ -515,8 +522,6 @@ bool StateSet_writeLocalData(const Object& obj, Output& fw)
const StateSet::ModeList& ml = stateset.getModeList();
const StateSet::AttributeList& sl = stateset.getAttributeList();
for(StateSet::ModeList::const_iterator mitr=ml.begin();
mitr!=ml.end();
++mitr)
@@ -533,12 +538,22 @@ bool StateSet_writeLocalData(const Object& obj, Output& fw)
}
}
const StateSet::UniformList& ul = stateset.getUniformList();
for(StateSet::UniformList::const_iterator uitr=ul.begin();
uitr!=ul.end();
++uitr)
{
fw.writeObject(*(uitr->second.first));
}
const StateSet::AttributeList& sl = stateset.getAttributeList();
for(StateSet::AttributeList::const_iterator sitr=sl.begin();
sitr!=sl.end();
++sitr)
{
fw.writeObject(*(sitr->second.first));
}
const StateSet::TextureModeList& tml = stateset.getTextureModeList();
const StateSet::TextureAttributeList& tal = stateset.getTextureAttributeList();