Update function changeLidarType

Author: Léna Voinchet

js/UI/LidarUI.js

@@ -212,26 +212,26 @@ class LidarUI{
 
         function changeLidarType()
         {
-            lidar.lidarType = getLidarsTypes().find(type => type.name === document.getElementById('lidar-type-' + lidar.id).value);
+            const newTypeName = document.getElementById(`lidar-type-${lidar.id}`).value;
+            const newLidarTypeData = getLidarsTypes().find(type => type.name === newTypeName);
 
-            sceneManager.scene.remove(lidar.rays);
-            lidar.rays.children.forEach(r => {
-                if(r.isLineSegments)
-                {
-                    r.geometry.dispose();
-                    r.material.dispose();
-                }
-            });
-            lidar.rays.clear();
-            lidar.buildRays();
-            sceneManager.scene.add(lidar.rays);
+            if (!newLidarTypeData) {
+                console.error("Nouveau type de LiDAR non trouvé:", newTypeName);
+                return;
+            }
+
+            // STEP 1 : The LiDAR deals with its own type change, recreates the 3D objects, etc
+            lidar.setType(newLidarTypeData, sceneManager);
 
+            // STEP 2 : Update UI with new camera properties
             document.getElementById(`lidar-fov${lidar.id}`).innerHTML = lidar.lidarType.fov + '°';
             document.getElementById(`lidar-res${lidar.id}`).innerHTML = lidar.lidarType.angularResolution + '°';
-            document.getElementById(`lidar-near${lidar.id}`).innerHTML = (Math.round(lidar.lidarType.rangeNear*document.getElementById('lidar-near' + lidar.id).dataset.unit * 100) / 100.0);
-            document.getElementById(`lidar-far${lidar.id}`).innerHTML = (Math.round(lidar.lidarType.rangeFar*document.getElementById('lidar-far' + lidar.id).dataset.unit * 100) / 100.0);
+            document.getElementById(`lidar-near${lidar.id}`).innerHTML = (Math.round(lidar.lidarType.rangeNear*document.getElementById(`lidar-near${lidar.id}`).dataset.unit * 100) / 100.0);
+            document.getElementById(`lidar-far${lidar.id}`).innerHTML = (Math.round(lidar.lidarType.rangeFar*document.getElementById(`lidar-far${lidar.id}`).dataset.unit * 100) / 100.0);
 
+            // STEP 3 : Save changes
             sceneManager.objects.populateStorage();
+
         }
 
         this.changeVisibilityUIOnly = function(visible)

js/UI/NodeUI.js

@@ -233,12 +233,6 @@ class NodeUI {
             // STEP 3 : Save changes
             sceneManager.objects.populateStorage();
 
-            // STEP 4 : Notify ViewportManager if needed
-            if (sceneManager.viewportManager && typeof sceneManager.viewportManager.handleCameraInstanceChanged === 'function') {
-                sceneManager.viewportManager.handleCameraInstanceChanged(node.id, node.cameraPerspective);
-            }
-            
-            
         }
 
         this.changeFar = function() 

js/scene/objects/SceneObjects.js

@@ -258,6 +258,9 @@ class SceneObjects{
                 console.error(`L'élément select 'cam-type-${newCamera.id}' n'a pas été trouvé pour la duplication.`);
             }
 
+            // Make sure frustum visibility choice is consistent with the other ones
+            newCamera.changeFrustumVisibility(node.toggleFrustumOrNot);
+
             this.populateStorage();
         }
 

js/scene/objects/sensors/Lidar.js

@@ -204,6 +204,43 @@ class Lidar{
 
     }
 
+    setType(newLidarTypeData, sceneManager)
+    {
+        const scene = sceneManager.scene;
+
+        // Remove every ancient element
+        if (this.rays) {
+            this.rays.children.forEach(m => {
+                m.geometry.dispose();
+                m.material.dispose();
+            });
+            this.rays.clear();
+            this.rays.remove();
+        }
+        if (this.raysShapeHelper) scene.remove(this.raysShapeHelper);
+        if (this.nameText) scene.remove(this.nameText);
+
+        // Update LiDAR Type
+        this.lidarType = newLidarTypeData;
+
+        // Rebuild LiDAR
+        this.buildRays();
+        this.raysShapeHelper = this.buildRaysOutlineHelper();
+
+        // Add every element to the scene
+        scene.add(this.rays);
+        scene.add(this.raysShapeHelper);
+
+        this.nameText = this.buildTextMesh("LiDAR " + (this.id+1), Lidar.SIZE_TEXT_LIDAR, this.xPos - Lidar.SIZE_TEXT_LIDAR * 2, this.yPos + Lidar.SIZE_TEXT_LIDAR/2.0, this.zPos)
+        scene.add(this.nameText);
+        
+        // Adapt Text and Mesh
+        this.updateTransformation();
+
+        // Update visibility
+        this.changeVisibility(this.lidarAppear);
+    }
+
     /* SCENE MANAGEMENT */
     addToScene(scene)
     {

js/scene/objects/sensors/Node.js

@@ -158,9 +158,6 @@ class Node{
         this.cameraPerspective = newCam;
         this.cameraPerspectiveHelper = newCamHelper;
 
-        // Adapt Text et Mesh
-        this.updateTransformation();
-
         // Add every element to the scene
         scene.add(this.cameraPerspective);
         scene.add(this.cameraPerspectiveHelper);
@@ -172,6 +169,9 @@ class Node{
         scene.add(this.areaValueText);
         this.updateAreaText(sceneManager.currentUnit);
 
+        // Adapt Text et Mesh
+        this.updateTransformation();
+
         // Update visibility
         this.changeVisibility(this.cameraAppear);
     }