Merge branches 'ehofman/config' and 'ehofman/dlerror'

[simgear.git] / simgear / scene / tgdb / SGOceanTile.cxx

diff --git a/simgear/scene/tgdb/SGOceanTile.cxx b/simgear/scene/tgdb/SGOceanTile.cxx
index 9ff60f3e0c8729b84371968b5bef7ef0af3655fe..337a3103e0b2de1025440200a23615e1744f27ad 100644 (file)
--- a/simgear/scene/tgdb/SGOceanTile.cxx
+++ b/simgear/scene/tgdb/SGOceanTile.cxx
@@ -140,9 +140,9 @@ void OceanMesh::calcMesh(const SGVec3d& cartCenter, const SGQuatd& orient,
   
     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());
         }
     }
 
@@ -310,11 +310,12 @@ osg::Node* SGOceanTile(const SGBucket& b, SGMaterialLib *matlib)
     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;