fix draw command spec

Author: lukemckinstry

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

@@ -122,7 +122,7 @@ function buildDrawCommandForModel(
     frameState.mode !== SceneMode.SCENE3D && !useBoundingSphere2D;
 
   const runtimeNode = primitiveRenderResources.runtimeNode;
-  const modelMatrix = ModelDrawCommands.createCommandModelMatrix(
+  const commandModelMatrix = ModelDrawCommands.createCommandModelMatrix(
     model.modelMatrix,
     sceneGraph,
     runtimeNode,
@@ -135,7 +135,8 @@ function buildDrawCommandForModel(
       ? runtimePrimitive.boundingSphere2D
       : runtimePrimitive.boundingSphere;
   const boundingSphere = ModelDrawCommands.createCommandBoundingSphere(
-    model.modelMatrix,
+    model,
+    commandModelMatrix,
     sceneGraph,
     runtimeNode,
     primitiveBoundingSphere,
@@ -150,7 +151,7 @@ function buildDrawCommandForModel(
   );
 
   renderState.cull.face = ModelUtility.getCullFace(
-    modelMatrix,
+    commandModelMatrix,
     primitiveRenderResources.primitiveType,
   );
   renderState = RenderState.fromCache(renderState);
@@ -170,7 +171,7 @@ function buildDrawCommandForModel(
 
   const command = new DrawCommand({
     boundingVolume: boundingSphere,
-    modelMatrix: modelMatrix,
+    modelMatrix: commandModelMatrix,
     uniformMap: primitiveRenderResources.uniformMap,
     renderState: renderState,
     vertexArray: vertexArray,
@@ -248,6 +249,7 @@ ModelDrawCommands.createCommandModelMatrix = function (
  * @returns {BoundingSphere}
  */
 ModelDrawCommands.createCommandBoundingSphere = function (
+  model,
   commandModelMatrix,
   sceneGraph,
   runtimeNode,
@@ -265,7 +267,7 @@ ModelDrawCommands.createCommandBoundingSphere = function (
 
     for (const modelInstance of sceneGraph.modelInstances._instances) {
       const boundingSphere = modelInstance.getPrimitiveBoundingSphere(
-        commandModelMatrix,
+        model.modelMatrix,
         sceneGraph,
         runtimeNode,
         primitiveBoundingSphere,
@@ -297,7 +299,7 @@ ModelDrawCommands.updateDrawCommand = function (
   const useModelMatrix2D =
     frameState.mode !== SceneMode.SCENE3D && !useBoundingSphere2D;
 
-  const modelMatrix = ModelDrawCommands.createCommandModelMatrix(
+  const commandModelMatrix = ModelDrawCommands.createCommandModelMatrix(
     model.modelMatrix,
     sceneGraph,
     runtimeNode,
@@ -306,7 +308,7 @@ ModelDrawCommands.updateDrawCommand = function (
   );
 
   drawCommand.cullFace = ModelUtility.getCullFace(
-    modelMatrix,
+    commandModelMatrix,
     drawCommand.primitiveType,
   );
 
@@ -315,7 +317,8 @@ ModelDrawCommands.updateDrawCommand = function (
       ? runtimePrimitive.boundingSphere2D
       : runtimePrimitive.boundingSphere;
   ModelDrawCommands.createCommandBoundingSphere(
-    model.modelMatrix,
+    model,
+    commandModelMatrix,
     sceneGraph,
     runtimeNode,
     primitiveBoundingSphere,