refactor(LabeLayer): change label node culling mechanism.

iTowns · May 10, 2023 · b833744 · b833744
1 parent f46ca97
commit b833744
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/Layer/LabelLayer.js b/src/Layer/LabelLayer.js
@@ -74,6 +74,8 @@ class LabelsNode extends THREE.Group {
         this.domElements.labels = new DomNode();
 
         this.domElements.add(this.domElements.labels);
+
+        this.domElements.labels.dom.style.opacity = '0';
     }
 
     // add node label
@@ -185,6 +187,8 @@ class LabelLayer extends GeometryLayer {
         this.performance = config.performance || true;
         this.forceClampToTerrain = config.forceClampToTerrain || false;
 
+        this.toHide = new THREE.Group();
+
         this.labelDomelement = domElement;
 
         // The margin property defines a space around each label that cannot be occupied by another label.
@@ -306,15 +310,11 @@ class LabelLayer extends GeometryLayer {
     }
 
     #submitToRendering(labelsNode) {
-        labelsNode.domElements?.labels.show();
-
         this.object3d.add(labelsNode);
     }
 
     #disallowToRendering(labelsNode) {
-        labelsNode.domElements?.labels.hide();
-
-        this.object3d.remove(labelsNode);
+        this.toHide.add(labelsNode);
     }
 
     #findClosestDomElement(node) {
@@ -449,6 +449,7 @@ class LabelLayer extends GeometryLayer {
 
             if (labelsNode.count()) {
                 labelsNode.domElements.labels.hide();
+                labelsNode.domElements.labels.dom.style.opacity = '1.0';
 
                 node.addEventListener('show', () => labelsNode.domElements.labels.show());
 

diff --git a/src/Renderer/Label2DRenderer.js b/src/Renderer/Label2DRenderer.js
@@ -148,7 +148,7 @@ class Label2DRenderer {
 
                             this.culling(label, camera);
                         });
-
+                    labelsNode.domElements.labels.show();
                     labelsNode.needsUpdate = false;
                 });
         });
@@ -173,6 +173,11 @@ class Label2DRenderer {
                 l.visible = false;
             }
         });
+
+        labelLayers.forEach((labelLayer) => {
+            labelLayer.toHide.children.forEach(labelsNode => labelsNode.domElements?.labels.hide());
+            labelLayer.toHide.clear();
+        });
     }
 
     culling(label, camera) {