Revert TileMesher changes that were causing missing triangles

src/osgEarth/TerrainTileModelFactory.cpp

@@ -627,8 +627,8 @@ TerrainTileModelFactory::addMesh(
 
         // test.
         MeshConstraint clamp;
-        clamp.clampMesh = true;
-        clamp.pool = map->getElevationPool();
+        //clamp.clampMesh = true;
+        //clamp.pool = map->getElevationPool();
         constraints.emplace_back(std::move(clamp));
 
         model->mesh = mesher.createMesh(key, constraints, progress);

src/osgEarth/TileMesher

@@ -16,7 +16,8 @@
 * You should have received a copy of the GNU Lesser General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
-#pragma once
+#ifndef OSGEARTH_TILE_MESHER
+#define OSGEARTH_TILE_MESHER 1
 
 #include <osgEarth/Common>
 #include <osgEarth/TileKey>
@@ -31,18 +32,12 @@
 
 namespace osgEarth
 {
-    class ElevationPool;
-
     /**
      * Represents a single edit operation driven by a feature collection
      */
     struct MeshConstraint
     {
         FeatureList features;
-        ElevationPool* pool = nullptr;
-        bool cutMesh = true;           // should we cut the mesh with the constraint data?
-        bool flattenMesh = false;      // should we flatten the mesh to the constraint data?
-        bool clampMesh = false;        // should we clamp the mesh to the elevation data?
         bool hasElevation = false;     // do the features contain valid elevation data in Z?
         bool removeInterior = false;   // should we remove triangles inside polygons?
         bool removeExterior = false;   // should we remove triangles outside polygons?
@@ -74,10 +69,6 @@ namespace osgEarth
         TileMesh(const TileMesh& m);
         TileMesh(TileMesh&& m);
         TileMesh& operator = (const TileMesh&);
-
-        inline bool valid() const {
-            return verts.valid() && indices.valid();
-        }
     };
 
     /**
@@ -137,3 +128,5 @@ namespace osgEarth
             Cancelable* progress) const;
     };
 }
+
+#endif // OSGEARTH_TILE_MESHER