Fix "display frustum" button

Author: Léna Voinchet

js/UI/LidarUI.js

@@ -234,11 +234,10 @@ class LidarUI{
             sceneManager.objects.populateStorage();
         }
 
-        this.changeVisibility = function(visible)
+        this.changeVisibilityUIOnly = function(visible)
         {
             const iconElem = document.getElementById('lidar-' + (lidar.id) + '-visible').firstElementChild;
             iconElem.dataset.icon = visible ? "akar-icons:eye-open" : "akar-icons:eye-slashed";
-            sceneManager.objects.updateRaysIcon();
         }
 
         this.updatePosition = function(x, z, currentUnitValue)

js/UI/NodeUI.js

@@ -78,7 +78,7 @@ class NodeUI {
 
             document.getElementById(`node-${node.id}-duplicate`).addEventListener('click', () => sceneManager.objects.duplicateNode(node));
             document.getElementById(`node-${node.id}-hide-UI`).addEventListener('click', () => hideUICam());
-            document.getElementById(`node-${node.id}-visible`).addEventListener('click', () => node.changeFrustumVisibility());
+            document.getElementById(`node-${node.id}-visible`).addEventListener('click', () => node.changeVisibility());
             document.getElementById(`node-${node.id}-delete`).addEventListener('click', () => sceneManager.objects.removeNode(node));
 
             document.getElementById(`cam-type-${node.id}`).addEventListener('change', changeCameraType);

js/scene/objects/SceneObjects.js

@@ -291,9 +291,9 @@ class SceneObjects{
         this.displayRays = function()
         {
             const visibles = lidars.filter(l => l.raysAppear);
-            lidars.forEach(l => l.changeVisibility(visibles.length != lidars.length));
+            lidars.forEach(l => l.changeRaysVisibility(visibles.length != lidars.length));
             const iconElem = document.getElementById('display-lidars-rays-button-icon');
-            if(iconElem) iconElem.dataset.icon = visibles.length != nodes.length ? "akar-icons:eye-slashed" : "akar-icons:eye-open";
+            if(iconElem) iconElem.dataset.icon = visibles.length != lidars.length ? "akar-icons:eye-open" : "akar-icons:eye-slashed";
         }
 
         this.updateRaysIcon = function()

js/scene/objects/sensors/Lidar.js

@@ -129,15 +129,21 @@ class Lidar{
     }
 
     /* USER'S ACTION */
-    changeVisibility(display = !this.raysAppear)
+    changeRaysVisibility(visible = !this.raysAppear)
     {
-        const value = display;
-        this.raysAppear = value;
-        this.rays.visible = value;
-        this.nameText.visible = value;
+        this.raysAppear = visible;
 
-        if (this.uiElement && typeof this.uiElement.changeVisibility === 'function') {
-            this.uiElement.changeVisibility(value);
+        if (this.rays) this.rays.visible = visible;
+        if(this.nameText) this.nameText.visible = visible;
+    }
+
+    changeVisibility(visible = !this.raysAppear)
+    {
+        this.changeRaysVisibility(visible);
+        if (this.mesh) this.mesh.visible = visible;
+
+        if (this.uiElement && typeof this.uiElement.changeVisibilityUIOnly === 'function') {
+            this.uiElement.changeVisibilityUIOnly(visible);
         }
     }
 

js/scene/objects/sensors/Node.js

@@ -172,7 +172,7 @@ class Node{
         this.updateAreaText(sceneManager.currentUnit);
 
         // Update visibility
-        this.changeFrustumVisibility(this.areaAppear);
+        this.changeVisibility(this.areaAppear);
     }
 
     updateTransformation()
@@ -204,12 +204,12 @@ class Node{
         scene.add(this.nameText);
         scene.add(this.areaValueText);
         this.areaAppear = true;
-        this.changeFrustumVisibility(true);
+        this.changeVisibility(true);
     }
 
     removeFromScene(scene)
     {
-        this.changeFrustumVisibility(false);
+        this.changeVisibility(false);
         this.areaAppear = false;
         scene.remove(this.cameraPerspective);
         scene.remove(this.cameraPerspectiveHelper);
@@ -228,9 +228,14 @@ class Node{
         this.areaAppear = visible;
         if (this.cameraPerspective) this.cameraPerspective.visible = visible;
         if (this.cameraPerspectiveHelper) this.cameraPerspectiveHelper.visible = visible;
-        if (this.mesh) this.mesh.visible = visible;
         if (this.nameText) this.nameText.visible = visible;
         if (this.areaValueText) this.areaValueText.visible = visible && (this.coveredPointsAbove && this.coveredPointsAbove.length > 2);
+    }
+
+    changeVisibility(visible = !this.areaAppear)
+    {
+        this.changeFrustumVisibility(visible);
+        if (this.mesh) this.mesh.visible = visible;
 
         if (this.uiElement && typeof this.uiElement.changeVisibilityUIOnly === 'function') {
             this.uiElement.changeVisibilityUIOnly(visible);