@rtzh/engine 0.0.7 → 0.0.9

package/Build/Workers/incrementallyBuildTerrainPicker.js

@@ -1,7 +1,7 @@
 /**
  * @license
  * Cesium - https://github.com/CesiumGS/cesium
- * Version 0.0.8
+ * Version 0.0.10
  *
  * Copyright 2011-2022 Cesium Contributors
  *
@@ -25,21 +25,21 @@
 
 import {
   createTaskProcessorWorker_default
-} from "./chunk-3WT5VKYM.js";
+} from "./chunk-2CZLDPAQ.js";
 import {
   AxisAlignedBoundingBox_default
-} from "./chunk-C3G2NDXM.js";
-import "./chunk-IRG63TBY.js";
+} from "./chunk-4UBPBH32.js";
+import "./chunk-NUMQ72QV.js";
 import {
   Matrix4_default
-} from "./chunk-GWLEBUVI.js";
-import "./chunk-IY53MZW2.js";
+} from "./chunk-PEEYBEL5.js";
+import "./chunk-SXISWCV7.js";
 import {
   Cartesian3_default
-} from "./chunk-HEKLTOOR.js";
-import "./chunk-YR3LX3PR.js";
-import "./chunk-2ZXYLPPT.js";
-import "./chunk-PU44PXY2.js";
+} from "./chunk-YWPKCFKZ.js";
+import "./chunk-F7IITURY.js";
+import "./chunk-JNNIPGJU.js";
+import "./chunk-DPTYP7J3.js";
 
 // packages/engine/Source/Workers/incrementallyBuildTerrainPicker.js
 var scratchAABBCornerMin = new Cartesian3_default();

package/Build/Workers/transcodeKTX2.js

@@ -1,7 +1,7 @@
 /**
  * @license
  * Cesium - https://github.com/CesiumGS/cesium
- * Version 0.0.8
+ * Version 0.0.10
  *
  * Copyright 2011-2022 Cesium Contributors
  *
@@ -25,22 +25,22 @@
 
 import {
   createTaskProcessorWorker_default
-} from "./chunk-3WT5VKYM.js";
+} from "./chunk-2CZLDPAQ.js";
 import {
   WebGLConstants_default
-} from "./chunk-XEB4GEXW.js";
+} from "./chunk-4DQ3ODGO.js";
 import {
   RuntimeError_default
-} from "./chunk-IY53MZW2.js";
+} from "./chunk-SXISWCV7.js";
 import {
   Check_default
-} from "./chunk-2ZXYLPPT.js";
+} from "./chunk-JNNIPGJU.js";
 import {
   __commonJS,
   __require,
   __toESM,
   defined_default
-} from "./chunk-PU44PXY2.js";
+} from "./chunk-DPTYP7J3.js";
 
 // packages/engine/Source/ThirdParty/Workers/basis_transcoder.js
 var require_basis_transcoder = __commonJS({

package/Build/Workers/transferTypedArrayTest.js

@@ -1,7 +1,7 @@
 /**
  * @license
  * Cesium - https://github.com/CesiumGS/cesium
- * Version 0.0.8
+ * Version 0.0.10
  *
  * Copyright 2011-2022 Cesium Contributors
  *

package/Build/Workers/upsampleQuantizedTerrainMesh.js

@@ -1,7 +1,7 @@
 /**
  * @license
  * Cesium - https://github.com/CesiumGS/cesium
- * Version 0.0.8
+ * Version 0.0.10
  *
  * Copyright 2011-2022 Cesium Contributors
  *
@@ -26,52 +26,52 @@
 import {
   EllipsoidalOccluder_default,
   TerrainEncoding_default
-} from "./chunk-MEFWVMG6.js";
+} from "./chunk-F6JVBOM5.js";
 import {
   createTaskProcessorWorker_default
-} from "./chunk-3WT5VKYM.js";
+} from "./chunk-2CZLDPAQ.js";
 import {
   OrientedBoundingBox_default
-} from "./chunk-FYW5UQ24.js";
+} from "./chunk-JQ7IQ56G.js";
 import {
   AttributeCompression_default
-} from "./chunk-ZS7KQSEM.js";
-import "./chunk-52UUGJQ6.js";
-import "./chunk-C3G2NDXM.js";
-import "./chunk-LGMONS4O.js";
-import "./chunk-BM6ZG63T.js";
+} from "./chunk-IHOM6QXV.js";
+import "./chunk-3SVEN5QG.js";
+import "./chunk-4UBPBH32.js";
+import "./chunk-V7QHEF6O.js";
+import "./chunk-NL7US44X.js";
 import {
   IndexDatatype_default
-} from "./chunk-SKXE77AM.js";
+} from "./chunk-32GOIUYC.js";
 import {
   BoundingSphere_default
-} from "./chunk-H33FCT5U.js";
-import "./chunk-IRG63TBY.js";
+} from "./chunk-VFC54WB7.js";
+import "./chunk-NUMQ72QV.js";
 import {
   Rectangle_default
-} from "./chunk-EPVJ5OOH.js";
-import "./chunk-GWLEBUVI.js";
-import "./chunk-ZBRVFEGF.js";
-import "./chunk-XEB4GEXW.js";
-import "./chunk-IY53MZW2.js";
+} from "./chunk-2ZR6KBRW.js";
+import "./chunk-PEEYBEL5.js";
+import "./chunk-VIMRGSM5.js";
+import "./chunk-4DQ3ODGO.js";
+import "./chunk-SXISWCV7.js";
 import {
   Cartesian2_default,
   Cartographic_default,
   Ellipsoid_default
-} from "./chunk-KMZXZUA7.js";
+} from "./chunk-SSE2O2SB.js";
 import {
   Cartesian3_default
-} from "./chunk-HEKLTOOR.js";
+} from "./chunk-YWPKCFKZ.js";
 import {
   Math_default
-} from "./chunk-YR3LX3PR.js";
+} from "./chunk-F7IITURY.js";
 import {
   Check_default,
   DeveloperError_default
-} from "./chunk-2ZXYLPPT.js";
+} from "./chunk-JNNIPGJU.js";
 import {
   defined_default
-} from "./chunk-PU44PXY2.js";
+} from "./chunk-DPTYP7J3.js";
 
 // packages/engine/Source/Core/Intersections2D.js
 var Intersections2D = {};

package/Build/Workers/upsampleVerticesFromCesium3DTilesTerrain.js

@@ -1,7 +1,7 @@
 /**
  * @license
  * Cesium - https://github.com/CesiumGS/cesium
- * Version 0.0.8
+ * Version 0.0.10
  *
  * Copyright 2011-2022 Cesium Contributors
  *
@@ -25,32 +25,32 @@
 
 import {
   Cesium3DTilesTerrainGeometryProcessor_default
-} from "./chunk-L2QIVAZV.js";
-import "./chunk-TQ63SH2Z.js";
-import "./chunk-MEFWVMG6.js";
+} from "./chunk-7EU3DIKZ.js";
+import "./chunk-DBM2NHJ5.js";
+import "./chunk-F6JVBOM5.js";
 import {
   createTaskProcessorWorker_default
-} from "./chunk-3WT5VKYM.js";
-import "./chunk-IC2JHDCI.js";
-import "./chunk-FYW5UQ24.js";
-import "./chunk-ZS7KQSEM.js";
-import "./chunk-52UUGJQ6.js";
-import "./chunk-C3G2NDXM.js";
-import "./chunk-LGMONS4O.js";
-import "./chunk-BM6ZG63T.js";
-import "./chunk-SKXE77AM.js";
-import "./chunk-H33FCT5U.js";
-import "./chunk-IRG63TBY.js";
-import "./chunk-EPVJ5OOH.js";
-import "./chunk-GWLEBUVI.js";
-import "./chunk-ZBRVFEGF.js";
-import "./chunk-XEB4GEXW.js";
-import "./chunk-IY53MZW2.js";
-import "./chunk-KMZXZUA7.js";
-import "./chunk-HEKLTOOR.js";
-import "./chunk-YR3LX3PR.js";
-import "./chunk-2ZXYLPPT.js";
-import "./chunk-PU44PXY2.js";
+} from "./chunk-2CZLDPAQ.js";
+import "./chunk-OOIZ7CHP.js";
+import "./chunk-JQ7IQ56G.js";
+import "./chunk-IHOM6QXV.js";
+import "./chunk-3SVEN5QG.js";
+import "./chunk-4UBPBH32.js";
+import "./chunk-V7QHEF6O.js";
+import "./chunk-NL7US44X.js";
+import "./chunk-32GOIUYC.js";
+import "./chunk-VFC54WB7.js";
+import "./chunk-NUMQ72QV.js";
+import "./chunk-2ZR6KBRW.js";
+import "./chunk-PEEYBEL5.js";
+import "./chunk-VIMRGSM5.js";
+import "./chunk-4DQ3ODGO.js";
+import "./chunk-SXISWCV7.js";
+import "./chunk-SSE2O2SB.js";
+import "./chunk-YWPKCFKZ.js";
+import "./chunk-F7IITURY.js";
+import "./chunk-JNNIPGJU.js";
+import "./chunk-DPTYP7J3.js";
 
 // packages/engine/Source/Workers/upsampleVerticesFromCesium3DTilesTerrain.js
 function upsampleVerticesFromCesium3DTilesTerrain(options, transferableObjects) {

package/Source/Scene/Cesium3DTileset.js

@@ -4055,8 +4055,6 @@ Cesium3DTileset.prototype.showWireframe = function ({
   this._debugWireframeScanAxis = new Cartesian3(0, 0, 1);
   this._debugWireframeScanMin = 0.0;
   this._debugWireframeScanMax = 1.0;
-  this._debugWireframeModelMinHeight = undefined;
-  this._debugWireframeModelMaxHeight = undefined;
 
   if (defined(effects)) {
     if (defined(effects.glow) && effects.glow.enabled) {
@@ -4068,7 +4066,7 @@ Cesium3DTileset.prototype.showWireframe = function ({
       this._debugWireframeScanAxis = new Cartesian3(
         direction === "x" ? 1 : 0,
         direction === "y" ? 1 : 0,
-        direction === "z" ? 1 : 0
+        direction === "z" ? 1 : 0,
       );
       const bs = this.boundingSphere;
       if (defined(bs)) {
@@ -4083,10 +4081,6 @@ Cesium3DTileset.prototype.showWireframe = function ({
           this._debugWireframeScanMin = centerHeight - bs.radius;
           this._debugWireframeScanMax = centerHeight + bs.radius;
         }
-        // Compute tileset height range from bounding sphere for scanline
-        const centerHeight = Cartesian3.magnitude(bs.center);
-        this._debugWireframeModelMinHeight = centerHeight - bs.radius;
-        this._debugWireframeModelMaxHeight = centerHeight + bs.radius;
       }
     }
   }

package/Source/Scene/Model/BarycentricWireframePipelineStage.js

@@ -4,7 +4,6 @@ import Cartesian3 from "../../Core/Cartesian3.js";
 import Color from "../../Core/Color.js";
 import ComponentDatatype from "../../Core/ComponentDatatype.js";
 import defined from "../../Core/defined.js";
-import IndexDatatype from "../../Core/IndexDatatype.js";
 import ModelUtility from "./ModelUtility.js";
 import PrimitiveType from "../../Core/PrimitiveType.js";
 import ShaderDestination from "../../Renderer/ShaderDestination.js";
@@ -17,6 +16,8 @@ const BarycentricWireframePipelineStage = {
   name: "BarycentricWireframePipelineStage",
 };
 
+const defaultScanAxis = new Cartesian3(0, 0, 1);
+
 BarycentricWireframePipelineStage.process = function (
   renderResources,
   primitive,
@@ -45,6 +46,8 @@ BarycentricWireframePipelineStage.process = function (
     ShaderDestination.BOTH,
   );
 
+  const scanlineEnabled = (model._debugWireframeScanSpeed ?? 0.0) > 0.0;
+
   if (model.debugWireframeOverlay) {
     shaderBuilder.addDefine(
       "WIREFRAME_OVERLAY",
@@ -53,73 +56,41 @@ BarycentricWireframePipelineStage.process = function (
     );
   }
 
-  if ((model._debugWireframeScanSpeed ?? 0.0) > 0.0) {
+  if (scanlineEnabled) {
     shaderBuilder.addDefine(
       "WIREFRAME_SCANLINE",
       undefined,
-      ShaderDestination.FRAGMENT,
+      ShaderDestination.BOTH,
     );
   }
 
   shaderBuilder.addVarying("vec3", "v_barycentric");
-  shaderBuilder.addVarying("vec3", "v_wireframeWorldPos");
-  shaderBuilder.addVarying("vec3", "v_wireframeLocalPos");
+  if (scanlineEnabled) {
+    shaderBuilder.addVarying("vec3", "v_wireframeWorldPos");
+  }
 
-  shaderBuilder.addUniform(
-    "float",
-    "u_wireframeWidth",
-    ShaderDestination.FRAGMENT,
-  );
-  shaderBuilder.addUniform(
-    "vec4",
-    "u_wireframeColor",
-    ShaderDestination.FRAGMENT,
-  );
-  shaderBuilder.addUniform(
-    "float",
-    "u_wireframeFillAlpha",
-    ShaderDestination.FRAGMENT,
-  );
-  shaderBuilder.addUniform(
-    "float",
-    "u_wireframeGlow",
-    ShaderDestination.FRAGMENT,
-  );
-  shaderBuilder.addUniform(
-    "float",
-    "u_wireframeScanSpeed",
-    ShaderDestination.FRAGMENT,
-  );
-  shaderBuilder.addUniform(
-    "float",
-    "u_wireframeTime",
-    ShaderDestination.FRAGMENT,
-  );
-  shaderBuilder.addUniform(
-    "float",
-    "u_wireframeModelMinHeight",
-    ShaderDestination.BOTH,
-  );
-  shaderBuilder.addUniform(
-    "float",
-    "u_wireframeModelMaxHeight",
-    ShaderDestination.BOTH,
-  );
-  shaderBuilder.addUniform(
-    "vec3",
-    "u_wireframeScanAxis",
-    ShaderDestination.FRAGMENT,
-  );
-  shaderBuilder.addUniform(
-    "float",
-    "u_wireframeScanMin",
-    ShaderDestination.FRAGMENT,
-  );
-  shaderBuilder.addUniform(
-    "float",
-    "u_wireframeScanMax",
-    ShaderDestination.FRAGMENT,
-  );
+  shaderBuilder.addUniform("float", "u_wireframeWidth", ShaderDestination.FRAGMENT);
+  shaderBuilder.addUniform("vec4", "u_wireframeColor", ShaderDestination.FRAGMENT);
+  shaderBuilder.addUniform("float", "u_wireframeFillAlpha", ShaderDestination.FRAGMENT);
+  shaderBuilder.addUniform("float", "u_wireframeGlow", ShaderDestination.FRAGMENT);
+
+  const hasFillColor = defined(model._debugWireframeFillColor);
+  if (hasFillColor) {
+    shaderBuilder.addDefine(
+      "HAS_WIREFRAME_FILL_COLOR",
+      undefined,
+      ShaderDestination.FRAGMENT,
+    );
+    shaderBuilder.addUniform("vec4", "u_wireframeFillColor", ShaderDestination.FRAGMENT);
+  }
+
+  if (scanlineEnabled) {
+    shaderBuilder.addUniform("float", "u_wireframeScanSpeed", ShaderDestination.FRAGMENT);
+    shaderBuilder.addUniform("float", "u_wireframeTime", ShaderDestination.FRAGMENT);
+    shaderBuilder.addUniform("vec3", "u_wireframeScanAxis", ShaderDestination.FRAGMENT);
+    shaderBuilder.addUniform("float", "u_wireframeScanMin", ShaderDestination.FRAGMENT);
+    shaderBuilder.addUniform("float", "u_wireframeScanMax", ShaderDestination.FRAGMENT);
+  }
 
   const stageUniforms = renderResources.uniformMap;
   stageUniforms.u_wireframeWidth = function () {
@@ -133,33 +104,38 @@ BarycentricWireframePipelineStage.process = function (
       ? 1.0
       : (model._debugWireframeFillAlpha ?? 1.0);
   };
+  if (hasFillColor) {
+    stageUniforms.u_wireframeFillColor = function () {
+      return model._debugWireframeFillColor;
+    };
+  }
   stageUniforms.u_wireframeGlow = function () {
     return model._debugWireframeGlow ?? 0.0;
   };
-  stageUniforms.u_wireframeScanSpeed = function () {
-    return model._debugWireframeScanSpeed ?? 0.0;
-  };
-  stageUniforms.u_wireframeTime = function () {
-    return frameState.time.secondsOfDay;
-  };
-  stageUniforms.u_wireframeModelMinHeight = function () {
-    return model._debugWireframeModelMinHeight ?? 0.0;
-  };
-  stageUniforms.u_wireframeModelMaxHeight = function () {
-    return model._debugWireframeModelMaxHeight ?? 1.0;
-  };
-  stageUniforms.u_wireframeScanAxis = function () {
-    return model._debugWireframeScanAxis ?? new Cartesian3(0, 0, 1);
-  };
-  stageUniforms.u_wireframeScanMin = function () {
-    return model._debugWireframeScanMin ?? 0.0;
-  };
-  stageUniforms.u_wireframeScanMax = function () {
-    return model._debugWireframeScanMax ?? 1.0;
-  };
 
-  // Enable alpha blending when fillAlpha < 1.0 in preserve-original-color mode
-  if (!defined(model._debugWireframeFillColor) && (model._debugWireframeFillAlpha ?? 1.0) < 1.0) {
+  if (scanlineEnabled) {
+    stageUniforms.u_wireframeScanSpeed = function () {
+      return model._debugWireframeScanSpeed ?? 0.0;
+    };
+    stageUniforms.u_wireframeTime = function () {
+      return frameState.time.secondsOfDay;
+    };
+    stageUniforms.u_wireframeScanAxis = function () {
+      return model._debugWireframeScanAxis ?? defaultScanAxis;
+    };
+    stageUniforms.u_wireframeScanMin = function () {
+      return model._debugWireframeScanMin ?? 0.0;
+    };
+    stageUniforms.u_wireframeScanMax = function () {
+      return model._debugWireframeScanMax ?? 1.0;
+    };
+  }
+
+  // Enable alpha blending when fillAlpha < 1.0 or fillColor alpha < 1.0
+  const fillAlphaValue = defined(model._debugWireframeFillColor)
+    ? model._debugWireframeFillColor.alpha
+    : (model._debugWireframeFillAlpha ?? 1.0);
+  if (fillAlphaValue < 1.0) {
     renderResources.alphaOptions.pass = Pass.TRANSLUCENT;
   }
 
@@ -168,6 +144,7 @@ BarycentricWireframePipelineStage.process = function (
     primitive,
     barycentricAttributeLocation,
     frameState,
+    model.debugWireframeOverlay,
   );
 };
 
@@ -273,6 +250,7 @@ function deindexGeometryAndAddBarycentric(
   primitive,
   barycentricAttributeLocation,
   frameState,
+  overlay,
 ) {
   const model = renderResources.model;
   const shaderBuilder = renderResources.shaderBuilder;
@@ -337,18 +315,24 @@ function deindexGeometryAndAddBarycentric(
     let attributeIndex;
     if (semantic === VertexAttributeSemantic.POSITION) {
       attributeIndex = shaderBuilder.attributeLocations.position;
-    } else if (semantic === VertexAttributeSemantic.NORMAL) {
-      attributeIndex = shaderBuilder.attributeLocations.normal;
-    } else if (semantic === VertexAttributeSemantic.TANGENT) {
-      attributeIndex = shaderBuilder.attributeLocations.tangent;
-    } else if (semantic === VertexAttributeSemantic.TEXCOORD) {
-      attributeIndex = shaderBuilder.attributeLocations["texCoord_" + setIndex];
-    } else if (semantic === VertexAttributeSemantic.COLOR) {
-      attributeIndex = shaderBuilder.attributeLocations["color_" + setIndex];
-    } else if (semantic === VertexAttributeSemantic.JOINTS) {
-      attributeIndex = shaderBuilder.attributeLocations["joints_" + setIndex];
-    } else if (semantic === VertexAttributeSemantic.WEIGHTS) {
-      attributeIndex = shaderBuilder.attributeLocations["weights_" + setIndex];
+    } else if (overlay) {
+      // Only deindex non-position attributes in overlay mode
+      // (overlay needs original material for blending)
+      if (semantic === VertexAttributeSemantic.NORMAL) {
+        attributeIndex = shaderBuilder.attributeLocations.normal;
+      } else if (semantic === VertexAttributeSemantic.TANGENT) {
+        attributeIndex = shaderBuilder.attributeLocations.tangent;
+      } else if (semantic === VertexAttributeSemantic.TEXCOORD) {
+        attributeIndex = shaderBuilder.attributeLocations["texCoord_" + setIndex];
+      } else if (semantic === VertexAttributeSemantic.COLOR) {
+        attributeIndex = shaderBuilder.attributeLocations["color_" + setIndex];
+      } else if (semantic === VertexAttributeSemantic.JOINTS) {
+        attributeIndex = shaderBuilder.attributeLocations["joints_" + setIndex];
+      } else if (semantic === VertexAttributeSemantic.WEIGHTS) {
+        attributeIndex = shaderBuilder.attributeLocations["weights_" + setIndex];
+      } else {
+        continue;
+      }
     } else {
       continue;
     }

package/Source/Scene/Model/Model.js

@@ -421,6 +421,9 @@ function Model(options) {
   this._debugWireframeMode = options.debugWireframeMode ?? "lines";
   this._debugWireframeOverlay = options.debugWireframeOverlay ?? false;
   this._debugWireframeFillAlpha = options.debugWireframeFillAlpha ?? 0.2;
+  this._debugWireframeFillColor = defined(options.debugWireframeFillColor)
+    ? Color.clone(options.debugWireframeFillColor)
+    : undefined;
   this._debugWireframeColor = Color.clone(Color.WHITE);
   this._wireframeOriginalColor = undefined;
   this._wireframeOriginalColorBlendMode = undefined;
@@ -1229,7 +1232,11 @@ Object.defineProperties(Model.prototype, {
       return this._debugWireframeColor;
     },
     set: function (value) {
-      this._debugWireframeColor = Color.clone(value);
+      const newValue = defined(value) ? Color.clone(value) : undefined;
+      if (Color.equals(newValue, this._debugWireframeColor)) {
+        return;
+      }
+      this._debugWireframeColor = newValue;
       this.resetDrawCommands();
     },
   },
@@ -1253,6 +1260,9 @@ Object.defineProperties(Model.prototype, {
       return this._debugWireframeFillAlpha;
     },
     set: function (value) {
+      if (this._debugWireframeFillAlpha === value) {
+        return;
+      }
       this._debugWireframeFillAlpha = value;
       this.resetDrawCommands();
     },
@@ -2041,14 +2051,10 @@ Model.prototype.showWireframe = function ({
     ? Color.clone(fillColor)
     : undefined;
 
-  if (defined(fillColor)) {
-    const fillColorWithAlpha = Color.clone(fillColor);
-    fillColorWithAlpha.alpha = fillAlpha;
-    this.color = fillColorWithAlpha;
-    this.colorBlendMode = colorBlendMode;
-  } else {
+  if (!defined(fillColor)) {
     this.color = this._wireframeOriginalColor;
-    this.colorBlendMode = ColorBlendMode.HIGHLIGHT;
+    this.colorBlendMode =
+      this._wireframeOriginalColorBlendMode ?? ColorBlendMode.HIGHLIGHT;
   }
 
   this._debugWireframeGlow = 0.0;
@@ -2056,8 +2062,6 @@ Model.prototype.showWireframe = function ({
   this._debugWireframeScanAxis = new Cartesian3(0, 0, 1);
   this._debugWireframeScanMin = 0.0;
   this._debugWireframeScanMax = 1.0;
-  this._debugWireframeModelMinHeight = undefined;
-  this._debugWireframeModelMaxHeight = undefined;
 
   if (defined(effects)) {
     if (defined(effects.glow) && effects.glow.enabled) {
@@ -2069,7 +2073,7 @@ Model.prototype.showWireframe = function ({
       this._debugWireframeScanAxis = new Cartesian3(
         direction === "x" ? 1 : 0,
         direction === "y" ? 1 : 0,
-        direction === "z" ? 1 : 0
+        direction === "z" ? 1 : 0,
       );
       const bs = this.boundingSphere;
       if (defined(bs)) {
@@ -2084,10 +2088,6 @@ Model.prototype.showWireframe = function ({
           this._debugWireframeScanMin = centerHeight - bs.radius;
           this._debugWireframeScanMax = centerHeight + bs.radius;
         }
-        // Compute model height range from bounding sphere for scanline
-        const centerHeight = Cartesian3.magnitude(bs.center);
-        this._debugWireframeModelMinHeight = centerHeight - bs.radius;
-        this._debugWireframeModelMaxHeight = centerHeight + bs.radius;
       }
     }
   }

package/Source/Scene/Model/Model3DTileContent.js

@@ -9,6 +9,8 @@ import Pass from "../../Renderer/Pass.js";
 import ModelAnimationLoop from "../ModelAnimationLoop.js";
 import Model from "./Model.js";
 
+const defaultScanAxis = new Cartesian3(0, 0, 1);
+
 /**
  * Represents the contents of a glTF, glb or
  * {@link https://github.com/CesiumGS/3d-tiles/tree/main/specification/TileFormats/Batched3DModel|Batched 3D Model}
@@ -271,31 +273,24 @@ Model3DTileContent.prototype.update = function (tileset, frameState) {
   model.showCreditsOnScreen = tileset.showCreditsOnScreen;
   model.splitDirection = tileset.splitDirection;
   model.debugWireframe = tileset.debugWireframe;
-  model.debugWireframeColor = tileset._debugWireframeColor;
-  model.debugWireframeFillAlpha = tileset._debugWireframeFillAlpha;
-  model.debugWireframeLineWidth = tileset.debugWireframeLineWidth;
-  model.debugWireframeMode = tileset.debugWireframeMode;
-  model.debugWireframeOverlay = tileset.debugWireframeOverlay;
-  model._debugWireframeGlow = tileset._debugWireframeGlow ?? 0.0;
-  model._debugWireframeScanSpeed = tileset._debugWireframeScanSpeed ?? 0.0;
-  model._debugWireframeScanAxis = tileset._debugWireframeScanAxis ?? new Cartesian3(0, 0, 1);
-  model._debugWireframeScanMin = tileset._debugWireframeScanMin ?? 0.0;
-  model._debugWireframeScanMax = tileset._debugWireframeScanMax ?? 1.0;
-  model._debugWireframeModelMinHeight = tileset._debugWireframeModelMinHeight ?? 0.0;
-  model._debugWireframeModelMaxHeight = tileset._debugWireframeModelMaxHeight ?? 1.0;
+  if (tileset.debugWireframe) {
+    model.debugWireframeColor = tileset._debugWireframeColor;
+    model._debugWireframeFillColor = tileset._debugWireframeFillColor;
+    model.debugWireframeFillAlpha = tileset._debugWireframeFillAlpha;
+    model.debugWireframeLineWidth = tileset.debugWireframeLineWidth;
+    model.debugWireframeMode = tileset.debugWireframeMode;
+    model.debugWireframeOverlay = tileset.debugWireframeOverlay;
+    model._debugWireframeGlow = tileset._debugWireframeGlow ?? 0.0;
+    model._debugWireframeScanSpeed = tileset._debugWireframeScanSpeed ?? 0.0;
+    model._debugWireframeScanAxis =
+      tileset._debugWireframeScanAxis ?? defaultScanAxis;
+    model._debugWireframeScanMin = tileset._debugWireframeScanMin ?? 0.0;
+    model._debugWireframeScanMax = tileset._debugWireframeScanMax ?? 1.0;
+  }
   model.showOutline = tileset.showOutline;
   model.outlineColor = tileset.outlineColor;
   model.pointCloudShading = tileset.pointCloudShading;
 
-  if (tileset.debugWireframe && defined(tileset._debugWireframeFillColor)) {
-    const fillColor = Color.clone(tileset._debugWireframeFillColor);
-    fillColor.alpha = tileset._debugWireframeFillAlpha;
-    model.color = fillColor;
-    model.colorBlendMode = tileset.colorBlendMode;
-  } else if (!tileset.debugWireframe) {
-    model.color = undefined;
-  }
-
   // Updating clipping planes requires more effort because of ownership checks
   const tilesetClippingPlanes = tileset.clippingPlanes;
   model.referenceMatrix = tileset.clippingPlanesOriginMatrix;
@@ -560,18 +555,6 @@ function makeModelOptions(tileset, tile, content, additionalOptions) {
     splitDirection: tileset.splitDirection,
     enableDebugWireframe: tileset._enableDebugWireframe,
     debugWireframe: tileset.debugWireframe,
-    debugWireframeColor: tileset._debugWireframeColor,
-    debugWireframeFillAlpha: tileset._debugWireframeFillAlpha,
-    debugWireframeLineWidth: tileset.debugWireframeLineWidth,
-    debugWireframeMode: tileset.debugWireframeMode,
-    debugWireframeOverlay: tileset.debugWireframeOverlay,
-    _debugWireframeGlow: tileset._debugWireframeGlow ?? 0.0,
-    _debugWireframeScanSpeed: tileset._debugWireframeScanSpeed ?? 0.0,
-    _debugWireframeScanAxis: tileset._debugWireframeScanAxis ?? new Cartesian3(0, 0, 1),
-    _debugWireframeScanMin: tileset._debugWireframeScanMin ?? 0.0,
-    _debugWireframeScanMax: tileset._debugWireframeScanMax ?? 1.0,
-    _debugWireframeModelMinHeight: tileset._debugWireframeModelMinHeight ?? 0.0,
-    _debugWireframeModelMaxHeight: tileset._debugWireframeModelMaxHeight ?? 1.0,
     projectTo2D: tileset._projectTo2D,
     enablePick: tileset._enablePick,
     enableShowOutline: tileset._enableShowOutline,