Scale geometric error with tileset

Apps/Sandcastle/gallery/development/Frustum.html

@@ -34,7 +34,7 @@
 var positionOnEllipsoid = Cesium.Cartesian3.fromDegrees(-105.0, 45.0, 20.0);
 
 var enu = Cesium.Transforms.eastNorthUpToFixedFrame(positionOnEllipsoid);
-var rotation = Cesium.Matrix4.getRotation(enu, new Cesium.Matrix3());
+var rotation = Cesium.Matrix4.getMatrix3(enu, new Cesium.Matrix3());
 Cesium.Matrix3.multiply(rotation, Cesium.Matrix3.fromRotationX(-Cesium.Math.PI_OVER_TWO), rotation);
 var orientation = Cesium.Quaternion.fromRotationMatrix(rotation);
 

CHANGES.md

@@ -5,6 +5,7 @@ Change Log
 
 ##### Deprecated :hourglass_flowing_sand:
 * `createTileMapServiceImageryProvider` and `createOpenStreetMapImageryProvider` have been deprecated and will be removed in Cesium 1.65.  Instead, pass the same options to `new TileMapServiceImageryProvider` and `new OpenStreetMapImageryProvider` respectively.
+* The function `Matrix4.getRotation` has been deprecated and renamed to `Matrix4.getMatrix3`. `Matrix4.getRotation` will be removed in version 1.65.
 
 ##### Additions :tada:
 * Added ability to create partial ellipsoids using both the Entity API and CZML. New ellipsoid geometry properties: `innerRadii`, `minimumClock`, `maximumClock`, `minimumCone`, and `maximumCone`. This affects both `EllipsoidGeometry` and `EllipsoidOutlineGeometry`. See the updated [Sandcastle example](https://cesiumjs.org/Cesium/Apps/Sandcastle/?src=Partial%20Ellipsoids.html&label=Geometries). [#5995](https://github.com/AnalyticalGraphicsInc/cesium/pull/5995)

Source/Core/GeometryPipeline.js

@@ -808,7 +808,7 @@ define([
 
             Matrix4.inverse(modelMatrix, inverseTranspose);
             Matrix4.transpose(inverseTranspose, inverseTranspose);
-            Matrix4.getRotation(inverseTranspose, normalMatrix);
+            Matrix4.getMatrix3(inverseTranspose, normalMatrix);
 
             transformVector(normalMatrix, attributes.normal);
             transformVector(normalMatrix, attributes.tangent);

Source/Core/Matrix3.js

@@ -1023,6 +1023,27 @@ define([
         return result;
     };
 
+    var UNIT = new Cartesian3(1, 1, 1);
+
+    /**
+     * Extracts the rotation assuming the matrix is an affine transformation.
+     *
+     * @param {Matrix3} matrix The matrix.
+     * @param {Matrix3} result The object onto which to store the result.
+     * @returns {Matrix3} The modified result parameter
+     */
+    Matrix3.getRotation = function(matrix, result) {
+        //>>includeStart('debug', pragmas.debug);
+        Check.typeOf.object('matrix', matrix);
+        Check.typeOf.object('result', result);
+        //>>includeEnd('debug');
+
+        var inverseScale = Cartesian3.divideComponents(UNIT, Matrix3.getScale(matrix, scratchScale), scratchScale);
+        result = Matrix3.multiplyByScale(matrix, inverseScale, result);
+
+        return result;
+    };
+
     function computeFrobeniusNorm(matrix) {
         var norm = 0.0;
         for (var i = 0; i < 9; ++i) {

Source/Core/Matrix4.js

@@ -5,6 +5,7 @@ define([
         './defaultValue',
         './defined',
         './defineProperties',
+        './deprecationWarning',
         './freezeObject',
         './Math',
         './Matrix3',
@@ -16,6 +17,7 @@ define([
         defaultValue,
         defined,
         defineProperties,
+        deprecationWarning,
         freezeObject,
         CesiumMath,
         Matrix3,
@@ -65,9 +67,9 @@ define([
      * @see Packable
      */
     function Matrix4(column0Row0, column1Row0, column2Row0, column3Row0,
-                           column0Row1, column1Row1, column2Row1, column3Row1,
-                           column0Row2, column1Row2, column2Row2, column3Row2,
-                           column0Row3, column1Row3, column2Row3, column3Row3) {
+                     column0Row1, column1Row1, column2Row1, column3Row1,
+                     column0Row2, column1Row2, column2Row2, column3Row2,
+                     column0Row3, column1Row3, column2Row3, column3Row3) {
         this[0] = defaultValue(column0Row0, 0.0);
         this[1] = defaultValue(column0Row1, 0.0);
         this[2] = defaultValue(column0Row2, 0.0);
@@ -378,16 +380,16 @@ define([
         var m21 = 2.0 * (yz + xw);
         var m22 = -x2 - y2 + z2 + w2;
 
-        result[0]  = m00 * scaleX;
-        result[1]  = m10 * scaleX;
-        result[2]  = m20 * scaleX;
-        result[3]  = 0.0;
-        result[4]  = m01 * scaleY;
-        result[5]  = m11 * scaleY;
-        result[6]  = m21 * scaleY;
-        result[7]  = 0.0;
-        result[8]  = m02 * scaleZ;
-        result[9]  = m12 * scaleZ;
+        result[0] = m00 * scaleX;
+        result[1] = m10 * scaleX;
+        result[2] = m20 * scaleX;
+        result[3] = 0.0;
+        result[4] = m01 * scaleY;
+        result[5] = m11 * scaleY;
+        result[6] = m21 * scaleY;
+        result[7] = 0.0;
+        result[8] = m02 * scaleZ;
+        result[9] = m12 * scaleZ;
         result[10] = m22 * scaleZ;
         result[11] = 0.0;
         result[12] = translation.x;
@@ -565,8 +567,8 @@ define([
         var positionX = position.x;
         var positionY = position.y;
         var positionZ = position.z;
-        var t0 = sX * -positionX + sY * -positionY+ sZ * -positionZ;
-        var t1 = uX * -positionX + uY * -positionY+ uZ * -positionZ;
+        var t0 = sX * -positionX + sY * -positionY + sZ * -positionZ;
+        var t1 = uX * -positionX + uY * -positionY + uZ * -positionZ;
         var t2 = fX * positionX + fY * positionY + fZ * positionZ;
 
         // The code below this comment is an optimized
@@ -610,21 +612,21 @@ define([
         return result;
     };
 
-     /**
-      * Computes a Matrix4 instance representing a perspective transformation matrix.
-      *
-      * @param {Number} fovY The field of view along the Y axis in radians.
-      * @param {Number} aspectRatio The aspect ratio.
-      * @param {Number} near The distance to the near plane in meters.
-      * @param {Number} far The distance to the far plane in meters.
-      * @param {Matrix4} result The object in which the result will be stored.
-      * @returns {Matrix4} The modified result parameter.
-      *
-      * @exception {DeveloperError} fovY must be in (0, PI].
-      * @exception {DeveloperError} aspectRatio must be greater than zero.
-      * @exception {DeveloperError} near must be greater than zero.
-      * @exception {DeveloperError} far must be greater than zero.
-      */
+    /**
+     * Computes a Matrix4 instance representing a perspective transformation matrix.
+     *
+     * @param {Number} fovY The field of view along the Y axis in radians.
+     * @param {Number} aspectRatio The aspect ratio.
+     * @param {Number} near The distance to the near plane in meters.
+     * @param {Number} far The distance to the far plane in meters.
+     * @param {Matrix4} result The object in which the result will be stored.
+     * @returns {Matrix4} The modified result parameter.
+     *
+     * @exception {DeveloperError} fovY must be in (0, PI].
+     * @exception {DeveloperError} aspectRatio must be greater than zero.
+     * @exception {DeveloperError} near must be greater than zero.
+     * @exception {DeveloperError} far must be greater than zero.
+     */
     Matrix4.computePerspectiveFieldOfView = function(fovY, aspectRatio, near, far, result) {
         //>>includeStart('debug', pragmas.debug);
         Check.typeOf.number.greaterThan('fovY', fovY, 0.0);
@@ -661,17 +663,17 @@ define([
     };
 
     /**
-    * Computes a Matrix4 instance representing an orthographic transformation matrix.
-    *
-    * @param {Number} left The number of meters to the left of the camera that will be in view.
-    * @param {Number} right The number of meters to the right of the camera that will be in view.
-    * @param {Number} bottom The number of meters below of the camera that will be in view.
-    * @param {Number} top The number of meters above of the camera that will be in view.
-    * @param {Number} near The distance to the near plane in meters.
-    * @param {Number} far The distance to the far plane in meters.
-    * @param {Matrix4} result The object in which the result will be stored.
-    * @returns {Matrix4} The modified result parameter.
-    */
+     * Computes a Matrix4 instance representing an orthographic transformation matrix.
+     *
+     * @param {Number} left The number of meters to the left of the camera that will be in view.
+     * @param {Number} right The number of meters to the right of the camera that will be in view.
+     * @param {Number} bottom The number of meters below of the camera that will be in view.
+     * @param {Number} top The number of meters above of the camera that will be in view.
+     * @param {Number} near The distance to the near plane in meters.
+     * @param {Number} far The distance to the far plane in meters.
+     * @param {Matrix4} result The object in which the result will be stored.
+     * @returns {Matrix4} The modified result parameter.
+     */
     Matrix4.computeOrthographicOffCenter = function(left, right, bottom, top, near, far, result) {
         //>>includeStart('debug', pragmas.debug);
         Check.typeOf.number('left', left);
@@ -2110,7 +2112,7 @@ define([
         //>>includeEnd('debug');
 
         return (left === right) ||
-                (defined(left) &&
+               (defined(left) &&
                 defined(right) &&
                 Math.abs(left[0] - right[0]) <= epsilon &&
                 Math.abs(left[1] - right[1]) <= epsilon &&
@@ -2150,7 +2152,21 @@ define([
     };
 
     /**
-     * Gets the upper left 3x3 rotation matrix of the provided matrix, assuming the matrix is a affine transformation matrix.
+     * Gets the upper left 3x3 rotation matrix of the provided matrix, assuming the matrix is an affine transformation matrix.
+     *
+     * @param {Matrix4} matrix The matrix to use.
+     * @param {Matrix3} result The object onto which to store the result.
+     * @returns {Matrix3} The modified result parameter.
+     *
+     * @deprecated moved to Matrix4.getMatrix3
+     */
+    Matrix4.getRotation = function(matrix, result) {
+        deprecationWarning('Matrix4.getRotation', 'Matrix4.getRotation is deprecated and will be removed in Cesium 1.65. Use Matrix4.getMatrix3 instead.');
+        return Matrix4.getMatrix3(matrix, result);
+    };
+
+    /**
+     * Gets the upper left 3x3 rotation matrix of the provided matrix, assuming the matrix is an affine transformation matrix.
      *
      * @param {Matrix4} matrix The matrix to use.
      * @param {Matrix3} result The object onto which to store the result.
@@ -2165,13 +2181,13 @@ define([
      * //     [13.0, 17.0, 21.0, 25.0]
      *
      * var b = new Cesium.Matrix3();
-     * Cesium.Matrix4.getRotation(m,b);
+     * Cesium.Matrix4.getMatrix3(m,b);
      *
      * // b = [10.0, 14.0, 18.0]
      * //     [11.0, 15.0, 19.0]
      * //     [12.0, 16.0, 20.0]
      */
-    Matrix4.getRotation = function(matrix, result) {
+    Matrix4.getMatrix3 = function(matrix, result) {
         //>>includeStart('debug', pragmas.debug);
         Check.typeOf.object('matrix', matrix);
         Check.typeOf.object('result', result);
@@ -2194,18 +2210,18 @@ define([
     var scratchBottomRow = new Cartesian4();
     var scratchExpectedBottomRow = new Cartesian4(0.0, 0.0, 0.0, 1.0);
 
-     /**
-      * Computes the inverse of the provided matrix using Cramers Rule.
-      * If the determinant is zero, the matrix can not be inverted, and an exception is thrown.
-      * If the matrix is an affine transformation matrix, it is more efficient
-      * to invert it with {@link Matrix4.inverseTransformation}.
-      *
-      * @param {Matrix4} matrix The matrix to invert.
-      * @param {Matrix4} result The object onto which to store the result.
-      * @returns {Matrix4} The modified result parameter.
-      *
-      * @exception {RuntimeError} matrix is not invertible because its determinate is zero.
-      */
+    /**
+     * Computes the inverse of the provided matrix using Cramers Rule.
+     * If the determinant is zero, the matrix can not be inverted, and an exception is thrown.
+     * If the matrix is an affine transformation matrix, it is more efficient
+     * to invert it with {@link Matrix4.inverseTransformation}.
+     *
+     * @param {Matrix4} matrix The matrix to invert.
+     * @param {Matrix4} result The object onto which to store the result.
+     * @returns {Matrix4} The modified result parameter.
+     *
+     * @exception {RuntimeError} matrix is not invertible because its determinate is zero.
+     */
     Matrix4.inverse = function(matrix, result) {
         //>>includeStart('debug', pragmas.debug);
         Check.typeOf.object('matrix', matrix);
@@ -2284,9 +2300,9 @@ define([
         var det = src0 * dst0 + src1 * dst1 + src2 * dst2 + src3 * dst3;
 
         if (Math.abs(det) < CesiumMath.EPSILON21) {
-                // Special case for a zero scale matrix that can occur, for example,
-                // when a model's node has a [0, 0, 0] scale.
-                if (Matrix3.equalsEpsilon(Matrix4.getRotation(matrix, scratchInverseRotation), scratchMatrix3Zero, CesiumMath.EPSILON7) &&
+            // Special case for a zero scale matrix that can occur, for example,
+            // when a model's node has a [0, 0, 0] scale.
+            if (Matrix3.equalsEpsilon(Matrix4.getMatrix3(matrix, scratchInverseRotation), scratchMatrix3Zero, CesiumMath.EPSILON7) &&
                 Cartesian4.equals(Matrix4.getRow(matrix, 3, scratchBottomRow), scratchExpectedBottomRow)) {
 
                 result[0] = 0.0;
@@ -2353,7 +2369,7 @@ define([
         //>>includeEnd('debug');
 
         //This function is an optimized version of the below 4 lines.
-        //var rT = Matrix3.transpose(Matrix4.getRotation(matrix));
+        //var rT = Matrix3.transpose(Matrix4.getMatrix3(matrix));
         //var rTN = Matrix3.negate(rT);
         //var rTT = Matrix3.multiplyByVector(rTN, Matrix4.getTranslation(matrix));
         //return Matrix4.fromRotationTranslation(rT, rTT, result);
@@ -2622,10 +2638,10 @@ define([
      * @returns {String} A string representing the provided Matrix with each row being on a separate line and in the format '(column0, column1, column2, column3)'.
      */
     Matrix4.prototype.toString = function() {
-        return '(' + this[0] + ', ' + this[4] + ', ' + this[8] + ', ' + this[12] +')\n' +
-               '(' + this[1] + ', ' + this[5] + ', ' + this[9] + ', ' + this[13] +')\n' +
-               '(' + this[2] + ', ' + this[6] + ', ' + this[10] + ', ' + this[14] +')\n' +
-               '(' + this[3] + ', ' + this[7] + ', ' + this[11] + ', ' + this[15] +')';
+        return '(' + this[0] + ', ' + this[4] + ', ' + this[8] + ', ' + this[12] + ')\n' +
+               '(' + this[1] + ', ' + this[5] + ', ' + this[9] + ', ' + this[13] + ')\n' +
+               '(' + this[2] + ', ' + this[6] + ', ' + this[10] + ', ' + this[14] + ')\n' +
+               '(' + this[3] + ', ' + this[7] + ', ' + this[11] + ', ' + this[15] + ')';
     };
 
     return Matrix4;

Source/Core/Transforms.js

@@ -376,7 +376,7 @@ define([
         //>>includeEnd('debug');
 
         var transform = Transforms.headingPitchRollToFixedFrame(origin, headingPitchRoll, ellipsoid, fixedFrameTransform, scratchENUMatrix4);
-        var rotation = Matrix4.getRotation(transform, scratchHPRMatrix3);
+        var rotation = Matrix4.getMatrix3(transform, scratchHPRMatrix3);
         return Quaternion.fromRotationMatrix(rotation, result);
     };
 
@@ -421,7 +421,7 @@ define([
         transformCopy = Matrix4.setTranslation(transformCopy, Cartesian3.ZERO, transformCopy);
 
         toFixedFrame = Matrix4.multiply(toFixedFrame, transformCopy, toFixedFrame);
-        var quaternionRotation = Quaternion.fromRotationMatrix(Matrix4.getRotation(toFixedFrame, hprRotationScratch), hprQuaternionScratch);
+        var quaternionRotation = Quaternion.fromRotationMatrix(Matrix4.getMatrix3(toFixedFrame, hprRotationScratch), hprQuaternionScratch);
         quaternionRotation = Quaternion.normalize(quaternionRotation, quaternionRotation);
 
         return HeadingPitchRoll.fromQuaternion(quaternionRotation, result);
@@ -878,7 +878,7 @@ define([
         // Assuming the instance are positioned in WGS84, invert the WGS84 transform to get the local transform and then convert to 2D
         var fromENU = Transforms.eastNorthUpToFixedFrame(rtcCenter, ellipsoid, scratchFromENU);
         var toENU = Matrix4.inverseTransformation(fromENU, scratchToENU);
-        var rotation = Matrix4.getRotation(matrix, scratchRotation);
+        var rotation = Matrix4.getMatrix3(matrix, scratchRotation);
         var local = Matrix4.multiplyByMatrix3(toENU, rotation, result);
         Matrix4.multiply(swizzleMatrix, local, result); // Swap x, y, z for 2D
         Matrix4.setTranslation(result, projectedPosition, result); // Use the projected center