Changeset 4643

Timestamp:

Oct 3, 2014 1:18:26 PM (10 years ago)

Author:

ldelgass

Message:

Fixes for building with osgearth 2.6

File:

• geovis/trunk/Renderer.cpp (modified) (7 diffs)

geovis/trunk/Renderer.cpp

@@ -50 +50 @@
 #include <osgEarthAnnotation/ScaleDecoration>
 #include <osgEarthUtil/EarthManipulator>
-#if defined(USE_OSGEARTH_TRUNK) || OSGEARTH_MIN_VERSION_REQUIRED(2, 5, 1)
+#if OSGEARTH_MIN_VERSION_REQUIRED(2, 5, 1)
 #include <osgEarthUtil/Sky>
+#include <osgEarthDrivers/sky_simple/SimpleSkyOptions>
 #else
 #include <osgEarthUtil/SkyNode>
@@ -406 +407 @@
     _hbox->addControl(_scaleLabel.get());
     _hbox->addControl(_scaleBar.get());
-#ifdef USE_OSGEARTH_TRUNK
+#if OSGEARTH_MIN_VERSION_REQUIRED(2, 5, 1)
     osgEarth::Util::Controls::ControlCanvas::getOrCreate(_viewer.get())->addControl(_hbox.get());
 #else
@@ -488 +489 @@
             osgEarth::Util::Controls::LabelControl *readout =
                 _coordsCallback->getLabel();
-#ifdef USE_OSGEARTH_TRUNK
+#if OSGEARTH_MIN_VERSION_REQUIRED(2, 5, 1)
             osgEarth::Util::Controls::ControlCanvas::getOrCreate(_viewer.get())->removeControl(readout);
 #else
@@ -537 +538 @@
     } else {
         readout = new osgEarth::Util::Controls::LabelControl("", 12.0f);
-#ifdef USE_OSGEARTH_TRUNK
+#if OSGEARTH_MIN_VERSION_REQUIRED(2, 5, 1)
         osgEarth::Util::Controls::ControlCanvas::getOrCreate(_viewer.get())->addControl(readout);
 #else
@@ -691 +692 @@
     bopts.url() = getBaseImage();
     addImageLayer("base", bopts);
-#ifdef USE_OSGEARTH_TRUNK
+#if OSGEARTH_MIN_VERSION_REQUIRED(2, 5, 1)
     osgEarth::Drivers::MPTerrainEngine::MPTerrainEngineOptions mpOpt;
 #else
@@ -704 +705 @@
     // Sets GL_LIGHTING state in MapNode's StateSet (config var defaults to true)
     mapNodeOpts.enableLighting() = true;
+    //mapNodeOpts.getTerrainOptions().loadingPolicy().mapLoadingThreadsPerCore() = 1;
+    //mapNodeOpts.getTerrainOptions().loadingPolicy().numLoadingThreads() = 1;
+    //mapNodeOpts.getTerrainOptions().loadingPolicy().numCompileThreadsPerCore() = 1;
+    //mapNodeOpts.getTerrainOptions().loadingPolicy().numCompileThreads() = 1;
     osgEarth::MapNode *mapNode = new osgEarth::MapNode(map, mapNodeOpts);
     _mapNode = mapNode;
     if (_map->isGeocentric()) {
         osgEarth::DateTime now;
-#if defined(USE_OSGEARTH_TRUNK) || OSGEARTH_MIN_VERSION_REQUIRED(2, 5, 1)
+#if OSGEARTH_MIN_VERSION_REQUIRED(2, 5, 1)
         TRACE("Creating SkyNode");
-        osgEarth::Util::SkyOptions skyOpts;
-        skyOpts.setDriver("gl");
+        osgEarth::Drivers::SimpleSky::SimpleSkyOptions skyOpts;
         skyOpts.hours() = now.hours();
         skyOpts.ambient() = 0.2f;
+        skyOpts.atmosphericLighting() = true;
+        skyOpts.exposure() = 3.0;
         osgEarth::Util::SkyNode *sky = osgEarth::Util::SkyNode::create(skyOpts, mapNode);
         sky->addChild(mapNode);
@@ -1079 +1085 @@
     }
     osgEarth::ImageLayerOptions layerOpts(name, opts);
-#ifdef USE_OSGEARTH_TRUNK
+#if OSGEARTH_MIN_VERSION_REQUIRED(2, 5, 1)
     layerOpts.textureCompression() = osg::Texture::USE_IMAGE_DATA_FORMAT;
 #endif