@terraware/web-components 4.2.20-rc.0 → 4.2.20

package/components/VirtualWalkthrough/TfAnnotationManager.d.ts

@@ -96,6 +96,13 @@ export declare class TfAnnotationManager extends PcAnnotationManager {
      * @private
      */
     _updateAnnotationPositions(annotation: any, resources: any, screenPos: any): void;
+    /**
+     * Override to also disable the hotspot mesh (not just the DOM) when the annotation is behind the
+     * camera. The base implementation leaves the mesh enabled, so a not-yet-scaled plane under a
+     * scaled content-root would stay huge in view until the camera moves the anchor in front.
+     * @private
+     */
+    _hideAnnotationElements(annotation: any, resources: any): void;
     /**
      * Override the scale update to clamp the world size to a maximum value.
      * Also scales the hotspot DOM element to match.

package/components/VirtualWalkthrough/TfAnnotationManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TfAnnotationManager.d.ts","sourceRoot":"","sources":["../../../src/components/VirtualWalkthrough/TfAnnotationManager.ts"],"names":[],"mappings":"AAGA,OAAO,EAAoC,OAAO,EAAQ,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,iBAAiB,IAAI,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAIlG,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAelD;;;GAGG;AACH,qBAAa,mBAAoB,SAAQ,mBAAmB;IAC1D,MAAM,CAAC,UAAU,SAAyB;IAE1C,OAAO,CAAC,aAAa,CAAO;IAC5B,OAAO,CAAC,aAAa,CAAc;IACnC,OAAO,CAAC,gBAAgB,CAA4B;IACpD,OAAO,CAAC,sBAAsB,CAAkB;IAChD,OAAO,CAAC,uBAAuB,CAAa;IAC5C,OAAO,CAAC,WAAW,CAAmD;IAEtE;;;;;;;;OAQG;IACH,IAAI,YAAY,CAAC,KAAK,EAAE,MAAM,EAE7B;IAED,IAAI,YAAY,IAJQ,MAAM,CAM7B;IAED;;;;;;;;;;OAUG;IACH,IAAI,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAEvC;IAED,IAAI,sBAAsB,IAJQ,MAAM,CAMvC;IAED;;OAEG;IACH,UAAU;IAgBV;;;;OAIG;IACH,eAAe;IAiBf;;;;OAIG;IACH,YAAY,CAAC,QAAQ,EAAE,kBAAkB;IAazC;;OAEG;IACH,MAAM;IAmCN;;;;OAIG;IACH,mBAAmB,CAAC,UAAU,EAAE,GAAG;IAKnC;;;OAGG;IACH,oBAAoB,CAAC,UAAU,EAAE,GAAG;IAiBpC;;;;;OAKG;IACH,SAAS,CAAC,GAAG,EAAE,wBAAwB,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM;IAW/E;;;;OAIG;IACH,cAAc,CAAC,UAAU,EAAE,GAAG;IAI9B;;;;OAIG;IACH,sBAAsB,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG;IASlD,mBAAmB,CAAC,WAAW,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO;IAKrD,0BAA0B;IAK1B,YAAY,CAAC,WAAW,EAAE,GAAG;IAK7B,aAAa,CAAC,WAAW,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM;IAI7C;;;OAGG;IACH,0BAA0B,CAAC,UAAU,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG;IA6B1E;;;;OAIG;IACH,iCAAiC,CAAC,UAAU,EAAE,GAAG;IA2CjD;;;;OAIG;IACH,oBAAoB,CAAC,MAAM,EAAE,GAAG;IAUhC;;;OAGG;IACH,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,SAAuB,EAAE,WAAW,SAAI,EAAE,IAAI,CAAC,EAAE,kBAAkB;CAyD7G"}
+{"version":3,"file":"TfAnnotationManager.d.ts","sourceRoot":"","sources":["../../../src/components/VirtualWalkthrough/TfAnnotationManager.ts"],"names":[],"mappings":"AAGA,OAAO,EAAoC,OAAO,EAAQ,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,iBAAiB,IAAI,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAIlG,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAelD;;;GAGG;AACH,qBAAa,mBAAoB,SAAQ,mBAAmB;IAC1D,MAAM,CAAC,UAAU,SAAyB;IAE1C,OAAO,CAAC,aAAa,CAAO;IAC5B,OAAO,CAAC,aAAa,CAAc;IACnC,OAAO,CAAC,gBAAgB,CAA4B;IACpD,OAAO,CAAC,sBAAsB,CAAkB;IAChD,OAAO,CAAC,uBAAuB,CAAa;IAC5C,OAAO,CAAC,WAAW,CAAmD;IAEtE;;;;;;;;OAQG;IACH,IAAI,YAAY,CAAC,KAAK,EAAE,MAAM,EAE7B;IAED,IAAI,YAAY,IAJQ,MAAM,CAM7B;IAED;;;;;;;;;;OAUG;IACH,IAAI,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAEvC;IAED,IAAI,sBAAsB,IAJQ,MAAM,CAMvC;IAED;;OAEG;IACH,UAAU;IAgBV;;;;OAIG;IACH,eAAe;IAiBf;;;;OAIG;IACH,YAAY,CAAC,QAAQ,EAAE,kBAAkB;IAazC;;OAEG;IACH,MAAM;IAmCN;;;;OAIG;IACH,mBAAmB,CAAC,UAAU,EAAE,GAAG;IAcnC;;;OAGG;IACH,oBAAoB,CAAC,UAAU,EAAE,GAAG;IAiBpC;;;;;OAKG;IACH,SAAS,CAAC,GAAG,EAAE,wBAAwB,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM;IAW/E;;;;OAIG;IACH,cAAc,CAAC,UAAU,EAAE,GAAG;IAI9B;;;;OAIG;IACH,sBAAsB,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG;IASlD,mBAAmB,CAAC,WAAW,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO;IAKrD,0BAA0B;IAK1B,YAAY,CAAC,WAAW,EAAE,GAAG;IAK7B,aAAa,CAAC,WAAW,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM;IAI7C;;;OAGG;IACH,0BAA0B,CAAC,UAAU,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG;IA6B1E;;;;;OAKG;IACH,uBAAuB,CAAC,UAAU,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG;IAMvD;;;;OAIG;IACH,iCAAiC,CAAC,UAAU,EAAE,GAAG;IAiDjD;;;;OAIG;IACH,oBAAoB,CAAC,MAAM,EAAE,GAAG;IAUhC;;;OAGG;IACH,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,SAAuB,EAAE,WAAW,SAAI,EAAE,IAAI,CAAC,EAAE,kBAAkB;CAyD7G"}

package/components/VirtualWalkthrough/TfAnnotationManager.js

@@ -161,6 +161,15 @@ export class TfAnnotationManager extends PcAnnotationManager {
   _registerAnnotation(annotation) {
     super._registerAnnotation(annotation);
     this._applyAnnotationIcon(annotation);
+
+    // Keep the hotspot mesh hidden until the first scale pass clamps it. The annotation entity
+    // starts at unit local scale, so under a scaled content-root the plane would render many world
+    // units across for the frames before _updateAnnotationRotationAndScale runs.
+    const resources = this._annotationResources.get(annotation);
+    if (resources) {
+      resources.baseEntity.enabled = false;
+      resources.overlayEntity.enabled = false;
+    }
   }
 
   /**
@@ -269,6 +278,18 @@ export class TfAnnotationManager extends PcAnnotationManager {
     }
   }
 
+  /**
+   * Override to also disable the hotspot mesh (not just the DOM) when the annotation is behind the
+   * camera. The base implementation leaves the mesh enabled, so a not-yet-scaled plane under a
+   * scaled content-root would stay huge in view until the camera moves the anchor in front.
+   * @private
+   */
+  _hideAnnotationElements(annotation, resources) {
+    super._hideAnnotationElements(annotation, resources);
+    resources.baseEntity.enabled = false;
+    resources.overlayEntity.enabled = false;
+  }
+
   /**
    * Override the scale update to clamp the world size to a maximum value.
    * Also scales the hotspot DOM element to match.
@@ -305,6 +326,12 @@ export class TfAnnotationManager extends PcAnnotationManager {
     // size, so it uses the true _hotspotSize and the clamp ratio only (never the
     // parent scale, which the DOM overlay does not inherit).
     const resources = this._annotationResources.get(annotation);
+    if (resources) {
+      // This branch only runs for annotations in front of the camera, and the scale above is now
+      // clamped, so it is safe to reveal the mesh (hidden on register / when behind the camera).
+      resources.baseEntity.enabled = true;
+      resources.overlayEntity.enabled = true;
+    }
     if (resources && resources.hotspotDom) {
       const clampRatio = clampedScale / unclampedScale;
       const baseSize = this._hotspotSize + 5; // Match the +5 from the stylesheet

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@terraware/web-components",
-  "version": "4.2.20-rc.0",
+  "version": "4.2.20",
   "author": "Terraformation Inc.",
   "license": "Apache-2.0",
   "repository": {