removed frameState in applyStyle

CesiumGS · Aug 13, 2018 · cfb77a4 · cfb77a4
1 parent 4c7b175
commit cfb77a4
Show file tree

Hide file tree

Showing 17 changed files with 32 additions and 38 deletions.
diff --git a/Source/Scene/Batched3DModel3DTileContent.js b/Source/Scene/Batched3DModel3DTileContent.js
@@ -444,8 +444,8 @@ define([
         }
     };
 
-    Batched3DModel3DTileContent.prototype.applyStyle = function(frameState, style) {
-        this._batchTable.applyStyle(frameState, style);
+    Batched3DModel3DTileContent.prototype.applyStyle = function(style) {
+        this._batchTable.applyStyle(style);
     };
 
     Batched3DModel3DTileContent.prototype.update = function(tileset, frameState) {

diff --git a/Source/Scene/Cesium3DTileBatchTable.js b/Source/Scene/Cesium3DTileBatchTable.js
@@ -544,7 +544,7 @@ define([
 
     var scratchColor = new Color();
 
-    Cesium3DTileBatchTable.prototype.applyStyle = function(frameState, style) {
+    Cesium3DTileBatchTable.prototype.applyStyle = function(style) {
         if (!defined(style)) {
             this.setAllColor(DEFAULT_COLOR_VALUE);
             this.setAllShow(true);

diff --git a/Source/Scene/Cesium3DTileContent.js b/Source/Scene/Cesium3DTileContent.js
@@ -271,12 +271,11 @@ define([
      * not part of the public Cesium API.
      * </p>
      *
-     * @param {FrameState} frameState The frame state.
      * @param {Cesium3DTileStyle} style The style.
      *
      * @private
      */
-    Cesium3DTileContent.prototype.applyStyle = function(frameState, style) {
+    Cesium3DTileContent.prototype.applyStyle = function(style) {
         DeveloperError.throwInstantiationError();
     };
 

diff --git a/Source/Scene/Cesium3DTileStyleEngine.js b/Source/Scene/Cesium3DTileStyleEngine.js
@@ -71,7 +71,7 @@ define([
                 //   2) this tile is now visible, but it wasn't visible when the style was first assigned
                 var content = tile.content;
                 tile.lastStyleTime = lastStyleTime;
-                content.applyStyle(frameState, this._style);
+                content.applyStyle(this._style);
                 statistics.numberOfFeaturesStyled += content.featuresLength;
                 ++statistics.numberOfTilesStyled;
             }

diff --git a/Source/Scene/Composite3DTileContent.js b/Source/Scene/Composite3DTileContent.js
@@ -250,11 +250,11 @@ define([
         }
     };
 
-    Composite3DTileContent.prototype.applyStyle = function(frameState, style) {
+    Composite3DTileContent.prototype.applyStyle = function(style) {
         var contents = this._contents;
         var length = contents.length;
         for (var i = 0; i < length; ++i) {
-            contents[i].applyStyle(frameState, style);
+            contents[i].applyStyle(style);
         }
     };
 

diff --git a/Source/Scene/Empty3DTileContent.js b/Source/Scene/Empty3DTileContent.js
@@ -119,7 +119,7 @@ define([
     Empty3DTileContent.prototype.applyDebugSettings = function(enabled, color) {
     };
 
-    Empty3DTileContent.prototype.applyStyle = function(frameState, style) {
+    Empty3DTileContent.prototype.applyStyle = function(style) {
     };
 
     Empty3DTileContent.prototype.update = function(tileset, frameState) {

diff --git a/Source/Scene/Geometry3DTileContent.js b/Source/Scene/Geometry3DTileContent.js
@@ -403,10 +403,10 @@ define([
         }
     };
 
-    Geometry3DTileContent.prototype.applyStyle = function(frameState, style) {
+    Geometry3DTileContent.prototype.applyStyle = function(style) {
         createFeatures(this);
         if (defined(this._geometries)) {
-            this._geometries.applyStyle(frameState, style, this._features);
+            this._geometries.applyStyle(style, this._features);
         }
     };
 

diff --git a/Source/Scene/Instanced3DModel3DTileContent.js b/Source/Scene/Instanced3DModel3DTileContent.js
@@ -451,8 +451,8 @@ define([
         this._batchTable.setAllColor(color);
     };
 
-    Instanced3DModel3DTileContent.prototype.applyStyle = function(frameState, style) {
-        this._batchTable.applyStyle(frameState, style);
+    Instanced3DModel3DTileContent.prototype.applyStyle = function(style) {
+        this._batchTable.applyStyle(style);
     };
 
     Instanced3DModel3DTileContent.prototype.update = function(tileset, frameState) {

diff --git a/Source/Scene/PointCloud3DTileContent.js b/Source/Scene/PointCloud3DTileContent.js
@@ -260,9 +260,9 @@ define([
         this._pointCloud.color = enabled ? color : Color.WHITE;
     };
 
-    PointCloud3DTileContent.prototype.applyStyle = function(frameState, style) {
+    PointCloud3DTileContent.prototype.applyStyle = function(style) {
         if (defined(this._batchTable)) {
-            this._batchTable.applyStyle(frameState, style);
+            this._batchTable.applyStyle(style);
         } else {
             this._styleDirty = true;
         }

diff --git a/Source/Scene/Tileset3DTileContent.js b/Source/Scene/Tileset3DTileContent.js
@@ -148,7 +148,7 @@ define([
     Tileset3DTileContent.prototype.applyDebugSettings = function(enabled, color) {
     };
 
-    Tileset3DTileContent.prototype.applyStyle = function(frameState, style) {
+    Tileset3DTileContent.prototype.applyStyle = function(style) {
     };
 
     Tileset3DTileContent.prototype.update = function(tileset, frameState) {

diff --git a/Source/Scene/Vector3DTileContent.js b/Source/Scene/Vector3DTileContent.js
@@ -494,16 +494,16 @@ define([
         }
     };
 
-    Vector3DTileContent.prototype.applyStyle = function(frameState, style) {
+    Vector3DTileContent.prototype.applyStyle = function(style) {
         createFeatures(this);
         if (defined(this._polygons)) {
-            this._polygons.applyStyle(frameState, style, this._features);
+            this._polygons.applyStyle(style, this._features);
         }
         if (defined(this._polylines)) {
-            this._polylines.applyStyle(frameState, style, this._features);
+            this._polylines.applyStyle(style, this._features);
         }
         if (defined(this._points)) {
-            this._points.applyStyle(frameState, style, this._features);
+            this._points.applyStyle(style, this._features);
         }
     };
 

diff --git a/Source/Scene/Vector3DTileGeometry.js b/Source/Scene/Vector3DTileGeometry.js
@@ -408,12 +408,11 @@ define([
     /**
      * Apply a style to the content.
      *
-     * @param {FrameState} frameState The frame state.
      * @param {Cesium3DTileStyle} style The style.
      * @param {Cesium3DTileFeature[]} features The array of features.
      */
-    Vector3DTileGeometry.prototype.applyStyle = function(frameState, style, features) {
-        this._primitive.applyStyle(frameState, style, features);
+    Vector3DTileGeometry.prototype.applyStyle = function(style, features) {
+        this._primitive.applyStyle(style, features);
     };
 
     /**

diff --git a/Source/Scene/Vector3DTilePoints.js b/Source/Scene/Vector3DTilePoints.js
@@ -309,11 +309,10 @@ define([
     /**
      * Apply a style to the content.
      *
-     * @param {FrameState} frameState The frame state.
      * @param {Cesium3DTileStyle} style The style.
      * @param {Cesium3DTileFeature[]} features The array of features.
      */
-    Vector3DTilePoints.prototype.applyStyle = function(frameState, style, features) {
+    Vector3DTilePoints.prototype.applyStyle = function(style, features) {
         if (!defined(style)) {
             clearStyle(this, features);
             return;

diff --git a/Source/Scene/Vector3DTilePolygons.js b/Source/Scene/Vector3DTilePolygons.js
@@ -384,12 +384,11 @@ define([
     /**
      * Apply a style to the content.
      *
-     * @param {FrameState} frameState The frame state.
      * @param {Cesium3DTileStyle} style The style.
      * @param {Cesium3DTileFeature[]} features The array of features.
      */
-    Vector3DTilePolygons.prototype.applyStyle = function(frameState, style, features) {
-        this._primitive.applyStyle(frameState, style, features);
+    Vector3DTilePolygons.prototype.applyStyle = function(style, features) {
+        this._primitive.applyStyle(style, features);
     };
 
     /**

diff --git a/Source/Scene/Vector3DTilePolylines.js b/Source/Scene/Vector3DTilePolylines.js
@@ -489,11 +489,10 @@ define([
     /**
      * Apply a style to the content.
      *
-     * @param {FrameState} frameState The frame state.
      * @param {Cesium3DTileStyle} style The style.
      * @param {Cesium3DTileFeature[]} features The array of features.
      */
-    Vector3DTilePolylines.prototype.applyStyle = function(frameState, style, features) {
+    Vector3DTilePolylines.prototype.applyStyle = function(style, features) {
         if (!defined(style)) {
             clearStyle(this, features);
             return;

diff --git a/Source/Scene/Vector3DTilePrimitive.js b/Source/Scene/Vector3DTilePrimitive.js
@@ -929,11 +929,10 @@ define([
     /**
      * Apply a style to the content.
      *
-     * @param {FrameState} frameState The frame state.
      * @param {Cesium3DTileStyle} style The style.
      * @param {Cesium3DTileFeature[]} features The array of features.
      */
-    Vector3DTilePrimitive.prototype.applyStyle = function(frameState, style, features) {
+    Vector3DTilePrimitive.prototype.applyStyle = function(style, features) {
         if (!defined(style)) {
             clearStyle(this, features);
             return;

diff --git a/Specs/Scene/Vector3DTilePointsSpec.js b/Specs/Scene/Vector3DTilePointsSpec.js
@@ -154,7 +154,7 @@ defineSuite([
         return loadPoints(points).then(function() {
             var features = [];
             points.createFeatures(mockTileset, features);
-            points.applyStyle(scene.frameState, undefined, features);
+            points.applyStyle(undefined, features);
 
             scene.camera.lookAt(Cartesian3.fromDegrees(0.0, 0.0, 10.0), new Cartesian3(0.0, 0.0, 50.0));
             expect(scene).toRender([255, 255, 255, 255]);
@@ -188,7 +188,7 @@ defineSuite([
         return loadPoints(points).then(function() {
             var features = [];
             points.createFeatures(mockTileset, features);
-            points.applyStyle(scene.frameState, style, features);
+            points.applyStyle(style, features);
 
             for (var i = 0; i < cartoPositions.length; ++i) {
                 var position = ellipsoid.cartographicToCartesian(cartoPositions[i]);
@@ -224,7 +224,7 @@ defineSuite([
 
             var features = [];
             points.createFeatures(mockTileset, features);
-            points.applyStyle(scene.frameState, undefined, features);
+            points.applyStyle(undefined, features);
 
             var getFeature = mockTileset.getFeature;
             mockTileset.getFeature = function(index) {
@@ -297,7 +297,7 @@ defineSuite([
         return loadPoints(points).then(function() {
             var features = [];
             points.createFeatures(mockTileset, features);
-            points.applyStyle(scene.frameState, style, features);
+            points.applyStyle(style, features);
 
             var i;
             for (i = 0; i < features.length; ++i) {
@@ -367,7 +367,7 @@ defineSuite([
         return loadPoints(points).then(function() {
             var features = [];
             points.createFeatures(mockTileset, features);
-            points.applyStyle(scene.frameState, style, features);
+            points.applyStyle(style, features);
 
             var collection = points._billboardCollection;
             expect(collection.length).toEqual(1);
@@ -413,7 +413,7 @@ defineSuite([
         return loadPoints(points).then(function() {
             var features = [];
             points.createFeatures(mockTileset, features);
-            points.applyStyle(scene.frameState, style, features);
+            points.applyStyle(style, features);
             points.applyDebugSettings(true, Color.YELLOW);
 
             var i;