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

From Lionel Lagarde, "this correct how the ParticleEffect are serialized :

Browse Source 
- the texture file name is taken from the TextFileName field
- the texture file name is written using writeString
"
This commit is contained in:
Robert Osfield 2009-01-30 14:54:22 +00:00
parent f394179baf
commit eae23b01c3
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/osgPlugins/osgParticle/IO_ParticleEffect.cpp
View File

@ -23,8 +23,8 @@ bool ParticleEffect_readLocalData(osg::Object& object, osgDB::Input& fr)
{
osgParticle::ParticleEffect& effect = static_cast<osgParticle::ParticleEffect&>(object);
bool itrAdvanced = false;
if (fr.matchSequence("position %s"))
if (fr.matchSequence("textFileName %s"))
{
effect.setTextureFileName(fr[1].getStr());
fr += 2;
@ -192,8 +192,7 @@ bool ParticleEffect_readLocalData(osg::Object& object, osgDB::Input& fr)
bool ParticleEffect_writeLocalData(const osg::Object& object, osgDB::Output& fw)
{
const osgParticle::ParticleEffect& effect = static_cast<const osgParticle::ParticleEffect&>(object);
fw.indent()<<"textFileName "<<effect.getTextureFileName()<<std::endl;
fw.indent()<<"textFileName "<<fw.wrapString(effect.getTextureFileName())<<std::endl;
fw.indent()<<"position "<<effect.getPosition()<<std::endl;
fw.indent()<<"scale "<<effect.getScale()<<std::endl;
fw.indent()<<"intensity "<<effect.getIntensity()<<std::endl;