Fix #1092 markers: hide/show layer markers

mistic100 · Sep 28, 2023 · f3a8399 · f3a8399
1 parent edcdc79
commit f3a8399
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 13 deletions.
diff --git a/packages/markers-plugin/src/Marker.ts b/packages/markers-plugin/src/Marker.ts
@@ -51,7 +51,6 @@ export class Marker {
      * The final description of the marker. Either text content, image, url, SVG attributes, etc.
      */
     definition: any;
-    visible = true;
 
     /** @internal */
     tooltip?: Tooltip;
@@ -389,8 +388,9 @@ export class Marker {
                 ...this.config.hoverScale,
             };
         }
-
-        this.visible = this.config.visible !== false;
+        if (utils.isNil(this.config.visible)) {
+            this.config.visible = true;
+        }
 
         this.state.anchor = utils.parsePoint(this.config.anchor);
 
@@ -844,10 +844,10 @@ export class Marker {
         Object.defineProperty(element, 'visible', {
             enumerable: true,
             get: function (this: Object3D) {
-                return (this.children[0].userData[MARKER_DATA] as Marker).visible;
+                return (this.children[0].userData[MARKER_DATA] as Marker).state.visible;
             },
             set: function (this: Object3D, visible: boolean) {
-                (this.children[0].userData[MARKER_DATA] as Marker).visible = visible;
+                (this.children[0].userData[MARKER_DATA] as Marker).state.visible = visible;
             },
         });
 

diff --git a/packages/markers-plugin/src/MarkersPlugin.ts b/packages/markers-plugin/src/MarkersPlugin.ts
@@ -75,6 +75,8 @@ export class MarkersPlugin extends AbstractConfigurablePlugin<
         showAllTooltips: false,
         currentMarker: null as Marker,
         hoveringMarker: null as Marker,
+        // require a 2nd render (only the scene) when 3d markers visibility changes
+        needsReRender: false,
     };
 
     private readonly container: HTMLElement;
@@ -222,9 +224,7 @@ export class MarkersPlugin extends AbstractConfigurablePlugin<
      */
     showAllMarkers() {
         this.state.visible = true;
-
         this.renderMarkers();
-
         this.dispatchEvent(new ShowMarkersEvent());
     }
 
@@ -233,9 +233,7 @@ export class MarkersPlugin extends AbstractConfigurablePlugin<
      */
     hideAllMarkers() {
         this.state.visible = false;
-
         this.renderMarkers();
-
         this.dispatchEvent(new HideMarkersEvent());
     }
 
@@ -488,8 +486,8 @@ export class MarkersPlugin extends AbstractConfigurablePlugin<
      */
     toggleMarker(markerId: string | MarkerConfig, visible?: boolean) {
         const marker = this.getMarker(markerId);
-        marker.visible = visible === null ? !marker.visible : visible;
-        this.viewer.needsUpdate();
+        marker.config.visible = utils.isNil(visible) ? !marker.config.visible : visible;
+        this.renderMarkers();
     }
 
     /**
@@ -532,7 +530,7 @@ export class MarkersPlugin extends AbstractConfigurablePlugin<
     showMarkersList() {
         let markers: Marker[] = [];
         Object.values(this.markers).forEach((marker) => {
-            if (marker.visible && !marker.config.hideList) {
+            if (marker.state.visible && !marker.config.hideList) {
                 markers.push(marker);
             }
         });
@@ -572,11 +570,16 @@ export class MarkersPlugin extends AbstractConfigurablePlugin<
      * Updates the visibility and the position of all markers
      */
     renderMarkers() {
+        if (this.state.needsReRender) {
+            this.state.needsReRender = false;
+            return;
+        }
+
         const zoomLevel = this.viewer.getZoomLevel();
         const viewerPosition = this.viewer.getPosition();
 
         Object.values(this.markers).forEach((marker) => {
-            let isVisible = this.state.visible && marker.visible;
+            let isVisible = this.state.visible && marker.config.visible;
             let visibilityChanged = false;
             let position: Point = null;
 
@@ -640,8 +643,16 @@ export class MarkersPlugin extends AbstractConfigurablePlugin<
 
             if (visibilityChanged) {
                 this.dispatchEvent(new MarkerVisibilityEvent(marker, isVisible));
+
+                if (marker.is3d()) {
+                    this.state.needsReRender = true;
+                }
             }
         });
+
+        if (this.state.needsReRender) {
+            this.viewer.needsUpdate();
+        }
     }
 
     /**