Add (back) an option to disable polar subdivision restriction

gwaldron · Jan 9, 2025 · 5d57539 · 5d57539
1 parent 6fa787c
commit 5d57539
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/osgEarth/TerrainOptions b/src/osgEarth/TerrainOptions
@@ -74,6 +74,7 @@ namespace osgEarth
         OE_OPTION(bool, visible, true);
         OE_OPTION(bool, createTilesAsync, true);
         OE_OPTION(bool, createTilesGrouped, true);
+        OE_OPTION(bool, restrictPolarSubdivision, true);
 
         virtual Config getConfig() const;
     private:
@@ -254,6 +255,10 @@ namespace osgEarth
         void setCreateTilesGrouped(const bool& value);
         const bool& getCreateTilesGrouped() const;
 
+        //! Whether to stop a geocentric mesh from subdividing all the way at the poles.
+        void setRestrictPolarSubdivision(const bool& value);
+        const bool& getRestrictPolarSubdivision() const;
+
         //! @deprecated
         //! Scale factor for background loading priority of terrain tiles.
         //! Default = 1.0. Make it higher to prioritize terrain loading over

diff --git a/src/osgEarth/TerrainOptions.cpp b/src/osgEarth/TerrainOptions.cpp
@@ -75,9 +75,9 @@ TerrainOptions::getConfig() const
     //conf.set("screen_space_error", screenSpaceError()); // don't serialize me, i'm set by the MapNode
     conf.set("max_texture_size", maxTextureSize());
     conf.set("visible", visible());
-
     conf.set("create_tiles_async", createTilesAsync());
     conf.set("create_tiles_grouped", createTilesGrouped());
+    conf.set("restrict_polar_subdivision", restrictPolarSubdivision());
 
     conf.set("expiration_range", minExpiryRange()); // legacy
     conf.set("expiration_threshold", minResidentTiles()); // legacy
@@ -134,6 +134,7 @@ TerrainOptions::fromConfig(const Config& conf)
 
     conf.get("create_tiles_async", createTilesAsync());
     conf.get("create_tiles_grouped", createTilesGrouped());
+    conf.get("restrict_polar_subdivision", restrictPolarSubdivision());
 
     conf.get("expiration_range", minExpiryRange()); // legacy
     conf.get("expiration_threshold", minResidentTiles()); // legacy
@@ -217,6 +218,7 @@ OE_OPTION_IMPL(TerrainOptionsAPI, unsigned, MaxTextureSize, maxTextureSize);
 OE_OPTION_IMPL(TerrainOptionsAPI, bool, Visible, visible);
 OE_OPTION_IMPL(TerrainOptionsAPI, bool, CreateTilesAsync, createTilesAsync);
 OE_OPTION_IMPL(TerrainOptionsAPI, bool, CreateTilesGrouped, createTilesGrouped);
+OE_OPTION_IMPL(TerrainOptionsAPI, bool, RestrictPolarSubdivision, restrictPolarSubdivision);
 
 bool
 TerrainOptionsAPI::getGPUTessellation() const

diff --git a/src/osgEarthDrivers/engine_rex/RexTerrainEngineNode.cpp b/src/osgEarthDrivers/engine_rex/RexTerrainEngineNode.cpp
@@ -349,7 +349,7 @@ RexTerrainEngineNode::onSetMap()
         maxLOD,
         _map->getProfile(),
         options.getMinTileRangeFactor(),
-        true); // restrict polar subdivision for geographic maps
+        options.getRestrictPolarSubdivision());
 
     TerrainResources* res = getResources();
     for (unsigned lod = 0; lod <= maxLOD; ++lod)