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

spt: Put the sea level textured tiles also under a transform node.

Browse Source
This commit is contained in:
Mathias Froehlich 2013-01-20 15:33:25 +01:00
parent f4e694afa7
commit 2d72bf4308
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
simgear/scene/tgdb/ReaderWriterSPT.cxx
View File

@ -27,6 +27,7 @@
#include <osg/CullFace> #include <osg/CullFace>
#include <osg/PagedLOD> #include <osg/PagedLOD>
#include <osg/MatrixTransform>
#include <osg/Texture2D> #include <osg/Texture2D>
#include <osgDB/FileNameUtils> #include <osgDB/FileNameUtils>
@ -269,6 +270,10 @@ ReaderWriterSPT::createSeaLevelTile(const BucketBox& bucketBox, const osgDB::Opt
if (options->getPluginStringData("SimGear::FG_EARTH") != "ON") if (options->getPluginStringData("SimGear::FG_EARTH") != "ON")
return 0; return 0;
SGSpheref sphere = bucketBox.getBoundingSphere();
osg::Matrixd transform;
transform.makeTranslate(toOsg(-sphere.getCenter()));
osg::Vec3Array* vertices = new osg::Vec3Array; osg::Vec3Array* vertices = new osg::Vec3Array;
osg::Vec3Array* normals = new osg::Vec3Array; osg::Vec3Array* normals = new osg::Vec3Array;
osg::Vec2Array* texCoords = new osg::Vec2Array; osg::Vec2Array* texCoords = new osg::Vec2Array;
@ -286,7 +291,7 @@ ReaderWriterSPT::createSeaLevelTile(const BucketBox& bucketBox, const osgDB::Opt
SGVec2f t[6]; SGVec2f t[6];
unsigned num = bucketBox.getTileTriangles(i, j, incx, incy, v, n, t); unsigned num = bucketBox.getTileTriangles(i, j, incx, incy, v, n, t);
for (unsigned k = 0; k < num; ++k) { for (unsigned k = 0; k < num; ++k) {
vertices->push_back(toOsg(v[k])); vertices->push_back(transform.preMult(toOsg(v[k])));
normals->push_back(toOsg(n[k])); normals->push_back(toOsg(n[k]));
texCoords->push_back(toOsg(t[k])); texCoords->push_back(toOsg(t[k]));
} }
@ -308,14 +313,22 @@ ReaderWriterSPT::createSeaLevelTile(const BucketBox& bucketBox, const osgDB::Opt
geometry->setColorBinding(osg::Geometry::BIND_OVERALL); geometry->setColorBinding(osg::Geometry::BIND_OVERALL);
geometry->setTexCoordArray(0, texCoords); geometry->setTexCoordArray(0, texCoords);
geometry->addPrimitiveSet(new osg::DrawArrays(osg::DrawArrays::TRIANGLES, 0, vertices->size())); osg::DrawArrays* drawArrays = new osg::DrawArrays(osg::DrawArrays::TRIANGLES, 0, vertices->size());
drawArrays->setDataVariance(osg::Object::STATIC);
geometry->addPrimitiveSet(drawArrays);
osg::Geode* geode = new osg::Geode; osg::Geode* geode = new osg::Geode;
geode->setDataVariance(osg::Object::STATIC);
geode->addDrawable(geometry); geode->addDrawable(geometry);
osg::ref_ptr<osg::StateSet> stateSet = getLowLODStateSet(options); osg::ref_ptr<osg::StateSet> stateSet = getLowLODStateSet(options);
geode->setStateSet(stateSet.get()); geode->setStateSet(stateSet.get());
return geode; transform.makeTranslate(toOsg(sphere.getCenter()));
osg::MatrixTransform* matrixTransform = new osg::MatrixTransform(transform);
matrixTransform->setDataVariance(osg::Object::STATIC);
matrixTransform->addChild(geode);
return matrixTransform;
} }
osg::ref_ptr<osg::StateSet> osg::ref_ptr<osg::StateSet>