removed remnants of frameState for evaluate and evaluateColor

janeyx99 · janeyx99 · commit f5f74e8e6e33 · 2018-08-06T15:38:22.000-04:00
diff --git a/Source/Scene/Cesium3DTileBatchTable.js b/Source/Scene/Cesium3DTileBatchTable.js
@@ -555,8 +555,8 @@ define([
         var length = this.featuresLength;
         for (var i = 0; i < length; ++i) {
             var feature = content.getFeature(i);
-            var color = defined(style.color) ? style.color.evaluateColor(frameState, feature, scratchColor) : DEFAULT_COLOR_VALUE;
-            var show = defined(style.show) ? style.show.evaluate(frameState, feature) : DEFAULT_SHOW_VALUE;
+            var color = defined(style.color) ? style.color.evaluateColor(feature, scratchColor) : DEFAULT_COLOR_VALUE;
+            var show = defined(style.show) ? style.show.evaluate(feature) : DEFAULT_SHOW_VALUE;
             this.setColor(i, color);
             this.setShow(i, show);
         }
diff --git a/Source/Scene/Vector3DTilePoints.js b/Source/Scene/Vector3DTilePoints.js
@@ -326,47 +326,47 @@ define([
             var feature = features[batchId];
 
             if (defined(style.show)) {
-                feature.show = style.show.evaluate(frameState, feature);
+                feature.show = style.show.evaluate(feature);
             }
 
             if (defined(style.pointSize)) {
-                feature.pointSize = style.pointSize.evaluate(frameState, feature);
+                feature.pointSize = style.pointSize.evaluate(feature);
             }
 
             if (defined(style.color)) {
-                feature.color = style.color.evaluateColor(frameState, feature, scratchColor);
+                feature.color = style.color.evaluateColor(feature, scratchColor);
             }
 
             if (defined(style.pointOutlineColor)) {
-                feature.pointOutlineColor = style.pointOutlineColor.evaluateColor(frameState, feature, scratchColor2);
+                feature.pointOutlineColor = style.pointOutlineColor.evaluateColor(feature, scratchColor2);
             }
 
             if (defined(style.pointOutlineWidth)) {
-                feature.pointOutlineWidth = style.pointOutlineWidth.evaluate(frameState, feature);
+                feature.pointOutlineWidth = style.pointOutlineWidth.evaluate(feature);
             }
 
             if (defined(style.labelColor)) {
-                feature.labelColor = style.labelColor.evaluateColor(frameState, feature, scratchColor3);
+                feature.labelColor = style.labelColor.evaluateColor(feature, scratchColor3);
             }
 
             if (defined(style.labelOutlineColor)) {
-                feature.labelOutlineColor = style.labelOutlineColor.evaluateColor(frameState, feature, scratchColor4);
+                feature.labelOutlineColor = style.labelOutlineColor.evaluateColor(feature, scratchColor4);
             }
 
             if (defined(style.labelOutlineWidth)) {
-                feature.labelOutlineWidth = style.labelOutlineWidth.evaluate(frameState, feature);
+                feature.labelOutlineWidth = style.labelOutlineWidth.evaluate(feature);
             }
 
             if (defined(style.font)) {
-                feature.font = style.font.evaluate(frameState, feature);
+                feature.font = style.font.evaluate(feature);
             }
 
             if (defined(style.labelStyle)) {
-                feature.labelStyle = style.labelStyle.evaluate(frameState, feature);
+                feature.labelStyle = style.labelStyle.evaluate(feature);
             }
 
             if (defined(style.labelText)) {
-                feature.labelText = style.labelText.evaluate(frameState, feature);
+                feature.labelText = style.labelText.evaluate(feature);
             } else {
                 feature.labelText = undefined;
             }
@@ -376,15 +376,15 @@ define([
             }
 
             if (defined(style.backgroundPadding)) {
-                feature.backgroundPadding = style.backgroundPadding.evaluate(frameState, feature);
+                feature.backgroundPadding = style.backgroundPadding.evaluate(feature);
             }
 
             if (defined(style.backgroundEnabled)) {
-                feature.backgroundEnabled = style.backgroundEnabled.evaluate(frameState, feature);
+                feature.backgroundEnabled = style.backgroundEnabled.evaluate(feature);
             }
 
             if (defined(style.scaleByDistance)) {
-                var scaleByDistanceCart4 = style.scaleByDistance.evaluate(frameState, feature);
+                var scaleByDistanceCart4 = style.scaleByDistance.evaluate(feature);
                 scratchScaleByDistance.near = scaleByDistanceCart4.x;
                 scratchScaleByDistance.nearValue = scaleByDistanceCart4.y;
                 scratchScaleByDistance.far = scaleByDistanceCart4.z;
@@ -395,7 +395,7 @@ define([
             }
 
             if (defined(style.translucencyByDistance)) {
-                var translucencyByDistanceCart4 = style.translucencyByDistance.evaluate(frameState, feature);
+                var translucencyByDistanceCart4 = style.translucencyByDistance.evaluate(feature);
                 scratchTranslucencyByDistance.near = translucencyByDistanceCart4.x;
                 scratchTranslucencyByDistance.nearValue = translucencyByDistanceCart4.y;
                 scratchTranslucencyByDistance.far = translucencyByDistanceCart4.z;
@@ -406,7 +406,7 @@ define([
             }
 
             if (defined(style.distanceDisplayCondition)) {
-                var distanceDisplayConditionCart2 = style.distanceDisplayCondition.evaluate(frameState, feature);
+                var distanceDisplayConditionCart2 = style.distanceDisplayCondition.evaluate(feature);
                 scratchDistanceDisplayCondition.near = distanceDisplayConditionCart2.x;
                 scratchDistanceDisplayCondition.far = distanceDisplayConditionCart2.y;
                 feature.distanceDisplayCondition = scratchDistanceDisplayCondition;
@@ -415,41 +415,41 @@ define([
             }
 
             if (defined(style.heightOffset)) {
-                feature.heightOffset = style.heightOffset.evaluate(frameState, feature);
+                feature.heightOffset = style.heightOffset.evaluate(feature);
             }
 
             if (defined(style.anchorLineEnabled)) {
-                feature.anchorLineEnabled = style.anchorLineEnabled.evaluate(frameState, feature);
+                feature.anchorLineEnabled = style.anchorLineEnabled.evaluate(feature);
             }
 
             if (defined(style.anchorLineColor)) {
-                feature.anchorLineColor = style.anchorLineColor.evaluateColor(frameState, feature, scratchColor6);
+                feature.anchorLineColor = style.anchorLineColor.evaluateColor(feature, scratchColor6);
             }
 
             if (defined(style.image)) {
-                feature.image = style.image.evaluate(frameState, feature);
+                feature.image = style.image.evaluate(feature);
             } else {
                 feature.image = undefined;
             }
 
             if (defined(style.disableDepthTestDistance)) {
-                feature.disableDepthTestDistance = style.disableDepthTestDistance.evaluate(frameState, feature);
+                feature.disableDepthTestDistance = style.disableDepthTestDistance.evaluate(feature);
             }
 
             if (defined(style.horizontalOrigin)) {
-                feature.horizontalOrigin = style.horizontalOrigin.evaluate(frameState, feature);
+                feature.horizontalOrigin = style.horizontalOrigin.evaluate(feature);
             }
 
             if (defined(style.verticalOrigin)) {
-                feature.verticalOrigin = style.verticalOrigin.evaluate(frameState, feature);
+                feature.verticalOrigin = style.verticalOrigin.evaluate(feature);
             }
 
             if (defined(style.labelHorizontalOrigin)) {
-                feature.labelHorizontalOrigin = style.labelHorizontalOrigin.evaluate(frameState, feature);
+                feature.labelHorizontalOrigin = style.labelHorizontalOrigin.evaluate(feature);
             }
 
             if (defined(style.labelVerticalOrigin)) {
-                feature.labelVerticalOrigin = style.labelVerticalOrigin.evaluate(frameState, feature);
+                feature.labelVerticalOrigin = style.labelVerticalOrigin.evaluate(feature);
             }
         }
     };
diff --git a/Source/Scene/Vector3DTilePolylines.js b/Source/Scene/Vector3DTilePolylines.js
@@ -505,8 +505,8 @@ define([
             var batchId = batchIds[i];
             var feature = features[batchId];
 
-            feature.color = defined(style.color) ? style.color.evaluateColor(frameState, feature, scratchColor) : DEFAULT_COLOR_VALUE;
-            feature.show = defined(style.show) ? style.show.evaluate(frameState, feature) : DEFAULT_SHOW_VALUE;
+            feature.color = defined(style.color) ? style.color.evaluateColor(feature, scratchColor) : DEFAULT_COLOR_VALUE;
+            feature.show = defined(style.show) ? style.show.evaluate(feature) : DEFAULT_SHOW_VALUE;
         }
     };
 
diff --git a/Source/Scene/Vector3DTilePrimitive.js b/Source/Scene/Vector3DTilePrimitive.js
@@ -951,8 +951,8 @@ define([
             var batchId = batchIds[i];
             var feature = features[batchId];
 
-            feature.color = defined(style.color) ? style.color.evaluateColor(frameState, feature, scratchColor) : DEFAULT_COLOR_VALUE;
-            feature.show = defined(style.show) ? style.show.evaluate(frameState, feature) : DEFAULT_SHOW_VALUE;
+            feature.color = defined(style.color) ? style.color.evaluateColor(feature, scratchColor) : DEFAULT_COLOR_VALUE;
+            feature.show = defined(style.show) ? style.show.evaluate(feature) : DEFAULT_SHOW_VALUE;
         }
 
         if (isSimpleStyle) {
diff --git a/Specs/Scene/Cesium3DTilesetSpec.js b/Specs/Scene/Cesium3DTilesetSpec.js
@@ -2016,13 +2016,13 @@ defineSuite([
     it('applies custom style to a tileset', function() {
         var style = new Cesium3DTileStyle();
         style.show = {
-            evaluate : function(frameState, feature) {
+            evaluate : function(feature) {
                 return this._value;
             },
             _value : false
         };
         style.color = {
-            evaluateColor : function(frameState, feature, result) {
+            evaluateColor : function(feature, result) {
                 return Color.clone(Color.WHITE, result);
             }
         };

Original file line number	Diff line number	Diff line change
`@@ -326,47 +326,47 @@ define([`
`326`	`326`	`var feature = features[batchId];`
`327`	`327`
`328`	`328`	`if (defined(style.show)) {`
`329`		`- feature.show = style.show.evaluate(frameState, feature);`
	`329`	`+ feature.show = style.show.evaluate(feature);`
`330`	`330`	`}`
`331`	`331`
`332`	`332`	`if (defined(style.pointSize)) {`
`333`		`- feature.pointSize = style.pointSize.evaluate(frameState, feature);`
	`333`	`+ feature.pointSize = style.pointSize.evaluate(feature);`
`334`	`334`	`}`
`335`	`335`
`336`	`336`	`if (defined(style.color)) {`
`337`		`- feature.color = style.color.evaluateColor(frameState, feature, scratchColor);`
	`337`	`+ feature.color = style.color.evaluateColor(feature, scratchColor);`
`338`	`338`	`}`
`339`	`339`
`340`	`340`	`if (defined(style.pointOutlineColor)) {`
`341`		`- feature.pointOutlineColor = style.pointOutlineColor.evaluateColor(frameState, feature, scratchColor2);`
	`341`	`+ feature.pointOutlineColor = style.pointOutlineColor.evaluateColor(feature, scratchColor2);`
`342`	`342`	`}`
`343`	`343`
`344`	`344`	`if (defined(style.pointOutlineWidth)) {`
`345`		`- feature.pointOutlineWidth = style.pointOutlineWidth.evaluate(frameState, feature);`
	`345`	`+ feature.pointOutlineWidth = style.pointOutlineWidth.evaluate(feature);`
`346`	`346`	`}`
`347`	`347`
`348`	`348`	`if (defined(style.labelColor)) {`
`349`		`- feature.labelColor = style.labelColor.evaluateColor(frameState, feature, scratchColor3);`
	`349`	`+ feature.labelColor = style.labelColor.evaluateColor(feature, scratchColor3);`
`350`	`350`	`}`
`351`	`351`
`352`	`352`	`if (defined(style.labelOutlineColor)) {`
`353`		`- feature.labelOutlineColor = style.labelOutlineColor.evaluateColor(frameState, feature, scratchColor4);`
	`353`	`+ feature.labelOutlineColor = style.labelOutlineColor.evaluateColor(feature, scratchColor4);`
`354`	`354`	`}`
`355`	`355`
`356`	`356`	`if (defined(style.labelOutlineWidth)) {`
`357`		`- feature.labelOutlineWidth = style.labelOutlineWidth.evaluate(frameState, feature);`
	`357`	`+ feature.labelOutlineWidth = style.labelOutlineWidth.evaluate(feature);`
`358`	`358`	`}`
`359`	`359`
`360`	`360`	`if (defined(style.font)) {`
`361`		`- feature.font = style.font.evaluate(frameState, feature);`
	`361`	`+ feature.font = style.font.evaluate(feature);`
`362`	`362`	`}`
`363`	`363`
`364`	`364`	`if (defined(style.labelStyle)) {`
`365`		`- feature.labelStyle = style.labelStyle.evaluate(frameState, feature);`
	`365`	`+ feature.labelStyle = style.labelStyle.evaluate(feature);`
`366`	`366`	`}`
`367`	`367`
`368`	`368`	`if (defined(style.labelText)) {`
`369`		`- feature.labelText = style.labelText.evaluate(frameState, feature);`
	`369`	`+ feature.labelText = style.labelText.evaluate(feature);`
`370`	`370`	`} else {`
`371`	`371`	`feature.labelText = undefined;`
`372`	`372`	`}`
`@@ -376,15 +376,15 @@ define([`
`376`	`376`	`}`
`377`	`377`
`378`	`378`	`if (defined(style.backgroundPadding)) {`
`379`		`- feature.backgroundPadding = style.backgroundPadding.evaluate(frameState, feature);`
	`379`	`+ feature.backgroundPadding = style.backgroundPadding.evaluate(feature);`
`380`	`380`	`}`
`381`	`381`
`382`	`382`	`if (defined(style.backgroundEnabled)) {`
`383`		`- feature.backgroundEnabled = style.backgroundEnabled.evaluate(frameState, feature);`
	`383`	`+ feature.backgroundEnabled = style.backgroundEnabled.evaluate(feature);`
`384`	`384`	`}`
`385`	`385`
`386`	`386`	`if (defined(style.scaleByDistance)) {`
`387`		`- var scaleByDistanceCart4 = style.scaleByDistance.evaluate(frameState, feature);`
	`387`	`+ var scaleByDistanceCart4 = style.scaleByDistance.evaluate(feature);`
`388`	`388`	`scratchScaleByDistance.near = scaleByDistanceCart4.x;`
`389`	`389`	`scratchScaleByDistance.nearValue = scaleByDistanceCart4.y;`
`390`	`390`	`scratchScaleByDistance.far = scaleByDistanceCart4.z;`
`@@ -395,7 +395,7 @@ define([`
`395`	`395`	`}`
`396`	`396`
`397`	`397`	`if (defined(style.translucencyByDistance)) {`
`398`		`- var translucencyByDistanceCart4 = style.translucencyByDistance.evaluate(frameState, feature);`
	`398`	`+ var translucencyByDistanceCart4 = style.translucencyByDistance.evaluate(feature);`
`399`	`399`	`scratchTranslucencyByDistance.near = translucencyByDistanceCart4.x;`
`400`	`400`	`scratchTranslucencyByDistance.nearValue = translucencyByDistanceCart4.y;`
`401`	`401`	`scratchTranslucencyByDistance.far = translucencyByDistanceCart4.z;`
`@@ -406,7 +406,7 @@ define([`
`406`	`406`	`}`
`407`	`407`
`408`	`408`	`if (defined(style.distanceDisplayCondition)) {`
`409`		`- var distanceDisplayConditionCart2 = style.distanceDisplayCondition.evaluate(frameState, feature);`
	`409`	`+ var distanceDisplayConditionCart2 = style.distanceDisplayCondition.evaluate(feature);`
`410`	`410`	`scratchDistanceDisplayCondition.near = distanceDisplayConditionCart2.x;`
`411`	`411`	`scratchDistanceDisplayCondition.far = distanceDisplayConditionCart2.y;`
`412`	`412`	`feature.distanceDisplayCondition = scratchDistanceDisplayCondition;`
`@@ -415,41 +415,41 @@ define([`
`415`	`415`	`}`
`416`	`416`
`417`	`417`	`if (defined(style.heightOffset)) {`
`418`		`- feature.heightOffset = style.heightOffset.evaluate(frameState, feature);`
	`418`	`+ feature.heightOffset = style.heightOffset.evaluate(feature);`
`419`	`419`	`}`
`420`	`420`
`421`	`421`	`if (defined(style.anchorLineEnabled)) {`
`422`		`- feature.anchorLineEnabled = style.anchorLineEnabled.evaluate(frameState, feature);`
	`422`	`+ feature.anchorLineEnabled = style.anchorLineEnabled.evaluate(feature);`
`423`	`423`	`}`
`424`	`424`
`425`	`425`	`if (defined(style.anchorLineColor)) {`
`426`		`- feature.anchorLineColor = style.anchorLineColor.evaluateColor(frameState, feature, scratchColor6);`
	`426`	`+ feature.anchorLineColor = style.anchorLineColor.evaluateColor(feature, scratchColor6);`
`427`	`427`	`}`
`428`	`428`
`429`	`429`	`if (defined(style.image)) {`
`430`		`- feature.image = style.image.evaluate(frameState, feature);`
	`430`	`+ feature.image = style.image.evaluate(feature);`
`431`	`431`	`} else {`
`432`	`432`	`feature.image = undefined;`
`433`	`433`	`}`
`434`	`434`
`435`	`435`	`if (defined(style.disableDepthTestDistance)) {`
`436`		`- feature.disableDepthTestDistance = style.disableDepthTestDistance.evaluate(frameState, feature);`
	`436`	`+ feature.disableDepthTestDistance = style.disableDepthTestDistance.evaluate(feature);`
`437`	`437`	`}`
`438`	`438`
`439`	`439`	`if (defined(style.horizontalOrigin)) {`
`440`		`- feature.horizontalOrigin = style.horizontalOrigin.evaluate(frameState, feature);`
	`440`	`+ feature.horizontalOrigin = style.horizontalOrigin.evaluate(feature);`
`441`	`441`	`}`
`442`	`442`
`443`	`443`	`if (defined(style.verticalOrigin)) {`
`444`		`- feature.verticalOrigin = style.verticalOrigin.evaluate(frameState, feature);`
	`444`	`+ feature.verticalOrigin = style.verticalOrigin.evaluate(feature);`
`445`	`445`	`}`
`446`	`446`
`447`	`447`	`if (defined(style.labelHorizontalOrigin)) {`
`448`		`- feature.labelHorizontalOrigin = style.labelHorizontalOrigin.evaluate(frameState, feature);`
	`448`	`+ feature.labelHorizontalOrigin = style.labelHorizontalOrigin.evaluate(feature);`
`449`	`449`	`}`
`450`	`450`
`451`	`451`	`if (defined(style.labelVerticalOrigin)) {`
`452`		`- feature.labelVerticalOrigin = style.labelVerticalOrigin.evaluate(frameState, feature);`
	`452`	`+ feature.labelVerticalOrigin = style.labelVerticalOrigin.evaluate(feature);`
`453`	`453`	`}`
`454`	`454`	`}`
`455`	`455`	`};`
Original file line number	Diff line number	Diff line change
`@@ -505,8 +505,8 @@ define([`
`505`	`505`	`var batchId = batchIds[i];`
`506`	`506`	`var feature = features[batchId];`
`507`	`507`
`508`		`- feature.color = defined(style.color) ? style.color.evaluateColor(frameState, feature, scratchColor) : DEFAULT_COLOR_VALUE;`
`509`		`- feature.show = defined(style.show) ? style.show.evaluate(frameState, feature) : DEFAULT_SHOW_VALUE;`
	`508`	`+ feature.color = defined(style.color) ? style.color.evaluateColor(feature, scratchColor) : DEFAULT_COLOR_VALUE;`
	`509`	`+ feature.show = defined(style.show) ? style.show.evaluate(feature) : DEFAULT_SHOW_VALUE;`
`510`	`510`	`}`
`511`	`511`	`};`
`512`	`512`
Original file line number	Diff line number	Diff line change
`@@ -951,8 +951,8 @@ define([`
`951`	`951`	`var batchId = batchIds[i];`
`952`	`952`	`var feature = features[batchId];`
`953`	`953`
`954`		`- feature.color = defined(style.color) ? style.color.evaluateColor(frameState, feature, scratchColor) : DEFAULT_COLOR_VALUE;`
`955`		`- feature.show = defined(style.show) ? style.show.evaluate(frameState, feature) : DEFAULT_SHOW_VALUE;`
	`954`	`+ feature.color = defined(style.color) ? style.color.evaluateColor(feature, scratchColor) : DEFAULT_COLOR_VALUE;`
	`955`	`+ feature.show = defined(style.show) ? style.show.evaluate(feature) : DEFAULT_SHOW_VALUE;`
`956`	`956`	`}`
`957`	`957`
`958`	`958`	`if (isSimpleStyle) {`