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

From Pierre Haritchablaet, "The wind vector of osgParticle::FluidFrictionOperator has not been written and read in IO_FluidFrictionOperator. This patch fixes osg plug'in FluidFrictionOperator_readLocalData and FluidFrictionOperator_writeLocalData."

Browse Source
This commit is contained in:
Robert Osfield
2009-02-02 14:50:19 +00:00
parent 2d55740b3e
commit 3d1c38f5e8
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/osgPlugins/osgParticle/IO_FluidFrictionOperator.cpp
View File

@@ -1,6 +1,8 @@
#include <osgParticle/FluidFrictionOperator>
#include <osg/io_utils>
#include <osgDB/Registry>
#include <osgDB/Input>
#include <osgDB/Output>
@@ -25,6 +27,7 @@ bool FluidFrictionOperator_readLocalData(osg::Object &obj, osgDB::Input &fr)
bool itAdvanced = false;
float f;
osg::Vec3 w;
if (fr[0].matchWord("fluidDensity")) {
if (fr[1].getFloat(f)) {
@@ -50,6 +53,14 @@ bool FluidFrictionOperator_readLocalData(osg::Object &obj, osgDB::Input &fr)
}
}
if (fr[0].matchWord("wind")) {
if (fr[1].getFloat(w.x()) && fr[2].getFloat(w.y()) && fr[3].getFloat(w.z())) {
aop.setWind(w);
fr += 4;
itAdvanced = true;
}
}
return itAdvanced;
}
@@ -58,6 +69,9 @@ bool FluidFrictionOperator_writeLocalData(const osg::Object &obj, osgDB::Output
const osgParticle::FluidFrictionOperator &aop = static_cast<const osgParticle::FluidFrictionOperator &>(obj);
fw.indent() << "fluidDensity " << aop.getFluidDensity() << std::endl;
fw.indent() << "fluidViscosity " << aop.getFluidViscosity() << std::endl;
fw.indent() << "overrideRadius " << aop.getOverrideRadius();
fw.indent() << "overrideRadius " << aop.getOverrideRadius() << std::endl;
osg::Vec3 w = aop.getWind();
fw.indent() << "wind " << w << std::endl;
return true;
}