From a8e40d2629bf5a7ac82977ee2f456792c99a23ab Mon Sep 17 00:00:00 2001 From: hanbollar Date: Tue, 23 Jan 2018 17:10:26 -0500 Subject: [PATCH 1/5] discrepency between original scaling of 2x2x2, Matrix.Identity default, and what was actually used in default constructor --- Source/Core/OrientedBoundingBox.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/OrientedBoundingBox.js b/Source/Core/OrientedBoundingBox.js index 038fdc5f9b4c..c2182ba1984d 100644 --- a/Source/Core/OrientedBoundingBox.js +++ b/Source/Core/OrientedBoundingBox.js @@ -42,7 +42,7 @@ define([ * * @param {Cartesian3} [center=Cartesian3.ZERO] The center of the box. * @param {Matrix3} [halfAxes=Matrix3.ZERO] The three orthogonal half-axes of the bounding box. - * Equivalently, the transformation matrix, to rotate and scale a 2x2x2 + * Equivalently, the transformation matrix, to rotate and scale a 1x1x1 * cube centered at the origin. * * @@ -68,7 +68,7 @@ define([ * @type {Matrix3} * @default {@link Matrix3.IDENTITY} */ - this.halfAxes = Matrix3.clone(defaultValue(halfAxes, Matrix3.ZERO)); + this.halfAxes = Matrix3.clone(defaultValue(halfAxes, Matrix3.IDENTITY)); } /** From 9a73071166b9920ea70695084bd02599b03349ad Mon Sep 17 00:00:00 2001 From: hanbollar Date: Tue, 23 Jan 2018 17:12:20 -0500 Subject: [PATCH 2/5] updated changes.md --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 1d0da93ac3cb..7bf7d2219f78 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -37,6 +37,7 @@ Change Log * Added separate file for the Cesium [Code of Conduct](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CODE_OF_CONDUCT.md). [#6129](https://github.com/AnalyticalGraphicsInc/cesium/pull/6129) * Fixed applying a translucent style to a point cloud tileset. [#6113](https://github.com/AnalyticalGraphicsInc/cesium/pull/6113) * Fixed Sandcastle Particle System example for better visual [#6132](https://github.com/AnalyticalGraphicsInc/cesium/pull/6132) +* Fixed discrepancy between default value used and commented value for default value for halfAxes of OrientedBoundingBox. ### 1.41 - 2018-01-02 From cbbe1fe799325435ae8ce8711f638140e43642ac Mon Sep 17 00:00:00 2001 From: hanbollar Date: Tue, 23 Jan 2018 17:24:30 -0500 Subject: [PATCH 3/5] modified to better default value and matched constructor comments to value. --- Source/Core/OrientedBoundingBox.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Core/OrientedBoundingBox.js b/Source/Core/OrientedBoundingBox.js index c2182ba1984d..ae57fe7edb56 100644 --- a/Source/Core/OrientedBoundingBox.js +++ b/Source/Core/OrientedBoundingBox.js @@ -42,7 +42,7 @@ define([ * * @param {Cartesian3} [center=Cartesian3.ZERO] The center of the box. * @param {Matrix3} [halfAxes=Matrix3.ZERO] The three orthogonal half-axes of the bounding box. - * Equivalently, the transformation matrix, to rotate and scale a 1x1x1 + * Equivalently, the transformation matrix, to rotate and scale a 0x0x0 * cube centered at the origin. * * @@ -66,9 +66,9 @@ define([ /** * The transformation matrix, to rotate the box to the right position. * @type {Matrix3} - * @default {@link Matrix3.IDENTITY} + * @default {@link Matrix3.ZERO} */ - this.halfAxes = Matrix3.clone(defaultValue(halfAxes, Matrix3.IDENTITY)); + this.halfAxes = Matrix3.clone(defaultValue(halfAxes, Matrix3.ZERO)); } /** From 9c36d12442567a8fbfd1cb29ecab55281baa5a69 Mon Sep 17 00:00:00 2001 From: Hannah Date: Thu, 25 Jan 2018 10:11:50 -0500 Subject: [PATCH 4/5] Update CHANGES.md --- CHANGES.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index db7b24af60c6..9acf8b0c83fd 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -36,7 +36,6 @@ Change Log * Added support for vertex shader uniforms when `tileset.colorBlendMode` is `MIX` or `REPLACE`. [#5874](https://github.com/AnalyticalGraphicsInc/cesium/pull/5874) * Added separate file for the Cesium [Code of Conduct](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CODE_OF_CONDUCT.md). [#6129](https://github.com/AnalyticalGraphicsInc/cesium/pull/6129) * Fixed applying a translucent style to a point cloud tileset. [#6113](https://github.com/AnalyticalGraphicsInc/cesium/pull/6113) -* Fixed Sandcastle Particle System example for better visual [#6132](https://github.com/AnalyticalGraphicsInc/cesium/pull/6132) * Fixed sandcastle Particle System example for better visual [#6132](https://github.com/AnalyticalGraphicsInc/cesium/pull/6132) * Fixed camera movement and look functions for 2D mode [#5884](https://github.com/AnalyticalGraphicsInc/cesium/issues/5884) * Fixed discrepancy between default value used and commented value for default value for halfAxes of OrientedBoundingBox. From f1e3dc2d33eafaa2578b044b9fe284c60ca75511 Mon Sep 17 00:00:00 2001 From: Hannah Date: Thu, 25 Jan 2018 10:12:46 -0500 Subject: [PATCH 5/5] Update CHANGES.md --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 9acf8b0c83fd..de43c29e0d7f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -38,7 +38,7 @@ Change Log * Fixed applying a translucent style to a point cloud tileset. [#6113](https://github.com/AnalyticalGraphicsInc/cesium/pull/6113) * Fixed sandcastle Particle System example for better visual [#6132](https://github.com/AnalyticalGraphicsInc/cesium/pull/6132) * Fixed camera movement and look functions for 2D mode [#5884](https://github.com/AnalyticalGraphicsInc/cesium/issues/5884) -* Fixed discrepancy between default value used and commented value for default value for halfAxes of OrientedBoundingBox. +* Fixed discrepancy between default value used and commented value for default value for halfAxes of OrientedBoundingBox. [#6147](https://github.com/AnalyticalGraphicsInc/cesium/pull/6147) ### 1.41 - 2018-01-02