@itwin/core-frontend 3.0.0-dev.94 → 3.0.0-extension.0

package/lib/cjs/tools/ViewTool.js

@@ -131,7 +131,7 @@ class ViewingToolHandle {
     changeFocusFromDepthPoint() {
         if (undefined !== this._depthPoint) {
             const view = this.viewTool.viewport.view;
-            if (view.isCameraEnabled())
+            if (view.is3d() && view.isCameraOn)
                 view.changeFocusFromPoint(this._depthPoint); // set the focus distance to the depth point
         }
     }
@@ -651,11 +651,10 @@ class ViewManip extends ViewTool {
     /** @internal */
     static fitViewWithGlobeAnimation(viewport, animateFrustumChange, options) {
         const range = this.computeFitRange(viewport);
-        if (animateFrustumChange && (viewport.viewingGlobe || !viewport.view.getIsViewingProject())) {
-            const view3d = viewport.view;
-            const cartographicCenter = view3d.rootToCartographic(range.center);
+        if (viewport.view.isSpatialView() && animateFrustumChange && (viewport.viewingGlobe || !viewport.view.getIsViewingProject())) {
+            const cartographicCenter = viewport.view.rootToCartographic(range.center);
             if (undefined !== cartographicCenter) {
-                const cartographicArea = (0, ViewGlobalLocation_1.rangeToCartographicArea)(view3d, range);
+                const cartographicArea = (0, ViewGlobalLocation_1.rangeToCartographicArea)(viewport.view, range);
                 (async () => {
                     await viewport.animateFlyoverToGlobalLocation({ center: cartographicCenter, area: cartographicArea }); // NOTE: Turns on camera...which is why we checked that it was already on...
                     viewport.viewCmdTargetCenter = undefined;
@@ -1335,7 +1334,7 @@ class ViewZoom extends ViewingToolHandle {
         vp.viewToNpc(this._anchorPtView, this._anchorPtNpc);
         vp.viewToWorld(this._anchorPtView, this._anchorPtWorld);
         this._startFrust = vp.getWorldFrustum();
-        if (vp.view.isCameraEnabled())
+        if (vp.view.is3d() && vp.view.isCameraOn)
             this._startEyePoint.setFrom(vp.view.getEyePoint());
         this.viewTool.provideToolAssistance("Zoom.Prompts.NextPoint");
         return true;
@@ -1371,7 +1370,7 @@ class ViewZoom extends ViewingToolHandle {
         this._lastZoomRatio = zoomRatio;
         const frustum = this._startFrust.clone();
         const transform = core_geometry_1.Transform.createFixedPointAndMatrix(this._anchorPtWorld, core_geometry_1.Matrix3d.createScale(zoomRatio, zoomRatio, view.is3d() ? zoomRatio : 1.0));
-        if (view.isCameraEnabled()) {
+        if (view.is3d() && view.isCameraOn) {
             const oldEyePoint = this._startEyePoint;
             const newEyePoint = transform.multiplyPoint3d(oldEyePoint);
             const cameraOffset = core_geometry_1.Vector3d.createStartEnd(oldEyePoint, newEyePoint);
@@ -1380,7 +1379,7 @@ class ViewZoom extends ViewingToolHandle {
         frustum.transformBy(transform, frustum);
         if (ViewStatus_1.ViewStatus.Success !== view.setupFromFrustum(frustum))
             return false;
-        if (view.isCameraEnabled())
+        if (view.is3d() && view.isCameraOn)
             this.changeFocusFromDepthPoint(); // if we have a valid depth point, set it focus distance from it
         return ViewStatus_1.ViewStatus.Success === viewport.setupFromView();
     }
@@ -3080,7 +3079,7 @@ class WindowAreaTool extends ViewTool {
             onExtentsError: (stat) => view.outputStatusMessage(stat),
         };
         let globalAlignment;
-        if (view.isCameraEnabled()) {
+        if (view.is3d() && view.isCameraOn) {
             const windowArray = [corners[0].clone(), corners[1].clone()];
             vp.worldToViewArray(windowArray);
             const windowRange = new ViewRect_1.ViewRect(windowArray[0].x, windowArray[0].y, windowArray[1].x, windowArray[1].y);