earth centered 2D wip

Author: lukemckinstry

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

@@ -13,8 +13,9 @@ 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 modelMatrixScratch = new Matrix4();
+const scratchCartesian3 = new Cartesian3();
 
 /**
  * Internal functions to build draw commands for models.
@@ -141,6 +142,8 @@ function buildDrawCommandForModel(
     sceneGraph,
     runtimeNode,
     primitiveBoundingSphere,
+    frameState.mapProjection,
+    useModelMatrix2D,
   );
 
   // Initialize render state with default values
@@ -216,15 +219,23 @@ ModelDrawCommands.createCommandModelMatrix = function (
 
   if (sceneGraph.hasInstances) {
     if (use2D) {
-      const inverseAxisCorrection = Matrix4.inverse(
-        sceneGraph._axisCorrectionMatrix,
-        modelMatrixScratch,
-      );
-      return Matrix4.multiplyTransformation(
-        sceneGraph._computedModelMatrix2D,
-        inverseAxisCorrection,
-        result,
-      );
+      // 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;
   }
@@ -260,13 +271,30 @@ ModelDrawCommands.createCommandBoundingSphere = function (
   sceneGraph,
   runtimeNode,
   primitiveBoundingSphere,
+  mapProjection,
+  useModelMatrix2D = false,
   result,
 ) {
   if (!defined(result)) {
     result = new BoundingSphere();
   }
 
   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) {
@@ -275,6 +303,8 @@ ModelDrawCommands.createCommandBoundingSphere = function (
         sceneGraph,
         runtimeNode,
         primitiveBoundingSphere,
+        useInstanceTransform2D,
+        mapProjection,
       );
       instanceBoundingSpheres.push(boundingSphere);
     }
@@ -327,6 +357,8 @@ ModelDrawCommands.updateDrawCommand = function (
     sceneGraph,
     runtimeNode,
     primitiveBoundingSphere,
+    frameState.mapProjection,
+    useModelMatrix2D,
     drawCommand.boundingVolume,
   );
 };

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

@@ -5,10 +5,11 @@ import Matrix3 from "../../Core/Matrix3.js";
 import Matrix4 from "../../Core/Matrix4.js";
 import TranslationRotationScale from "../../Core/TranslationRotationScale.js";
 import Quaternion from "../../Core/Quaternion.js";
+import Transforms from "../../Core/Transforms.js";
 
 const scratchTranslationRotationScale = new TranslationRotationScale();
 const scratchRotation = new Matrix3();
-const scratchBoundingSphereTransform = new Matrix4();
+const scratchTransform = new Matrix4();
 const scratchBoundingSphere = new BoundingSphere();
 /**
  * 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.
@@ -205,8 +206,9 @@ class ModelInstance {
           sceneGraph,
           runtimeNode,
           primitiveBoundingSphere,
+          false,
+          undefined,
         );
-
         instanceBoundingSpheres.push(boundingSphere);
       }
     }
@@ -273,6 +275,8 @@ class ModelInstance {
     sceneGraph,
     runtimeNode,
     primitiveBoundingSphere,
+    useInstanceTransform2D,
+    mapProjection,
     result,
   ) {
     result = result ?? new BoundingSphere();
@@ -283,11 +287,34 @@ class ModelInstance {
       runtimeNode.computedTransform,
       new Matrix4(),
     );
-    const primitiveMatrix = this.computeModelMatrix(
+
+    let instanceTransform;
+    if (useInstanceTransform2D) {
+      instanceTransform = Transforms.basisTo2D(
+        mapProjection,
+        this.transform,
+        scratchTransform,
+      );
+
+      instanceTransform = Matrix4.multiplyTransformation(
+        instanceTransform,
+        sceneGraph._axisCorrectionMatrix,
+        scratchTransform,
+      );
+    } else {
+      instanceTransform = Matrix4.multiplyTransformation(
+        this.transform,
+        rootTransform,
+        scratchTransform,
+      );
+    }
+
+    const primitiveMatrix = Matrix4.multiplyTransformation(
       modelMatrix,
-      rootTransform,
-      scratchBoundingSphereTransform,
+      instanceTransform,
+      scratchTransform,
     );
+
     return BoundingSphere.transform(
       primitiveBoundingSphere,
       primitiveMatrix,

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

@@ -153,6 +153,9 @@ function ModelSceneGraph(options) {
   this._computedModelMatrix = Matrix4.clone(Matrix4.IDENTITY);
   this._computedModelMatrix2D = Matrix4.clone(Matrix4.IDENTITY);
 
+  // Model matrix in 2D without axis correction, etc.
+  this._modelMatrix2D = Matrix4.clone(Matrix4.IDENTITY);
+
   this._axisCorrectionMatrix = Matrix4.clone(Matrix4.IDENTITY);
 
   // Store articulations from the AGI_articulations extension
@@ -476,7 +479,7 @@ function computeModelMatrix(
 
 const scratchComputedTranslation = new Cartesian3();
 
-function computeModelMatrix2D(sceneGraph, frameState) {
+function updateComputedModelMatrix2D(sceneGraph, frameState) {
   const computedModelMatrix = sceneGraph._computedModelMatrix;
   const translation = Matrix4.getTranslation(
     computedModelMatrix,
@@ -513,6 +516,28 @@ function computeModelMatrix2D(sceneGraph, frameState) {
   );
 }
 
+function computeModelMatrix2D(sceneGraph, frameState) {
+  const modelMatrix = sceneGraph._model.modelMatrix;
+  // sceneGraph._modelMatrix2D = Transforms.basisTo2D(
+  //   frameState.mapProjection,
+  //   modelMatrix,
+  //   sceneGraph._modelMatrix2D,
+  // );
+  const translation = Matrix4.getTranslation(
+    modelMatrix,
+    scratchComputedTranslation,
+  );
+  if (!Cartesian3.equals(translation, Cartesian3.ZERO)) {
+    sceneGraph._modelMatrix2D = Transforms.basisTo2D(
+      frameState.mapProjection,
+      modelMatrix,
+      sceneGraph._modelMatrix2D,
+    );
+  } else {
+    return Matrix4.IDENTITY;
+  }
+}
+
 /**
  * Recursively traverse through the nodes in the scene graph to create
  * their runtime versions, using a post-order depth-first traversal.
@@ -955,6 +980,7 @@ ModelSceneGraph.prototype.updateModelMatrix = function (
   );
 
   if (frameState.mode !== SceneMode.SCENE3D) {
+    updateComputedModelMatrix2D(this, frameState);
     computeModelMatrix2D(this, frameState);
   }