Changeset 6004 for geovis

Timestamp:

Feb 11, 2016 10:39:04 PM (8 years ago)

Author:

ldelgass

Message:

Add define for testing new rex terrain engine

Location:

geovis/trunk

Files:

• Makefile.in (modified) (3 diffs)
• Renderer.cpp (modified) (2 diffs)

geovis/trunk/Makefile.in

@@ -6 +6 @@
 USE_READ_THREAD         = #yes
 USE_CACHE               = yes
-USE_OSGEARTH_TRUNK      = #yes
 USE_THROTTLING_SLEEP    = #yes
 SLEEP_AFTER_QUEUE_FRAME = yes
 QUEUE_ONLY_ONE_FRAME    = yes
+USE_REX                 = #yes
 
 bindir          = @bindir@
@@ -106 +106 @@
 DEFINES         += -DUSE_CACHE
 endif
-ifdef USE_OSGEARTH_TRUNK
-DEFINES         += -DUSE_OSGEARTH_TRUNK
-endif
 ifdef USE_THROTTLING_SLEEP
 DEFINES         += -DUSE_THROTTLING_SLEEP
@@ -117 +114 @@
 ifdef QUEUE_ONLY_ONE_FRAME
 DEFINES         += -DQUEUE_ONLY_ONE_FRAME
+endif
+ifdef USE_REX
+DEFINES         += -DUSE_REX
 endif
 

geovis/trunk/Renderer.cpp

@@ -86 +86 @@
 #include <osgEarthDrivers/gdal/GDALOptions>
 #include <osgEarthDrivers/engine_mp/MPTerrainEngineOptions>
+#ifdef USE_REX
+#include <osgEarthDrivers/engine_rex/RexTerrainEngineOptions>
+#endif
 
 #include "Renderer.h"
@@ -808 +811 @@
     bopts.url() = getBaseImage();
     addImageLayer("base", bopts);
-    osgEarth::Drivers::MPTerrainEngine::MPTerrainEngineOptions mpOpt;
+#ifdef USE_REX
+    osgEarth::Drivers::RexTerrainEngine::RexTerrainEngineOptions engineOpt;
+#else
+    osgEarth::Drivers::MPTerrainEngine::MPTerrainEngineOptions engineOpt;
+#endif
     // Set background layer color
-    mpOpt.color() = bgColor;
-    //mpOpt.minLOD() = 1;
+    engineOpt.color() = bgColor;
+    //engineOpt.minLOD() = 1;
     // Sets shader uniform for terrain renderer (config var defaults to false)
     if (!_map->isGeocentric()) {
-        mpOpt.enableLighting() = false;
-    }
-    osgEarth::MapNodeOptions mapNodeOpts(mpOpt);
+        engineOpt.enableLighting() = false;
+    }
+    osgEarth::MapNodeOptions mapNodeOpts(engineOpt);
     // Sets GL_LIGHTING state in MapNode's StateSet (config var defaults to true)
     //mapNodeOpts.enableLighting() = true;