Merge pull request #7924 from AnalyticalGraphicsInc/gamma-correct-fix

Gamma correction fix for polylines

Author: Hannah

CHANGES.md

@@ -6,6 +6,7 @@ Change Log
 ##### Fixes :wrench:
 * Fixed a bug that caused missing segments for ground polylines with coplanar points over large distances and problems with polylines containing duplicate points. [#7885](https://github.com/AnalyticalGraphicsInc/cesium//pull/7885)
 * Fixed a bug where billboards were not pickable when zoomed out completely in 2D View. [#7908](https://github.com/AnalyticalGraphicsInc/cesium/pull/7908)
+* Fixed polyline colors when `scene.highDynamicRange` is enabled. [#7924](https://github.com/AnalyticalGraphicsInc/cesium/pull/7924)
 * Fixed a bug in the inspector where the min/max height values of a picked tile were undefined. [#7904](https://github.com/AnalyticalGraphicsInc/cesium/pull/7904)
 
 ### 1.58.1 - 2018-06-03

Source/Shaders/Appearances/PerInstanceFlatColorAppearanceFS.glsl

@@ -2,5 +2,5 @@ varying vec4 v_color;
 
 void main()
 {
-    gl_FragColor = v_color;
+    gl_FragColor = czm_gammaCorrect(v_color);
 }

Source/Shaders/PolylineShadowVolumeFS.glsl

@@ -65,7 +65,7 @@ void main(void)
     distanceFromEnd = czm_planeDistance(alignedPlaneNormal, -dot(alignedPlaneNormal, v_endEcAndStartEcX.xyz), eyeCoordinate.xyz);
 
 #ifdef PER_INSTANCE_COLOR
-    gl_FragColor = v_color;
+    gl_FragColor = czm_gammaCorrect(v_color);
 #else // PER_INSTANCE_COLOR
     // Clamp - distance to aligned planes may be negative due to mitering,
     // so fragment texture coordinate might be out-of-bounds.

Source/Shaders/PolylineShadowVolumeMorphFS.glsl

@@ -20,7 +20,7 @@ void main(void)
     eyeCoordinate /= eyeCoordinate.w;
 
 #ifdef PER_INSTANCE_COLOR
-    gl_FragColor = v_color;
+    gl_FragColor = czm_gammaCorrect(v_color);
 #else // PER_INSTANCE_COLOR
     // Use distances for planes aligned with segment to prevent skew in dashing
     float distanceFromStart = rayPlaneDistanceUnsafe(eyeCoordinate.xyz, -v_forwardDirectionEC, v_forwardDirectionEC.xyz, v_alignedPlaneDistances.x);