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

Merge pull request #215 from LaurensVoerman/submit-SerializerParticle

Browse Source 
Submit serializer particle
This commit is contained in:
OpenSceneGraph git repository 2017-03-13 14:25:33 +00:00 committed by GitHub
commit c364bbb19b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgWrappers/serializers/osgParticle/Particle.cpp
View File

@ -36,7 +36,7 @@ bool readParticle( osgDB::InputStream& is, osgParticle::Particle& p )
if ( hasInterpolator ) if ( hasInterpolator )
{ {
is >> is.BEGIN_BRACKET; is >> is.BEGIN_BRACKET;
p.setAlphaInterpolator( is.readObjectOfType<osgParticle::Interpolator>() ); p.setSizeInterpolator( is.readObjectOfType<osgParticle::Interpolator>() );
is >> is.END_BRACKET; is >> is.END_BRACKET;
} }
is >> is.PROPERTY("AlphaInterpolator") >> hasInterpolator; is >> is.PROPERTY("AlphaInterpolator") >> hasInterpolator;
@ -50,7 +50,7 @@ bool readParticle( osgDB::InputStream& is, osgParticle::Particle& p )
if ( hasInterpolator ) if ( hasInterpolator )
{ {
is >> is.BEGIN_BRACKET; is >> is.BEGIN_BRACKET;
p.setAlphaInterpolator( is.readObjectOfType<osgParticle::Interpolator>() ); p.setColorInterpolator( is.readObjectOfType<osgParticle::Interpolator>() );
is >> is.END_BRACKET; is >> is.END_BRACKET;
} }
@ -81,8 +81,8 @@ bool readParticle( osgDB::InputStream& is, osgParticle::Particle& p )
is >> is.END_BRACKET; is >> is.END_BRACKET;
} }
is >> is.END_BRACKET;
} }
is >> is.END_BRACKET;
return true; return true;
} }