Merge pull request #6147 from hanbollar/fix-for-default-scale-of-orie…

…nted-bounding-box Fix for default scale of oriented bounding box
CesiumGS · Jan 25, 2018 · a1e3c6a · a1e3c6a
2 parents de2fce7 + f1e3dc2
commit a1e3c6a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -38,6 +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. [#6147](https://github.com/AnalyticalGraphicsInc/cesium/pull/6147)
 
 ### 1.41 - 2018-01-02
 

diff --git 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 0x0x0
      *                                          cube centered at the origin.
      *
      *
@@ -66,7 +66,7 @@ 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.ZERO));
     }