Make lat/lon points in the ocean tile configurable at run-time. Not hooked up to...

diff --git a/simgear/scene/tgdb/SGOceanTile.cxx b/simgear/scene/tgdb/SGOceanTile.cxx
index 2907bbacd691bf3a1e4b86fe92742e2bdbde69cd..def796cd293e01a8fb237c3e0540b12c77900a63 100644 (file)
--- a/simgear/scene/tgdb/SGOceanTile.cxx
+++ b/simgear/scene/tgdb/SGOceanTile.cxx
@@ -60,12 +60,11 @@ using namespace simgear;
 // it may be superfluous for such a small mesh.
 namespace
 {
-const int lonPoints = 5;
-const int latPoints = 5;
-
 class OceanMesh {
 public:
-    OceanMesh():
+    OceanMesh(int latP, int lonP):
+        latPoints(latP),
+        lonPoints(lonP),
         geoPoints(latPoints * lonPoints + 2 * (lonPoints + latPoints)),
         geod_nodes(latPoints * lonPoints),
         vl(new osg::Vec3Array(geoPoints)),
@@ -75,11 +74,24 @@ public:
         nlArray(*nl, lonPoints + 2, lonPoints, 1),
         tlArray(*tl, lonPoints + 2, lonPoints, 1)
     {
+        int numPoints = latPoints * lonPoints;
+        geod = new SGGeod[numPoints];
+        normals = new SGVec3f[numPoints];
+        rel = new SGVec3d[numPoints];
     }
+    
+    ~OceanMesh()
+    {
+        delete[] geod;
+        delete[] normals;
+        delete[] rel;
+    }
+    
+    const int latPoints, lonPoints;
     const int geoPoints;
-    SGGeod geod[latPoints][lonPoints];
-    SGVec3f normals[latPoints][lonPoints];
-    SGVec3d rel[latPoints][lonPoints];
+    SGGeod* geod;
+    SGVec3f* normals;
+    SGVec3d* rel;
 
     std::vector<SGGeod> geod_nodes;
 
@@ -114,10 +126,11 @@ void OceanMesh::calcMesh(const SGVec3d& cartCenter, const SGQuatd& orient,
     for (int j = 0; j < latPoints; j++) {
         double lat = startLat + j * latInc;
         for (int i = 0; i < lonPoints; i++) {
-            geod[j][i] = SGGeod::fromDeg(startLon + i * longInc, lat);
-            SGVec3d cart = SGVec3d::fromGeod(geod[j][i]);
-            rel[j][i] = orient.transform(cart - cartCenter);
-            normals[j][i] = toVec3f(orient.transform(normalize(cart)));
+            int index = (j * lonPoints) + i;
+            geod[index] = SGGeod::fromDeg(startLon + i * longInc, lat);
+            SGVec3d cart = SGVec3d::fromGeod(geod[index]);
+            rel[index] = orient.transform(cart - cartCenter);
+            normals[index] = toVec3f(orient.transform(normalize(cart)));
         }
     }
     
@@ -130,8 +143,9 @@ void OceanMesh::calcMesh(const SGVec3d& cartCenter, const SGQuatd& orient,
     VectorArrayAdapter<int_list> rectArray(rectangle, lonPoints);
     for (int j = 0; j < latPoints; j++) {
         for (int i = 0; i < lonPoints; i++) {
-            geodNodesArray(j, i) = geod[j][i];
-            rectArray(j, i) = j * 5 + i;
+            int index = (j * lonPoints) + i;
+            geodNodesArray(j, i) = geod[index];
+            rectArray(j, i) = index;
         }
     }
     
@@ -144,8 +158,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) = toOsg(rel[j][i]);
-            nlArray(j, i) = toOsg(normals[j][i]);
+            int index = (j * lonPoints) + i;
+            vlArray(j, i) = toOsg(rel[index]);
+            nlArray(j, i) = toOsg(normals[index]);
             tlArray(j, i) = toOsg(texsArray(j, i));
         }
     }
@@ -259,7 +274,7 @@ void fillDrawElementsWithApron(short height, short width,
 }
 }
 
-osg::Node* SGOceanTile(const SGBucket& b, SGMaterialLib *matlib)
+osg::Node* SGOceanTile(const SGBucket& b, SGMaterialLib *matlib, int latPoints, int lonPoints)
 {
     Effect *effect = 0;
 
@@ -277,7 +292,7 @@ osg::Node* SGOceanTile(const SGBucket& b, SGMaterialLib *matlib)
     } else {
         SG_LOG( SG_TERRAIN, SG_ALERT, "Ack! unknown use material name = Ocean");
     }
-    OceanMesh grid;
+    OceanMesh grid(latPoints, lonPoints);
     // Calculate center point
     SGVec3d cartCenter = SGVec3d::fromGeod(b.get_center());
     SGGeod geodPos = SGGeod::fromCart(cartCenter);

diff --git a/simgear/scene/tgdb/SGOceanTile.hxx b/simgear/scene/tgdb/SGOceanTile.hxx
index 3e48aebc0d0203404b4acb69b0ef70351b3ca593..75b1f2622dac5539fee327dabaafba176cc06766 100644 (file)
--- a/simgear/scene/tgdb/SGOceanTile.hxx
+++ b/simgear/scene/tgdb/SGOceanTile.hxx
@@ -28,6 +28,6 @@ class SGBucket;
 class SGMaterialLib;
 
 // Generate an ocean tile
-osg::Node* SGOceanTile(const SGBucket& b, SGMaterialLib *matlib);
+osg::Node* SGOceanTile(const SGBucket& b, SGMaterialLib *matlib, int latPoints = 5, int lonPoints = 5);
 
 #endif // _SG_OBJ_HXX