Merge pull request #7287 from AnalyticalGraphicsInc/configurable-pick…

…-width Configurable volume width for sampleHeight and clampToHeight
CesiumGS · Jan 2, 2019 · d5753b7 · d5753b7
2 parents 71838d2 + 11fd5bc
commit d5753b7
Show file tree

Hide file tree

Showing 6 changed files with 233 additions and 75 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,14 @@
 Change Log
 ==========
 
+### 1.54 - 2019-02-01
+
+##### Deprecated :hourglass_flowing_sand:
+* `Scene.clampToHeight` now takes an optional `width` argument before the `result` argument.  The previous function definition will no longer work in 1.56. [#7287](https://github.com/AnalyticalGraphicsInc/cesium/pull/7287)
+
+##### Additions :tada:
+* Added the ability to specify the width of the intersection volume for `Scene.sampleHeight`, `Scene.clampToHeight`, `Scene.sampleHeightMostDetailed`, and `Scene.clampToHeightMostDetailed`. [#7287](https://github.com/AnalyticalGraphicsInc/cesium/pull/7287)
+
 ### 1.53 - 2019-01-02
 
 ##### Additions :tada:

diff --git a/Source/Scene/Cesium3DTileset.js b/Source/Scene/Cesium3DTileset.js
@@ -1973,7 +1973,7 @@ define([
         var passes = frameState.passes;
         var isRender = passes.render;
         var isPick = passes.pick;
-        var isAsync = passes.async;
+        var isAsync = passes.asynchronous;
 
         var statistics = tileset._statistics;
         statistics.clear();

diff --git a/Source/Scene/FrameState.js b/Source/Scene/FrameState.js
@@ -187,11 +187,11 @@ define([
             offscreen : false,
 
             /**
-             * <code>true</code> if the primitive should update for an async pass, <code>false</code> otherwise.
+             * <code>true</code> if the primitive should update for an asynchronous pass, <code>false</code> otherwise.
              * @type {Boolean}
              * @default false
              */
-            async : false
+            asynchronous : false
         };
 
         /**