Merge pull request #11210 from CesiumGS/frustum-fix

Ensure offCenterFrustum's values are updated
CesiumGS · Apr 12, 2023 · 8c82397 · 8c82397
2 parents c31cef7 + efe190b
commit 8c82397
Show file tree

Hide file tree

Showing 12 changed files with 61 additions and 26 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -6,15 +6,16 @@
 
 ##### Fixes :wrench:
 
+- Fixed issue with calling `switchToOrthographicFunction` and `camera.flyTo` in immediate succession. [#11210](https://github.com/CesiumGS/cesium/pull/11210)
 - Fixed an issue when zooming in an orthographic frustum. [#11206](https://github.com/CesiumGS/cesium/pull/11206)
 - Fixed atmosphere rendering performance issue. [10510](https://github.com/CesiumGS/cesium/issues/10510)
+- Fixed model rendering when emissiveTexture is defined and emissiveFactor is not. [#11215](https://github.com/CesiumGS/cesium/pull/11215)
 
 #### @cesium/widgets
 
 ##### Fixes :wrench:
 
 - Fixed missing `ContextOptions` in generated TypeScript definitions. [10963](https://github.com/CesiumGS/cesium/issues/10963)
-- Fixed model rendering when emissiveTexture is defined and emissiveFactor is not. [#11215](https://github.com/CesiumGS/cesium/pull/11215)
 
 ### 1.104 - 2023-04-03
 

diff --git a/packages/engine/Source/Core/FrustumGeometry.js b/packages/engine/Source/Core/FrustumGeometry.js
@@ -327,8 +327,9 @@ FrustumGeometry._computeNearFarPlanes = function (
       );
 
       if (!defined(inverseViewProjection)) {
-        if (defined(frustum._offCenterFrustum)) {
-          frustum = frustum._offCenterFrustum;
+        const offCenterFrustum = frustum.offCenterFrustum;
+        if (defined(offCenterFrustum)) {
+          frustum = offCenterFrustum;
         }
 
         const near = frustumSplits[i];

diff --git a/packages/engine/Source/Core/OrthographicFrustum.js b/packages/engine/Source/Core/OrthographicFrustum.js
@@ -184,6 +184,19 @@ Object.defineProperties(OrthographicFrustum.prototype, {
       return this._offCenterFrustum.projectionMatrix;
     },
   },
+  /**
+   * Gets the orthographic projection matrix computed from the view frustum.
+   * @memberof OrthographicFrustum.prototype
+   * @type {OrthographicOffCenterFrustum}
+   * @readonly
+   * @private
+   */
+  offCenterFrustum: {
+    get: function () {
+      update(this);
+      return this._offCenterFrustum;
+    },
+  },
 });
 
 /**

diff --git a/packages/engine/Source/Core/PerspectiveFrustum.js b/packages/engine/Source/Core/PerspectiveFrustum.js
@@ -274,6 +274,20 @@ Object.defineProperties(PerspectiveFrustum.prototype, {
       return this._sseDenominator;
     },
   },
+
+  /**
+   * Gets the orthographic projection matrix computed from the view frustum.
+   * @memberof PerspectiveFrustum.prototype
+   * @type {PerspectiveOffCenterFrustum}
+   * @readonly
+   * @private
+   */
+  offCenterFrustum: {
+    get: function () {
+      update(this);
+      return this._offCenterFrustum;
+    },
+  },
 });
 
 /**

diff --git a/packages/engine/Source/Renderer/UniformState.js b/packages/engine/Source/Renderer/UniformState.js
@@ -1173,8 +1173,9 @@ UniformState.prototype.updateFrustum = function (frustum) {
   this._oneOverLog2FarDepthFromNearPlusOne =
     1.0 / this._log2FarDepthFromNearPlusOne;
 
-  if (defined(frustum._offCenterFrustum)) {
-    frustum = frustum._offCenterFrustum;
+  const offCenterFrustum = frustum.offCenterFrustum;
+  if (defined(offCenterFrustum)) {
+    frustum = offCenterFrustum;
   }
 
   this._frustumPlanes.x = frustum.top;

diff --git a/packages/engine/Source/Scene/Camera.js b/packages/engine/Source/Scene/Camera.js
@@ -2602,9 +2602,8 @@ function rectangleCameraPosition3D(camera, rectangle, result, updateCamera) {
 
     let rightScalar;
     let topScalar;
-    const ratio =
-      camera.frustum._offCenterFrustum.right /
-      camera.frustum._offCenterFrustum.top;
+    const offCenterFrustum = camera.frustum._offCenterFrustum;
+    const ratio = offCenterFrustum.right / offCenterFrustum.top;
     const heightRatio = height * ratio;
     if (width > heightRatio) {
       rightScalar = width;
@@ -2950,8 +2949,9 @@ function getPickRayOrthographic(camera, windowPosition, result) {
   const height = canvas.clientHeight;
 
   let frustum = camera.frustum;
-  if (defined(frustum._offCenterFrustum)) {
-    frustum = frustum._offCenterFrustum;
+  const offCenterFrustum = frustum.offCenterFrustum;
+  if (defined(offCenterFrustum)) {
+    frustum = offCenterFrustum;
   }
   let x = (2.0 / width) * windowPosition.x - 1.0;
   x *= (frustum.right - frustum.left) * 0.5;
@@ -3440,8 +3440,9 @@ function distanceToBoundingSphere3D(camera, radius) {
 
 function distanceToBoundingSphere2D(camera, radius) {
   let frustum = camera.frustum;
-  if (defined(frustum._offCenterFrustum)) {
-    frustum = frustum._offCenterFrustum;
+  const offCenterFrustum = frustum.offCenterFrustum;
+  if (defined(offCenterFrustum)) {
+    frustum = offCenterFrustum;
   }
 
   let right, top;

diff --git a/packages/engine/Source/Scene/Cesium3DTile.js b/packages/engine/Source/Scene/Cesium3DTile.js
@@ -917,8 +917,9 @@ Cesium3DTile.prototype.getScreenSpaceError = function (
     frameState.mode === SceneMode.SCENE2D ||
     frustum instanceof OrthographicFrustum
   ) {
-    if (defined(frustum._offCenterFrustum)) {
-      frustum = frustum._offCenterFrustum;
+    const offCenterFrustum = frustum.offCenterFrustum;
+    if (defined(offCenterFrustum)) {
+      frustum = offCenterFrustum;
     }
     const pixelSize =
       Math.max(frustum.top - frustum.bottom, frustum.right - frustum.left) /

diff --git a/packages/engine/Source/Scene/Picking.js b/packages/engine/Source/Scene/Picking.js
@@ -92,8 +92,9 @@ function getPickOrthographicCullingVolume(
 ) {
   const camera = scene.camera;
   let frustum = camera.frustum;
-  if (defined(frustum._offCenterFrustum)) {
-    frustum = frustum._offCenterFrustum;
+  const offCenterFrustum = frustum.offCenterFrustum;
+  if (defined(offCenterFrustum)) {
+    frustum = offCenterFrustum;
   }
 
   let x = (2.0 * (drawingBufferPosition.x - viewport.x)) / viewport.width - 1.0;

diff --git a/packages/engine/Source/Scene/QuadtreePrimitive.js b/packages/engine/Source/Scene/QuadtreePrimitive.js
@@ -1275,8 +1275,9 @@ function screenSpaceError(primitive, frameState, tile) {
 function screenSpaceError2D(primitive, frameState, tile) {
   const camera = frameState.camera;
   let frustum = camera.frustum;
-  if (defined(frustum._offCenterFrustum)) {
-    frustum = frustum._offCenterFrustum;
+  const offCenterFrustum = frustum.offCenterFrustum;
+  if (defined(offCenterFrustum)) {
+    frustum = offCenterFrustum;
   }
 
   const context = frameState.context;

diff --git a/packages/engine/Source/Scene/SceneTransforms.js b/packages/engine/Source/Scene/SceneTransforms.js
@@ -432,8 +432,9 @@ SceneTransforms.drawingBufferToWgs84Coordinates = function (
   let worldCoords;
   let frustum = scene.camera.frustum;
   if (!defined(frustum.fovy)) {
-    if (defined(frustum._offCenterFrustum)) {
-      frustum = frustum._offCenterFrustum;
+    const offCenterFrustum = frustum.offCenterFrustum;
+    if (defined(offCenterFrustum)) {
+      frustum = offCenterFrustum;
     }
     worldCoords = scratchWorldCoords;
     worldCoords.x =

diff --git a/packages/engine/Specs/Core/OrthographicFrustumSpec.js b/packages/engine/Specs/Core/OrthographicFrustumSpec.js
@@ -138,8 +138,7 @@ describe("Core/OrthographicFrustum", function () {
   });
 
   it("get orthographic projection matrix", function () {
-    const projectionMatrix = frustum.projectionMatrix;
-    frustum = frustum._offCenterFrustum;
+    frustum = frustum.offCenterFrustum;
     const expected = Matrix4.computeOrthographicOffCenter(
       frustum.left,
       frustum.right,
@@ -149,6 +148,7 @@ describe("Core/OrthographicFrustum", function () {
       frustum.far,
       new Matrix4()
     );
+    const projectionMatrix = frustum.projectionMatrix;
     expect(projectionMatrix).toEqualEpsilon(expected, CesiumMath.EPSILON6);
   });
 
@@ -217,7 +217,7 @@ describe("Core/OrthographicFrustum", function () {
       pixelRatio,
       new Cartesian2()
     );
-    const expected = frustum._offCenterFrustum.getPixelDimensions(
+    const expected = frustum.offCenterFrustum.getPixelDimensions(
       dimensions.x,
       dimensions.y,
       distance,
@@ -239,7 +239,7 @@ describe("Core/OrthographicFrustum", function () {
       pixelRatio,
       new Cartesian2()
     );
-    const expected = frustum._offCenterFrustum.getPixelDimensions(
+    const expected = frustum.offCenterFrustum.getPixelDimensions(
       dimensions.x,
       dimensions.y,
       distance,

diff --git a/packages/engine/Specs/Core/PerspectiveFrustumSpec.js b/packages/engine/Specs/Core/PerspectiveFrustumSpec.js
@@ -250,7 +250,7 @@ describe("Core/PerspectiveFrustum", function () {
       pixelRatio,
       new Cartesian2()
     );
-    const expected = frustum._offCenterFrustum.getPixelDimensions(
+    const expected = frustum.offCenterFrustum.getPixelDimensions(
       dimensions.x,
       dimensions.y,
       distance,
@@ -272,7 +272,7 @@ describe("Core/PerspectiveFrustum", function () {
       pixelRatio,
       new Cartesian2()
     );
-    const expected = frustum._offCenterFrustum.getPixelDimensions(
+    const expected = frustum.offCenterFrustum.getPixelDimensions(
       dimensions.x,
       dimensions.y,
       distance,