@itwin/core-frontend 5.11.2 → 5.12.0-dev.10

package/lib/cjs/Viewport.js

@@ -1907,11 +1907,11 @@ class Viewport {
             origin.setFrom(this.iModel.globalOrigin);
         switch (this.view.getGridOrientation()) {
             case core_common_1.GridOrientationType.View: {
-                const center = this.view.getCenter();
-                this.toViewOrientation(center);
-                this.toViewOrientation(origin);
+                const center = this.npcToView(core_common_1.NpcCenter);
+                rMatrix.setFrom(this.rotation);
+                rMatrix.multiplyVectorInPlace(origin);
                 origin.z = center.z;
-                this.fromViewOrientation(origin);
+                rMatrix.multiplyTransposeVectorInPlace(origin);
                 break;
             }
             case core_common_1.GridOrientationType.WorldXY:
@@ -1935,24 +1935,24 @@ class Viewport {
             eyeVec = this._viewingSpace.rotation.getRow(2);
         eyeVec.normalizeInPlace();
         (0, LinePlaneIntersect_1.linePlaneIntersect)(point, point, eyeVec, origin, planeNormal, false);
-        // // get origin and point in view coordinate system
-        const pointView = point.clone();
-        const originView = origin.clone();
-        this.toViewOrientation(pointView);
-        this.toViewOrientation(originView);
+        // Get origin and point in the grid's local coordinate system.
+        const pointGrid = point.clone();
+        const originGrid = origin.clone();
+        rMatrix.multiplyXYZtoXYZ(pointGrid, pointGrid);
+        rMatrix.multiplyXYZtoXYZ(originGrid, originGrid);
         // subtract off the origin
-        pointView.y -= originView.y;
-        pointView.x -= originView.x;
+        pointGrid.y -= originGrid.y;
+        pointGrid.x -= originGrid.x;
         // round off the remainder to the grid distances
         const gridSpacing = this.view.getGridSpacing();
-        pointView.x = Viewport.roundGrid(pointView.x, gridSpacing.x);
-        pointView.y = Viewport.roundGrid(pointView.y, gridSpacing.y);
+        pointGrid.x = Viewport.roundGrid(pointGrid.x, gridSpacing.x);
+        pointGrid.y = Viewport.roundGrid(pointGrid.y, gridSpacing.y);
         // add the origin back in
-        pointView.x += originView.x;
-        pointView.y += originView.y;
+        pointGrid.x += originGrid.x;
+        pointGrid.y += originGrid.y;
         // go back to root coordinate system
-        this.fromViewOrientation(pointView);
-        point.setFrom(pointView);
+        rMatrix.multiplyTransposeVectorInPlace(pointGrid);
+        point.setFrom(pointGrid);
     }
     /** @internal */
     pointToGrid(point) {