@itwin/core-frontend 3.4.0-dev.34 → 3.4.0-dev.37

package/lib/cjs/tools/MeasureTool.js

@@ -95,33 +95,28 @@ class MeasureMarker extends Marker_1.Marker {
 }
 /** @internal */
 function adjustPoint(ev, segments, locations) {
-    // If the point was from a hit we must transform it by the model display transform of what got hit.
-    if (undefined === ev.viewport || undefined === ev.viewport.view.modelDisplayTransformProvider)
+    var _a;
+    // If the point was from a hit we must transform it by the display transform of what got hit.
+    const hit = IModelApp_1.IModelApp.accuSnap.currHit;
+    if (!hit || !ev.viewport || !hit.modelId)
         return ev.point;
-    if (undefined !== IModelApp_1.IModelApp.accuSnap.currHit && undefined !== IModelApp_1.IModelApp.accuSnap.currHit.modelId) {
-        if ("0" !== IModelApp_1.IModelApp.accuSnap.currHit.modelId) {
-            const newPoint = ev.point.clone();
-            ev.viewport.view.transformPointByModelDisplayTransform(IModelApp_1.IModelApp.accuSnap.currHit.modelId, newPoint, true);
-            return newPoint;
-        }
-        else {
-            // Must have snapped to a decoration, so look through previous any segments & locations for a match to get an adjusted point.
-            if (undefined !== segments) {
-                for (const seg of segments) {
-                    if (seg.start.isExactEqual(ev.point))
-                        return seg.adjustedStart.clone();
-                    if (seg.end.isExactEqual(ev.point))
-                        return seg.adjustedEnd.clone();
-                }
-            }
-            if (undefined !== locations) {
-                for (const loc of locations) {
-                    if (loc.point.isExactEqual(ev.point))
-                        return loc.adjustedPoint.clone();
-                }
-            }
+    if ("0" !== hit.modelId) {
+        const transform = ev.viewport.view.computeDisplayTransform({ modelId: hit.modelId, elementId: hit.sourceId });
+        return (_a = transform === null || transform === void 0 ? void 0 : transform.multiplyInversePoint3d(ev.point)) !== null && _a !== void 0 ? _a : ev.point;
+    }
+    // Must have snapped to a decoration, so look through previous any segments & locations for a match to get an adjusted point.
+    if (segments) {
+        for (const seg of segments) {
+            if (seg.start.isExactEqual(ev.point))
+                return seg.adjustedStart.clone();
+            if (seg.end.isExactEqual(ev.point))
+                return seg.adjustedEnd.clone();
         }
     }
+    if (locations)
+        for (const loc of locations)
+            if (loc.point.isExactEqual(ev.point))
+                return loc.adjustedPoint.clone();
     return ev.point;
 }
 /** Report distance between 2 points using current quantity formatter for length.