Skip to content

Commit

Permalink
Merge remote-tracking branch 'agi/master' into frustum-debug
Browse files Browse the repository at this point in the history
  • Loading branch information
@austinEng
austinEng committed Jan 31, 2017
2 parents 9e575cc + 48266d7 commit 270a0fd
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 36 deletions.
6 changes: 2 additions & 4 deletions CHANGES.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,9 @@ Change Log
* Added 2D and Columbus View support for models using the RTC extension or whose vertices are in WGS84 coordinates. [#4922](https://github.com/AnalyticalGraphicsInc/cesium/pull/4922)
* Transparent parts of billboards, labels, and points no longer overwrite parts of the scene behind them. [#4886](https://github.com/AnalyticalGraphicsInc/cesium/pull/4886)
* Added `blendOption` property to `BillboardCollection`, `LabelCollection`, and `PointPrimitiveCollection`. The default is `BlendOption.OPAQUE_AND_TRANSLUCENT`; however, if all billboards, labels, or points are either completely opaque or completely translucent, `blendOption` can be changed to `BlendOption.OPAQUE` or `BlendOption.TRANSLUCENT`, respectively, to increase performance by up to 2x.
<<<<<<< HEAD
* Added support to `DebugCameraPrimitive` to draw multifrustum planes. `CesiumInspector` also displays this toggle.
=======
* Added the ability to run the unit tests with a [WebGL Stub](https://github.com/AnalyticalGraphicsInc/cesium/tree/master/Documentation/Contributors/TestingGuide#run-with-webgl-stub), which makes all WebGL calls a noop and ignores test expectations that rely on reading back from WebGL. Use the web link from the main index.html or run with `npm run test-webgl-stub`.
>>>>>>> agi/master
* Fixed `Geocoder` autocomplete drop down visibility in Firefox [#4916](https://github.com/AnalyticalGraphicsInc/cesium/issues/4916)
* Added support to `DebugCameraPrimitive` to draw multifrustum planes. `CesiumInspector` also displays this toggle.

### 1.29 - 2017-01-02

Expand Down
25 changes: 9 additions & 16 deletions Source/Core/PolygonGeometry.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ define([
'./Cartesian2',
'./Cartesian3',
'./Cartographic',
'./Check',
'./ComponentDatatype',
'./defaultValue',
'./defined',
Expand All @@ -31,6 +32,7 @@ define([
Cartesian2,
Cartesian3,
Cartographic,
Check,
ComponentDatatype,
defaultValue,
defined,
Expand Down Expand Up @@ -556,9 +558,8 @@ define([
*/
function PolygonGeometry(options) {
//>>includeStart('debug', pragmas.debug);
if (!defined(options) || !defined(options.polygonHierarchy)) {
throw new DeveloperError('options.polygonHierarchy is required.');
}
Check.typeOf.object('options', options);
Check.typeOf.object('options.polygonHierarchy', options.polygonHierarchy);
if (defined(options.perPositionHeight) && options.perPositionHeight && defined(options.height)) {
throw new DeveloperError('Cannot use both options.perPositionHeight and options.height');
}
Expand Down Expand Up @@ -623,7 +624,7 @@ define([
* @param {Number} [options.height=0.0] The height of the polygon.
* @param {Number} [options.extrudedHeight] The height of the polygon extrusion.
* @param {VertexFormat} [options.vertexFormat=VertexFormat.DEFAULT] The vertex attributes to be computed.
* @param {Number} [options.stRotation=0.0] The rotation of the texture coordiantes, in radians. A positive rotation is counter-clockwise.
* @param {Number} [options.stRotation=0.0] The rotation of the texture coordinates, in radians. A positive rotation is counter-clockwise.
* @param {Ellipsoid} [options.ellipsoid=Ellipsoid.WGS84] The ellipsoid to be used as a reference.
* @param {Number} [options.granularity=CesiumMath.RADIANS_PER_DEGREE] The distance, in radians, between each latitude and longitude. Determines the number of positions in the buffer.
* @param {Boolean} [options.perPositionHeight=false] Use the height of options.positions for each position instead of using options.height to determine the height.
Expand Down Expand Up @@ -651,9 +652,7 @@ define([
options = defaultValue(options, defaultValue.EMPTY_OBJECT);

//>>includeStart('debug', pragmas.debug);
if (!defined(options.positions)) {
throw new DeveloperError('options.positions is required.');
}
Check.defined('options.positions', options.positions);
//>>includeEnd('debug');

var newOptions = {
Expand Down Expand Up @@ -684,12 +683,8 @@ define([
*/
PolygonGeometry.pack = function(value, array, startingIndex) {
//>>includeStart('debug', pragmas.debug);
if (!defined(value)) {
throw new DeveloperError('value is required');
}
if (!defined(array)) {
throw new DeveloperError('array is required');
}
Check.typeOf.object('value', value);
Check.defined('array', array);
//>>includeEnd('debug');

startingIndex = defaultValue(startingIndex, 0);
Expand Down Expand Up @@ -737,9 +732,7 @@ define([
*/
PolygonGeometry.unpack = function(array, startingIndex, result) {
//>>includeStart('debug', pragmas.debug);
if (!defined(array)) {
throw new DeveloperError('array is required');
}
Check.defined('array', array);
//>>includeEnd('debug');

startingIndex = defaultValue(startingIndex, 0);
Expand Down
24 changes: 9 additions & 15 deletions Source/Core/PolygonOutlineGeometry.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ define([
'./arrayRemoveDuplicates',
'./BoundingSphere',
'./Cartesian3',
'./Check',
'./ComponentDatatype',
'./defaultValue',
'./defined',
Expand All @@ -25,6 +26,7 @@ define([
arrayRemoveDuplicates,
BoundingSphere,
Cartesian3,
Check,
ComponentDatatype,
defaultValue,
defined,
Expand Down Expand Up @@ -286,9 +288,9 @@ define([
*/
function PolygonOutlineGeometry(options) {
//>>includeStart('debug', pragmas.debug);
if (!defined(options) || !defined(options.polygonHierarchy)) {
throw new DeveloperError('options.polygonHierarchy is required.');
}
Check.typeOf.object('options', options);
Check.typeOf.object('options.polygonHierarchy', options.polygonHierarchy);

if (defined(options.perPositionHeight) && options.perPositionHeight && defined(options.height)) {
throw new DeveloperError('Cannot use both options.perPositionHeight and options.height');
}
Expand Down Expand Up @@ -335,12 +337,8 @@ define([
*/
PolygonOutlineGeometry.pack = function(value, array, startingIndex) {
//>>includeStart('debug', pragmas.debug);
if (!defined(value)) {
throw new DeveloperError('value is required');
}
if (!defined(array)) {
throw new DeveloperError('array is required');
}
Check.typeOf.object('value', value);
Check.defined('array', array);
//>>includeEnd('debug');

startingIndex = defaultValue(startingIndex, 0);
Expand Down Expand Up @@ -375,9 +373,7 @@ define([
*/
PolygonOutlineGeometry.unpack = function(array, startingIndex, result) {
//>>includeStart('debug', pragmas.debug);
if (!defined(array)) {
throw new DeveloperError('array is required');
}
Check.defined('array', array);
//>>includeEnd('debug');

startingIndex = defaultValue(startingIndex, 0);
Expand Down Expand Up @@ -444,9 +440,7 @@ define([
options = defaultValue(options, defaultValue.EMPTY_OBJECT);

//>>includeStart('debug', pragmas.debug);
if (!defined(options.positions)) {
throw new DeveloperError('options.positions is required.');
}
Check.defined('options.positions', options.positions);
//>>includeEnd('debug');

var newOptions = {
Expand Down
2 changes: 1 addition & 1 deletion Source/Scene/Scene.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2285,7 +2285,7 @@ define([
scene._groundPrimitives.update(frameState);
scene._primitives.update(frameState);
if (defined(scene._debugFrustumPlanes)) {
scene._debugFrustumPlanes.update(frameState)
scene._debugFrustumPlanes.update(frameState);
}

updateShadowMaps(scene);
Expand Down
1 change: 1 addition & 0 deletions Source/Widgets/Geocoder/GeocoderViewModel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ define([

this._searchCommand = createCommand(function() {
that.hideSuggestions();
that._focusTextbox = false;
if (defined(that._selectedSuggestion)) {
that.activateSuggestion(that._selectedSuggestion);
return false;
Expand Down

0 comments on commit 270a0fd

Please sign in to comment.