Fixes #6925

CesiumGS · Aug 16, 2018 · 39225b2 · 39225b2
1 parent 8ff642f
commit 39225b2
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/Source/DataSources/StaticGroundPolylinePerMaterialBatch.js b/Source/DataSources/StaticGroundPolylinePerMaterialBatch.js
@@ -1,5 +1,7 @@
 define([
         '../Core/AssociativeArray',
+        '../Core/Color',
+        '../Core/ColorGeometryInstanceAttribute',
         '../Core/defined',
         '../Core/DistanceDisplayCondition',
         '../Core/DistanceDisplayConditionGeometryInstanceAttribute',
@@ -13,6 +15,8 @@ define([
         './Property'
     ], function(
         AssociativeArray,
+        Color,
+        ColorGeometryInstanceAttribute,
         defined,
         DistanceDisplayCondition,
         DistanceDisplayConditionGeometryInstanceAttribute,
@@ -26,6 +30,7 @@ define([
         Property) {
     'use strict';
 
+    var scratchColor = new Color();
     var distanceDisplayConditionScratch = new DistanceDisplayCondition();
     var defaultDistanceDisplayCondition = new DistanceDisplayCondition();
 
@@ -195,6 +200,15 @@ define([
                     this.attributes.set(instance.id.id, attributes);
                 }
 
+                if (!updater.fillMaterialProperty.isConstant) {
+                    var colorProperty = updater.fillMaterialProperty.color;
+                    var resultColor = Property.getValueOrDefault(colorProperty, time, Color.WHITE, scratchColor);
+                    if (!Color.equals(attributes._lastColor, resultColor)) {
+                        attributes._lastColor = Color.clone(resultColor, attributes._lastColor);
+                        attributes.color = ColorGeometryInstanceAttribute.toValue(resultColor, attributes.color);
+                    }
+                }
+
                 var show = entity.isShowing && (updater.hasConstantFill || updater.isFilled(time));
                 var currentShow = attributes.show[0] === 1;
                 if (show !== currentShow) {