Remove USE_TERRAIN_COLOR defines

gwaldron · Feb 13, 2015 · a4b7ea0 · a4b7ea0
1 parent bbbd931
commit a4b7ea0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 22 deletions.
diff --git a/src/osgEarthDrivers/engine_mp/MPEngine.frag.glsl b/src/osgEarthDrivers/engine_mp/MPEngine.frag.glsl
@@ -8,6 +8,7 @@ $GLSL_DEFAULT_PRECISION_FLOAT
 #define MP_USE_TERRAIN_COLOR
 #define MP_USE_BLENDING
 
+uniform vec4 oe_terrain_color;
 uniform sampler2D oe_layer_tex;
 uniform int oe_layer_uid;
 uniform int oe_layer_order;
@@ -16,17 +17,11 @@ uniform float oe_layer_opacity;
 varying vec4 oe_layer_texc;
 varying float oe_terrain_rangeOpacity;
 
-#ifdef MP_USE_TERRAIN_COLOR
-uniform vec4 oe_terrain_color;
-#endif
-
 uniform float m;
 
 void oe_mp_apply_coloring(inout vec4 color)
 {
-#ifdef MP_USE_TERRAIN_COLOR
-    color = oe_terrain_color;
-#endif
+    color = oe_terrain_color.a >= 0.0 ? oe_terrain_color : color;
 
     float applyImagery = oe_layer_uid >= 0 ? 1.0 : 0.0;
     vec4 texel = mix(color, texture2D(oe_layer_tex, oe_layer_texc.st), applyImagery);

diff --git a/src/osgEarthDrivers/engine_mp/MPTerrainEngineNode.cpp b/src/osgEarthDrivers/engine_mp/MPTerrainEngineNode.cpp
@@ -886,14 +886,10 @@ MPTerrainEngineNode::updateState()
             std::string fs = ShaderLoader::load(
                 Shaders::MPFrag,
                 Shaders::MPFragSource );
-
-            bool useTerrainColor = _terrainOptions.color().isSet();
-            if ( !useTerrainColor )
-            {
-                osgEarth::replaceIn( fs,
-                    "#define MP_USE_TERRAIN_COLOR",
-                    "#undef MP_USE_TERRAIN_COLOR" );
-            }
+
+            // terrain background color; negative means use the vertex color.
+            terrainStateSet->getOrCreateUniform("oe_terrain_color", osg::Uniform::FLOAT_VEC4)
+                ->set( _terrainOptions.color().isSet()? _terrainOptions.color().get() : osg::Vec4f(-1,-1,-1,-1));
 
             bool useBlending = _terrainOptions.enableBlending() == true;
             if ( !useBlending )
@@ -1007,13 +1003,6 @@ MPTerrainEngineNode::updateState()
             // default min/max range uniforms.
             terrainStateSet->addUniform( new osg::Uniform("oe_layer_minRange", 0.0f) );
             terrainStateSet->addUniform( new osg::Uniform("oe_layer_maxRange", FLT_MAX) );
-
-            // base terrain color.
-            if ( useTerrainColor )
-            {
-                terrainStateSet->getOrCreateUniform(
-                    "oe_terrain_color", osg::Uniform::FLOAT_VEC4 )->set( *_terrainOptions.color() );
-            }
         }
 
         _stateUpdateRequired = false;