scale geometric error alongside tileset

geoscan · Dec 7, 2018 · 3632059 · 3632059
1 parent 92817d1
commit 3632059
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/Source/Core/Matrix4.js b/Source/Core/Matrix4.js
@@ -2149,6 +2149,10 @@ define([
         return result;
     };
 
+
+    var UNIT = new Cartesian3(1, 1, 1);
+    var scratchScale = new Cartesian3();
+
     /**
      * Gets the upper left 3x3 rotation matrix of the provided matrix, assuming the matrix is a affine transformation matrix.
      *
@@ -2186,6 +2190,13 @@ define([
         result[6] = matrix[8];
         result[7] = matrix[9];
         result[8] = matrix[10];
+        Matrix3.multiplyByScale(
+            result,
+            Cartesian3.divideComponents(
+                UNIT, Matrix3.getScale(result, scratchScale), scratchScale
+            ),
+            result
+        )
         return result;
     };
 

diff --git a/Source/Scene/Cesium3DTile.js b/Source/Scene/Cesium3DTile.js
@@ -137,10 +137,10 @@ define([
          * @type {Number}
          * @readonly
          */
-        this.geometricError = header.geometricError;
+        this._geometricError = header.geometricError;
 
-        if (!defined(this.geometricError)) {
-            this.geometricError = defined(parent) ? parent.geometricError : tileset._geometricError;
+        if (!defined(this._geometricError)) {
+            this._geometricError = defined(parent) ? parent.geometricError : tileset._geometricError;
             Cesium3DTile._deprecationWarning('geometricErrorUndefined', 'Required property geometricError is undefined for this tile. Using parent\'s geometric error instead.');
         }
 
@@ -349,6 +349,8 @@ define([
     // This can be overridden for testing purposes
     Cesium3DTile._deprecationWarning = deprecationWarning;
 
+    var scratchScale = new Cartesian3();
+
     defineProperties(Cesium3DTile.prototype, {
         /**
          * The tileset containing this tile.
@@ -602,7 +604,13 @@ define([
             get : function() {
                 return this._commandsLength;
             }
-        }
+        },
+
+        geometricError : {
+            get : function() {
+                return Cartesian3.maximumComponent(Matrix4.getScale(this.computedTransform, scratchScale)) * this._geometricError;
+            }
+		}
     });
 
     var scratchJulianDate = new JulianDate();

diff --git a/Source/Scene/PointCloud.js b/Source/Scene/PointCloud.js
@@ -1163,7 +1163,7 @@ define([
         vs += '    v_color = color; \n' +
               '    gl_Position = czm_modelViewProjection * vec4(position, 1.0); \n';
 
-        if (usesNormals && backFaceCulling) {
+        if (usesNormals && true) {
             vs += '    float visible = step(-normal.z, 0.0); \n' +
                   '    gl_Position *= visible; \n' +
                   '    gl_PointSize *= visible; \n';