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

package/lib/cjs/Viewport.js

@@ -196,9 +196,9 @@ class Viewport {
         this.onRender = new core_bentley_1.BeEvent();
         this._target = target;
         target.assignFrameStatsCollector(this._frameStatsCollector);
-        this._viewportId = Viewport._nextViewportId++;
+        this._viewportId = internal_1.TileUser.generateId();
         this._perModelCategoryVisibility = PerModelCategoryVisibility_1.PerModelCategoryVisibility.createOverrides(this);
-        IModelApp_1.IModelApp.tileAdmin.registerViewport(this);
+        IModelApp_1.IModelApp.tileAdmin.registerUser(this);
     }
     /** @internal */
     get sceneValid() { return this._sceneValid; }
@@ -397,9 +397,11 @@ class Viewport {
     set clipStyle(style) {
         this.displayStyle.settings.clipStyle = style;
     }
-    /** The number of [antialiasing](https://en.wikipedia.org/wiki/Multisample_anti-aliasing) samples to be used when rendering the contents of the viewport.
-     * Must be an integer greater than zero. A value of 1 means antialiasing is disabled. A higher number of samples correlates generally to a higher quality image but
-     * is also more demanding on the graphics hardware.
+    /** Sets the number of [MSAA]($docs/learning/display/MSAA.md) samples for this viewport.
+     * The number of samples is a power of two. Values of 1 or less indicates anti-aliasing should be disabled. Non-power-of-two values are rounded
+     * down to the nearest power of two. The maximum number of samples supported depends upon the client's graphics hardware capabilities. Higher values produce
+     * a higher-quality image but also may also reduce framerate.
+     * @see [[ViewManager.setAntialiasingAllViews]] to adjust the number of samples for all viewports.
      */
     get antialiasSamples() {
         return undefined !== this._target ? this._target.antialiasSamples : 1;
@@ -710,7 +712,7 @@ class Viewport {
             return;
         this._target = (0, core_bentley_1.dispose)(this._target);
         this.subcategories.dispose();
-        IModelApp_1.IModelApp.tileAdmin.forgetViewport(this);
+        IModelApp_1.IModelApp.tileAdmin.forgetUser(this);
         this.onDisposed.raiseEvent(this);
         this.detachFromView();
     }
@@ -726,8 +728,8 @@ class Viewport {
     attachToView() {
         this.registerDisplayStyleListeners(this.view.displayStyle);
         this.registerViewListeners();
-        this.view.attachToViewport();
-        this._mapTiledGraphicsProvider = new internal_1.MapTiledGraphicsProvider(this);
+        this.view.attachToViewport(this);
+        this._mapTiledGraphicsProvider = new internal_1.MapTiledGraphicsProvider(this.viewportId, this.displayStyle);
     }
     registerViewListeners() {
         const view = this.view;
@@ -745,7 +747,7 @@ class Viewport {
             this.setFeatureOverrideProviderChanged();
             this.invalidateRenderPlan();
             this.detachFromDisplayStyle();
-            this._mapTiledGraphicsProvider = new internal_1.MapTiledGraphicsProvider(this);
+            this._mapTiledGraphicsProvider = new internal_1.MapTiledGraphicsProvider(this.viewportId, newStyle);
             this.registerDisplayStyleListeners(newStyle);
         }));
         if (view.isSpatialView()) {
@@ -1162,7 +1164,7 @@ class Viewport {
     /** The number of outstanding requests for tiles to be displayed in this viewport.
      * @see Viewport.numSelectedTiles
      */
-    get numRequestedTiles() { return IModelApp_1.IModelApp.tileAdmin.getNumRequestsForViewport(this); }
+    get numRequestedTiles() { return IModelApp_1.IModelApp.tileAdmin.getNumRequestsForUser(this); }
     /** The number of tiles selected for display in the view as of the most recently-drawn frame.
      * The tiles selected may not meet the desired level-of-detail for the view, instead being temporarily drawn while
      * tiles of more appropriate level-of-detail are loaded asynchronously.
@@ -1170,7 +1172,7 @@ class Viewport {
      * @see Viewport.numReadyTiles
      */
     get numSelectedTiles() {
-        const tiles = IModelApp_1.IModelApp.tileAdmin.getTilesForViewport(this);
+        const tiles = IModelApp_1.IModelApp.tileAdmin.getTilesForUser(this);
         return undefined !== tiles ? tiles.selected.size + tiles.external.selected : 0;
     }
     /** The number of tiles which were ready and met the desired level-of-detail for display in the view as of the most recently-drawn frame.
@@ -1181,7 +1183,7 @@ class Viewport {
      * @see Viewport.numRequestedTiles
      */
     get numReadyTiles() {
-        const tiles = IModelApp_1.IModelApp.tileAdmin.getTilesForViewport(this);
+        const tiles = IModelApp_1.IModelApp.tileAdmin.getTilesForUser(this);
         return undefined !== tiles ? tiles.ready.size + tiles.external.ready : 0;
     }
     /** @internal */
@@ -1597,6 +1599,10 @@ class Viewport {
         var _a;
         (_a = this._animator) === null || _a === void 0 ? void 0 : _a.interrupt();
         this._animator = animator;
+        // Immediately invoke the animator to set up the initial frustum.
+        // This is important for TwoWayViewportSync; otherwise, the synced viewport will have its frustum set to the final frustum,
+        // producing a flicker to that frustum during the first frame of animation.
+        this.animate();
     }
     /** Used strictly by TwoWayViewportSync to change the reactive viewport's view to a clone of the active viewport's ViewState.
      * Does *not* trigger "ViewState changed" events.
@@ -1771,6 +1777,11 @@ class Viewport {
         this.target.changeRenderPlan((0, RenderPlan_1.createRenderPlanFromViewport)(this));
         this._renderPlanValid = true;
     }
+    animate() {
+        var _a;
+        if ((_a = this._animator) === null || _a === void 0 ? void 0 : _a.animate())
+            this._animator = undefined; // animation completed.
+    }
     /** Renders the contents of this viewport. This method performs only as much work as necessary based on what has changed since
      * the last frame. If nothing has changed since the last frame, nothing is rendered.
      * @note This method should almost never be invoked directly - it is invoked on your behalf by [[ViewManager]]'s render loop.
@@ -1788,8 +1799,7 @@ class Viewport {
         this._frameStatsCollector.beginTime("totalSceneTime");
         this._frameStatsCollector.beginTime("animationTime");
         // if any animation is active, perform it now
-        if (this._animator && this._animator.animate())
-            this._animator = undefined; // animation completed
+        this.animate();
         this._frameStatsCollector.endTime("animationTime");
         let isRedrawNeeded = this._redrawPending || this._doContinuousRendering;
         this._redrawPending = false;
@@ -1830,8 +1840,8 @@ class Viewport {
         if (!this._sceneValid) {
             if (!this._freezeScene) {
                 this._frameStatsCollector.beginTime("createChangeSceneTime");
-                IModelApp_1.IModelApp.tileAdmin.clearTilesForViewport(this);
-                IModelApp_1.IModelApp.tileAdmin.clearUsageForViewport(this);
+                IModelApp_1.IModelApp.tileAdmin.clearTilesForUser(this);
+                IModelApp_1.IModelApp.tileAdmin.clearUsageForUser(this);
                 const context = this.createSceneContext();
                 this.createScene(context);
                 context.requestMissingTiles();
@@ -1930,18 +1940,28 @@ class Viewport {
      * @param flipVertically If true, the image is flipped along the x-axis.
      * @returns The contents of the viewport within the specified rectangle as a bitmap image, or undefined if the image could not be read.
      * @note By default the image is returned with the coordinate (0,0) referring to the bottom-most pixel. Pass `true` for `flipVertically` to flip it along the x-axis.
+     * @deprecated Use readImageBuffer.
      */
     readImage(rect = new ViewRect_1.ViewRect(0, 0, -1, -1), targetSize = core_geometry_1.Point2d.createZero(), flipVertically = false) {
+        // eslint-disable-next-line deprecation/deprecation
         return this.target.readImage(rect, targetSize, flipVertically);
     }
+    /** Capture the image currently rendered in this viewport, or a subset thereof.
+     * @param args Describes the region to capture and optional resizing. By default the entire image is captured with no resizing.
+     * @returns The image, or `undefined` if the specified capture rect is not fully contained in [[viewRect], a 2d context could not be obtained, or the resultant image consists entirely
+     * of 100% transparent background pixels.
+     */
+    readImageBuffer(args) {
+        return this.target.readImageBuffer(args);
+    }
     /** Reads the current image from this viewport into an HTMLCanvasElement with a Canvas2dRenderingContext such that additional 2d graphics can be drawn onto it.
-     * @see [[readImage]] to obtain the image as a JPEG or PNG.
+     * @see [[readImageBuffer]] to obtain the image as an array of RGBA pixels.
      */
     readImageToCanvas() {
         return this.target.readImageToCanvas();
     }
-    /** Get the point at the specified x and y location in the pixel buffer in npc coordinates
-     * @beta
+    /** Get the point at the specified x and y location in the pixel buffer in npc coordinates.
+     * @see [[getPixelDataWorldPoint]] to obtain the point in [[CoordSystem.World]].
      */
     getPixelDataNpcPoint(pixels, x, y, out) {
         const z = pixels.getPixel(x, y).distanceFraction;
@@ -1962,20 +1982,23 @@ class Viewport {
             result.z = z;
         return result;
     }
-    /** Get the point at the specified x and y location in the pixel buffer in world coordinates
-     * @beta
+    /** Get the point at the specified x and y location in the pixel buffer in world coordinates.
+     * @see [[getPixelDataNpcPoint]] to obtain the point in [[CoordSystem.Npc]].
      */
-    getPixelDataWorldPoint(pixels, x, y, out) {
+    getPixelDataWorldPoint(args) {
         var _a;
+        const { pixels, x, y, out, preserveModelDisplayTransforms } = args;
         const npc = this.getPixelDataNpcPoint(pixels, x, y, out);
         if (undefined !== npc) {
             this.npcToWorld(npc, npc);
             // If this is a plan projection model, invert the elevation applied to its display transform.
             // Likewise, if it is a hit on a model with a display transform, reverse the display transform.
-            const modelId = (_a = pixels.getPixel(x, y).featureTable) === null || _a === void 0 ? void 0 : _a.modelId;
-            if (undefined !== modelId) {
-                npc.z -= this.view.getModelElevation(modelId);
-                this.view.transformPointByModelDisplayTransform(modelId, npc, true);
+            if (!preserveModelDisplayTransforms) {
+                const modelId = (_a = pixels.getPixel(x, y).featureTable) === null || _a === void 0 ? void 0 : _a.modelId;
+                if (undefined !== modelId) {
+                    npc.z -= this.view.getModelElevation(modelId);
+                    this.view.transformPointByModelDisplayTransform(modelId, npc, true);
+                }
             }
         }
         return npc;
@@ -2100,11 +2123,18 @@ class Viewport {
             removeViewListener();
         };
     }
+    /** TileUser implementation @internal */
+    get tileUserId() {
+        return this.viewportId;
+    }
+    /** TileUser implementation @internal */
+    onRequestStateChanged() {
+        this.invalidateScene();
+    }
 }
 exports.Viewport = Viewport;
 /** Don't allow entries in the view undo buffer unless they're separated by more than this amount of time. */
 Viewport.undoDelay = core_bentley_1.BeDuration.fromSeconds(.5);
-Viewport._nextViewportId = 1;
 /** An interactive Viewport that exists within an HTMLDivElement. ScreenViewports can receive HTML events.
  * To render the contents of a ScreenViewport, it must be added to the [[ViewManager]] via ViewManager.addViewport().
  * Every frame, the ViewManager will update the Viewport's state and re-render its contents if anything has changed.
@@ -2236,17 +2266,17 @@ class ScreenViewport extends Viewport {
         this.addChildDiv(this.vpDiv, div, z);
         return div;
     }
-    /** The HTMLImageElement of the iModel.js logo displayed in this ScreenViewport
+    /** The HTMLImageElement of the iTwin.js logo displayed in this ScreenViewport
      * @beta
      */
     get logo() { return this._logo; }
     /** @internal */
     addLogo() {
         const logo = this._logo = IModelApp_1.IModelApp.makeHTMLElement("img", { parent: this.vpDiv, className: "imodeljs-icon" });
-        logo.src = "images/imodeljs-icon.svg";
+        logo.src = `${IModelApp_1.IModelApp.publicPath}images/imodeljs-icon.svg`;
         logo.alt = "";
         const showLogos = (ev) => {
-            const aboutBox = IModelApp_1.IModelApp.makeModalDiv({ autoClose: true, width: 460, closeBox: true }).modal;
+            const aboutBox = IModelApp_1.IModelApp.makeModalDiv({ autoClose: true, width: 460, closeBox: true, rootDiv: this.vpDiv.ownerDocument.body }).modal;
             aboutBox.className += " imodeljs-about"; // only added so the CSS knows this is the about dialog
             const logos = IModelApp_1.IModelApp.makeHTMLElement("table", { parent: aboutBox, className: "logo-cards" });
             if (undefined !== IModelApp_1.IModelApp.applicationLogoCard)
@@ -2331,6 +2361,7 @@ class ScreenViewport extends Viewport {
         locateOpts.allowNonLocatable = (undefined === options || !options.excludeNonLocatable);
         locateOpts.allowDecorations = (undefined === options || !options.excludeDecorations);
         locateOpts.allowExternalIModels = (undefined === options || !options.excludeExternalIModels);
+        locateOpts.preserveModelDisplayTransforms = true;
         if (0 !== this.picker.doPick(this, pickPoint, radius, locateOpts)) {
             const hitDetail = this.picker.getHit(0);
             const hitPoint = hitDetail.getPoint();
@@ -2367,7 +2398,7 @@ class ScreenViewport extends Viewport {
             const npcPt = this.worldToNpc(projectedPt);
             return npcPt.z < 1.0;
         };
-        if (this.view.getDisplayStyle3d().environment.ground.display) {
+        if (this.view.getDisplayStyle3d().environment.displayGround) {
             const groundPlane = core_geometry_1.Plane3dByOriginAndUnitNormal.create(core_geometry_1.Point3d.create(0, 0, this.view.getGroundElevation()), core_geometry_1.Vector3d.unitZ());
             if (undefined !== groundPlane && boresiteIntersect(groundPlane))
                 return { plane: core_geometry_1.Plane3dByOriginAndUnitNormal.create(projectedPt, groundPlane.getNormalRef()), source: DepthPointSource.GroundPlane };
@@ -2614,15 +2645,15 @@ class ScreenViewport extends Viewport {
             (0, core_bentley_1.assert)(undefined === this._webglCanvas); // see getter...
             this._webglCanvas = webglCanvas;
             this.addChildDiv(this.vpDiv, webglCanvas, 5);
-            /** The following workaround resolves an issue specific to iOS Safari. We really want this webgl canvas' zIndex to be
-             * lower than this.canvas, but if we do that on iOS Safari, Safari may decide to not display the canvas contents once
-             * it is re-added to the parent div after dropping other viewports. It will only display it once resizing the view.
-             * The offending element here is the 2d canvas sitting on top of the webgl canvas. We need to clear its contents
-             * immediately on iOS. Even though the 2d canvas gets cleared in OnScreenTarget.drawOverlayDecorations() in this case,
-             * it looks like iOS needs an immediate clear.
+            /** We really want this WebGL canvas' zIndex to be lower than this.canvas, but if we do that, browsers can decide to
+             * not update the WebGL canvas contents once it is re-added to the parent div after dropping other viewports.
+             * The offending element is the 2d canvas sitting on top of the WebGL canvas. We need to clear the 2d canvas' contents
+             * in order to ensure browsers allow the underlying WebGL canvas to update. If a decorator is present, the 2d canvas
+             * is cleared during the frame render process by virtue of updating the decorator. For the non-decorator case, and for
+             * iOS, we must make sure we still clear the 2d canvas, done here. iOS appears to need this clear even when decorators
+             * clear the canvas later in the frame render process.
              */
-            if (core_bentley_1.ProcessDetector.isIOSBrowser)
-                _clear2dCanvas(this.canvas);
+            _clear2dCanvas(this.canvas);
         }
         this.target.updateViewRect();
         this.invalidateRenderPlan();
@@ -2677,7 +2708,7 @@ function _clear2dCanvas(canvas) {
 }
 /** A viewport that draws to an offscreen buffer instead of to the screen. An offscreen viewport is never added to the [[ViewManager]], therefore does not participate in
  * the render loop. Its dimensions are specified directly instead of being derived from an HTMLCanvasElement, and its renderFrame function must be manually invoked.
- * Offscreen viewports can be useful for, e.g., producing an image from the contents of a view (see [[Viewport.readImage]] and [[Viewport.readImageToCanvas]])
+ * Offscreen viewports can be useful for, e.g., producing an image from the contents of a view (see [[Viewport.readImageBuffer]] and [[Viewport.readImageToCanvas]])
  * without drawing to the screen.
  * @public
  */