Merge branch 'pick-size' of https://github.com/AnalyticalGraphicsInc/…

…cesium

CHANGES.md

@@ -5,6 +5,7 @@ Change Log
 
 * Added ability to show tile urls in the 3D Tiles Inspector. [#5592](https://github.com/AnalyticalGraphicsInc/cesium/pull/5592)
 * Added behavior to `Cesium3DTilesInspector` that selects the first tileset hovered over if no tilest is specified. [#5139](https://github.com/AnalyticalGraphicsInc/cesium/issues/5139)
+* Added ability to provide a `width` and `height` to `scene.pick`. [#5602](https://github.com/AnalyticalGraphicsInc/cesium/pull/5602)
 
 ### 1.35.2 - 2017-07-11
 

CONTRIBUTORS.md

@@ -1,6 +1,7 @@
 See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesium.  The following people have contributed to Cesium, under the following agreements:
 
 ## [Corporate CLA](Documentation/Contributors/CLAs/corporate-cla-agi-v1.0.txt)
+
 * [Analytical Graphics, Inc.](http://www.agi.com/)
    * [Patrick Cozzi](https://github.com/pjcozzi)
    * [Kristian Calhoun](https://github.com/kristiancalhoun)

Source/Scene/Scene.js

@@ -2793,8 +2793,8 @@ define([
      * }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
      *
      * @param {Cartesian2} windowPosition Window coordinates to perform picking on.
-     * @param {Number} [width=3] width of the pick rectangle
-     * @param {Number} [height=3] height of the pick rectangle
+     * @param {Number} [width=3] Width of the pick rectangle.
+     * @param {Number} [height=3] Height of the pick rectangle.
      * @returns {Object} Object containing the picked primitive.
      *
      * @exception {DeveloperError} windowPosition is undefined.
@@ -2805,7 +2805,7 @@ define([
             throw new DeveloperError('windowPosition is undefined.');
         }
         //>>includeEnd('debug');
-        // override the rectangle dimensions if defined
+
         rectangleWidth = defaultValue(width, 3.0);
         rectangleHeight = defaultValue(height, rectangleWidth);
 

Specs/Scene/PickSpec.js

@@ -34,7 +34,9 @@ defineSuite([
     var primitiveRectangle = Rectangle.fromDegrees(-1.0, -1.0, 1.0, 1.0);
 
     beforeAll(function() {
-        scene = createScene({ canvas: createCanvas(10,10) });
+        scene = createScene({
+            canvas : createCanvas(10, 10)
+        });
         primitives = scene.primitives;
         camera = scene.camera;
     });

Specs/addDefaultMatchers.js

@@ -465,10 +465,10 @@ define([
         };
     }
 
-    function pickPrimitiveEquals(actual, expected, x, y, pickWidth, pickHeight) {
+    function pickPrimitiveEquals(actual, expected, x, y, width, height) {
         var scene = actual;
-        var windowPosition = new Cartesian2(x,y);
-        var result = scene.pick(windowPosition, pickWidth, pickHeight);
+        var windowPosition = new Cartesian2(x, y);
+        var result = scene.pick(windowPosition, width, height);
 
         if (!!window.webglStub) {
             return {