Use globe.terrainExaggeration if scene.verticalExaggeration is not set

CesiumGS · Dec 1, 2023 · c4dfc59 · c4dfc59
1 parent 6953452
commit c4dfc59
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/packages/engine/Source/Scene/Scene.js b/packages/engine/Source/Scene/Scene.js
@@ -1900,10 +1900,17 @@ Scene.prototype.updateFrameState = function () {
 
   frameState.verticalExaggeration = this.verticalExaggeration;
   frameState.verticalExaggerationRelativeHeight = this.verticalExaggerationRelativeHeight;
-  if (defined(this.globe && this.verticalExaggeration !== 1.0)) {
-    // Update terrain exaggeration to match the rest of the scene
-    this.globe.terrainExaggeration = this.verticalExaggeration;
-    this.globe.terrainExaggerationRelativeHeight = this.verticalExaggerationRelativeHeight;
+  if (defined(this.globe)) {
+    if (this.verticalExaggeration !== 1.0) {
+      // Update terrain exaggeration to match the rest of the scene
+      this.globe.terrainExaggeration = this.verticalExaggeration;
+      this.globe.terrainExaggerationRelativeHeight = this.verticalExaggerationRelativeHeight;
+    } else {
+      // The new .verticalExaggeration was not set.
+      // Use the old globe.terrainExaggeration
+      frameState.verticalExaggeration = this.globe.terrainExaggeration;
+      frameState.verticalExaggerationRelativeHeight = this.globe.terrainExaggerationRelativeHeight;
+    }
   }
 
   if (