[NGRM] - Map layer z scaling witth arrow keys not functioning properly if modelMatrix propert is set #2512

Author: nilscb

typescript/packages/subsurface-viewer/src/components/Map.tsx

@@ -668,20 +668,26 @@ const Map: React.FC<MapProps> = ({
             layers.push(dummy_layer);
         }
 
-        const m = getModelMatrixScale(zScale);
-
         return layers.map((item) => {
             if (item?.constructor.name === NorthArrow3DLayer.name) {
                 return item;
             }
 
+            let m: Matrix4;
+            if ((item as Layer).props.modelMatrix) {
+                m = (item as Layer).props.modelMatrix as Matrix4;
+                m[10] *= zScale;  // Z scaling element of matrix.
+            } else {
+                m = getModelMatrixScale(zScale);
+            }
+
             return (item as Layer).clone({
                 // Inject "dispatchBoundingBox" function into layer for it to report back its respective bounding box.
                 // eslint-disable-next-line
                 // @ts-ignore
                 reportBoundingBox: dispatchBoundingBox,
 
-                // Set "modelLayer" matrix to reflect correct z scaling.
+                // Modify "modelMatrix" to reflect correct z scaling.
                 modelMatrix: m,
             });
         });