#include <simgear/math/sg_geodesy.hxx>
#include <simgear/math/sg_types.hxx>
#include <simgear/misc/texcoord.hxx>
+#include <simgear/scene/material/Effect.hxx>
+#include <simgear/scene/material/EffectGeode.hxx>
#include <simgear/scene/material/mat.hxx>
#include <simgear/scene/material/matlib.hxx>
+
#include <simgear/scene/util/VectorArrayAdapter.hxx>
using namespace simgear;
for (int j = 0; j < latPoints; j++) {
for (int i = 0; i < lonPoints; ++i) {
- vlArray(j, i) = rel[j][i].osg();
- nlArray(j, i) = normals[j][i].osg();
- tlArray(j, i) = texsArray(j, i).toSGVec2f().osg();
+ vlArray(j, i) = toOsg(rel[j][i]);
+ nlArray(j, i) = toOsg(normals[j][i]);
+ tlArray(j, i) = toOsg(texsArray(j, i).toSGVec2f());
}
}
osg::Node* SGOceanTile(const SGBucket& b, SGMaterialLib *matlib)
{
- osg::StateSet *stateSet = 0;
+ Effect *effect = 0;
double tex_width = 1000.0;
tex_width = mat->get_xsize();
// set OSG State
- stateSet = mat->get_state();
+ effect = mat->get_effect();
} else {
SG_LOG( SG_TERRAIN, SG_ALERT, "Ack! unknown use material name = Ocean");
}
+ 2 * (latPoints - 1)));
fillDrawElementsWithApron(latPoints, lonPoints, drawElements->begin());
geometry->addPrimitiveSet(drawElements);
- geometry->setStateSet(stateSet);
- osg::Geode* geode = new osg::Geode;
+ EffectGeode* geode = new EffectGeode;
geode->setName("Ocean tile");
+ geode->setEffect(effect);
geode->addDrawable(geometry);
+ geode->runGenerators(geometry);
osg::MatrixTransform* transform = new osg::MatrixTransform;
transform->setName("Ocean");
- transform->setMatrix(osg::Matrix::rotate(hlOr.osg())*
- osg::Matrix::translate(cartCenter.osg()));
+ transform->setMatrix(osg::Matrix::rotate(toOsg(hlOr))*
+ osg::Matrix::translate(toOsg(cartCenter)));
transform->addChild(geode);
return transform;