Changeset 4284

Timestamp:

Mar 27, 2014, 11:12:02 PM (10 years ago)

Author:

ldelgass

Message:

Fix for terrain layers: use default terrain tile size of 15 (same as .earth
loader uses)

Location:

trunk/packages/vizservers/geovis

Files:

• Renderer.cpp (modified) (3 diffs)
• Renderer.h (modified) (3 diffs)

trunk/packages/vizservers/geovis/Renderer.cpp

@@ -463 +463 @@
 
 void Renderer::addImageLayer(const char *name,
-                             const osgEarth::TileSourceOptions& opts,
+                             osgEarth::TileSourceOptions& opts,
                              bool makeShared,
                              bool visible)
@@ -557 +557 @@
 
 void Renderer::addElevationLayer(const char *name,
-                                 const osgEarth::TileSourceOptions& opts)
-{
+                                 osgEarth::TileSourceOptions& opts)
+{
+    if (!opts.tileSize().isSet()) {
+        opts.tileSize() = 15;
+    }
+    osgEarth::ElevationLayerOptions layerOpts(name, opts);
     // XXX: GDAL does not report vertical datum, it should be specified here
-    osgEarth::ElevationLayerOptions layerOpts(name, opts);
     // Common options: geodetic (default), egm96, egm84, egm2008
     //layerOpts.verticalDatum() = "egm96";
@@ -602 +605 @@
 }
 
-void Renderer::addModelLayer(const char *name, const osgEarth::ModelSourceOptions& opts)
+void Renderer::addModelLayer(const char *name, osgEarth::ModelSourceOptions& opts)
 {
     osgEarth::ModelLayerOptions layerOpts(name, opts);

trunk/packages/vizservers/geovis/Renderer.h

@@ -169 +169 @@
     }
 
-    void addImageLayer(const char *name, const osgEarth::TileSourceOptions& opts,
+    void addImageLayer(const char *name, osgEarth::TileSourceOptions& opts,
                        bool makeShared = false, bool visible = true);
 
@@ -191 +191 @@
     }
 
-    void addElevationLayer(const char *name, const osgEarth::TileSourceOptions& opts);
+    void addElevationLayer(const char *name, osgEarth::TileSourceOptions& opts);
 
     void removeElevationLayer(const char *name);
@@ -206 +206 @@
     }
 
-    void addModelLayer(const char *name, const osgEarth::ModelSourceOptions& opts);
+    void addModelLayer(const char *name, osgEarth::ModelSourceOptions& opts);
 
     void removeModelLayer(const char *name);