unify earth and non earth centered code paths

Author: lukemckinstry

packages/engine/Source/Scene/Model/ModelDrawCommands.js

@@ -13,9 +13,6 @@ import ModelVS from "../../Shaders/Model/ModelVS.js";
 import ModelFS from "../../Shaders/Model/ModelFS.js";
 import ModelUtility from "./ModelUtility.js";
 import DeveloperError from "../../Core/DeveloperError.js";
-import Cartesian3 from "../../Core/Cartesian3.js";
-
-const scratchCartesian3 = new Cartesian3();
 
 /**
  * Internal functions to build draw commands for models.
@@ -138,7 +135,7 @@ function buildDrawCommandForModel(
       ? runtimePrimitive.boundingSphere2D
       : runtimePrimitive.boundingSphere;
   const boundingSphere = ModelDrawCommands.createCommandBoundingSphere(
-    modelMatrix,
+    model.modelMatrix,
     sceneGraph,
     runtimeNode,
     primitiveBoundingSphere,
@@ -219,22 +216,6 @@ ModelDrawCommands.createCommandModelMatrix = function (
 
   if (sceneGraph.hasInstances) {
     if (use2D) {
-      // earth centered model
-      // const translation = Matrix4.getTranslation(modelMatrix, scratchCartesian3);
-      // if (Cartesian3.equals(translation, Cartesian3.ZERO)) {
-      //   return sceneGraph._computedModelMatrix2D
-      // }
-
-      //model centered on earth surface
-      // const inverseAxisCorrection = Matrix4.inverse(
-      //   sceneGraph._axisCorrectionMatrix,
-      //   modelMatrixScratch,
-      // );
-      // return Matrix4.multiplyTransformation(
-      //   sceneGraph._computedModelMatrix2D,
-      //   inverseAxisCorrection,
-      //   result,
-      // );
       return sceneGraph._modelMatrix2D;
     }
     return modelMatrix;
@@ -280,21 +261,6 @@ ModelDrawCommands.createCommandBoundingSphere = function (
   }
 
   if (sceneGraph.hasInstances) {
-    let useInstanceTransform2D = false;
-
-    const translation = Matrix4.getTranslation(
-      commandModelMatrix,
-      scratchCartesian3,
-    );
-    if (useModelMatrix2D && Cartesian3.equals(translation, Cartesian3.ZERO)) {
-      useInstanceTransform2D = true;
-      // commandModelMatrix = Matrix4.multiplyTransformation(
-      //   commandModelMatrix,
-      //   sceneGraph._axisCorrectionMatrix,
-      //   modelMatrixScratch
-      // )
-    }
-
     const instanceBoundingSpheres = [];
 
     for (const modelInstance of sceneGraph.modelInstances._instances) {
@@ -303,7 +269,7 @@ ModelDrawCommands.createCommandBoundingSphere = function (
         sceneGraph,
         runtimeNode,
         primitiveBoundingSphere,
-        useInstanceTransform2D,
+        useModelMatrix2D,
         mapProjection,
       );
       instanceBoundingSpheres.push(boundingSphere);
@@ -353,7 +319,7 @@ ModelDrawCommands.updateDrawCommand = function (
       ? runtimePrimitive.boundingSphere2D
       : runtimePrimitive.boundingSphere;
   ModelDrawCommands.createCommandBoundingSphere(
-    modelMatrix,
+    model.modelMatrix,
     sceneGraph,
     runtimeNode,
     primitiveBoundingSphere,

packages/engine/Source/Scene/Model/ModelInstance.js

@@ -11,7 +11,6 @@ const scratchTranslationRotationScale = new TranslationRotationScale();
 const scratchRotation = new Matrix3();
 const scratchTransform = new Matrix4();
 const scratchBoundingSphere = new BoundingSphere();
-const scratchCartesian3 = new Cartesian3();
 /**
  * A copy of a {@link Model} mesh, known as an instance, used for rendering multiple copies with GPU instancing. Instancing is useful for efficiently rendering a large number of the same model, such as trees in a forest or vehicles in a parking lot.
  * @see {@link ModelInstanceCollection} for a collection of instances.
@@ -194,19 +193,15 @@ class ModelInstance {
    * viewer.camera.flyToBoundingSphere(boundingSphere);
    */
   getBoundingSphere(model, useBoundingSphere2D, mapProjection, result) {
-    let modelMatrix = model.modelMatrix;
     const sceneGraph = model.sceneGraph;
-    if (useBoundingSphere2D) {
-      modelMatrix = sceneGraph._modelMatrix2D;
-    }
     const instanceBoundingSpheres = [];
 
     for (const runtimeNode of sceneGraph._runtimeNodes) {
       const runtimePrimitives = runtimeNode.runtimePrimitives;
       for (const runtimePrimitive of runtimePrimitives) {
         const primitiveBoundingSphere = runtimePrimitive.boundingSphere;
         const boundingSphere = this.getPrimitiveBoundingSphere(
-          modelMatrix,
+          model.modelMatrix,
           sceneGraph,
           runtimeNode,
           primitiveBoundingSphere,
@@ -318,17 +313,17 @@ class ModelInstance {
     );
 
     let instanceTransform;
-    const modelTranslation = Matrix4.getTranslation(
-      modelMatrix,
-      scratchCartesian3,
-    );
-    if (
-      useInstanceTransform2D &
-      Cartesian3.equals(modelTranslation, Cartesian3.ZERO)
-    ) {
-      instanceTransform = Transforms.basisTo2D(
-        mapProjection,
+    let primitiveMatrix;
+
+    if (useInstanceTransform2D) {
+      const combinedTransform = Matrix4.multiplyTransformation(
+        modelMatrix,
         this.transform,
+        new Matrix4(),
+      );
+      primitiveMatrix = Transforms.basisTo2D(
+        mapProjection,
+        combinedTransform,
         scratchTransform,
       );
     } else {
@@ -337,14 +332,13 @@ class ModelInstance {
         rootTransform,
         scratchTransform,
       );
+      primitiveMatrix = Matrix4.multiplyTransformation(
+        modelMatrix,
+        instanceTransform,
+        scratchTransform,
+      );
     }
 
-    const primitiveMatrix = Matrix4.multiplyTransformation(
-      modelMatrix,
-      instanceTransform,
-      scratchTransform,
-    );
-
     return BoundingSphere.transform(
       primitiveBoundingSphere,
       primitiveMatrix,

packages/engine/Source/Scene/Model/ModelSceneGraph.js

@@ -155,6 +155,7 @@ function ModelSceneGraph(options) {
 
   // Model matrix in 2D without axis correction, etc.
   this._modelMatrix2D = Matrix4.clone(Matrix4.IDENTITY);
+  this._inverseModelMatrix2D = Matrix4.clone(Matrix4.IDENTITY);
 
   this._axisCorrectionMatrix = Matrix4.clone(Matrix4.IDENTITY);
 
@@ -528,8 +529,13 @@ function computeModelMatrix2D(sceneGraph, frameState) {
       modelMatrix,
       sceneGraph._modelMatrix2D,
     );
+    sceneGraph._inverseModelMatrix2D = Matrix4.inverseTransformation(
+      sceneGraph._modelMatrix2D,
+      sceneGraph._inverseModelMatrix2D,
+    );
   } else {
-    return Matrix4.IDENTITY;
+    sceneGraph._modelMatrix2D = Matrix4.IDENTITY;
+    sceneGraph._inverseModelMatrix2D = Matrix4.IDENTITY;
   }
 }