@smarterplan/ngx-smarterplan-core 1.2.37 → 1.2.39

package/fesm2020/smarterplan-ngx-smarterplan-core.mjs

@@ -3336,7 +3336,17 @@ class MatterportService {
         this.dictionnaryObjects3D.get(uuid).obj3D.visible = false;
     }
     getObject3DModelNodeFromDictionnary(uuid) {
-        return this.dictionnaryObjects3D.get(uuid);
+        let obj = this.dictionnaryObjects3D.get(uuid);
+        if (!obj) {
+            console.log("weird thing again");
+            return null;
+        }
+        //might break things or fix everything ..?
+        if (obj.obj3D.uuid != uuid) {
+            console.log("we have THE problem");
+            obj.obj3D.uuid = uuid; //not enugh to fix the pb
+        }
+        return obj;
     }
     /**
      * Creates  MattertagData and start repositioning (creates temporary mattertag that follows the cursor)
@@ -3848,7 +3858,7 @@ class MatterportService {
             // By defaut, during creation, object has translation gizmo
             // => User has to click on lateral panel, and save its position after playing with it!
             if (mode && !isNestThermostat) {
-                this.attachGizmoControlTo3DObject(modelNode, sceneObject, mode, true).catch((e) => console.log(e));
+                this.attachGizmoControlTo3DObject(modelNode, sceneObject, mode, true, true).catch((e) => console.log(e));
             }
             if (this.lastObject3D && typeof this.lastObject3D.id === 'string') {
                 // prompt ThreeJS UUID to match our last generated object if new (not from Db)
@@ -3987,7 +3997,7 @@ class MatterportService {
             this.azimuthalCrown.obj3D.position.set(this.poseCamera.position.x, this.poseCamera.position.y, this.poseCamera.position.z);
         }
     }
-    async attachGizmoControlTo3DObject(modelNode, sceneObject, mode, visible) {
+    async attachGizmoControlTo3DObject(modelNode, sceneObject, mode, visible, isNewObject) {
         // Create a scene node with a transform control component.
         let node = null;
         node = sceneObject.addNode();
@@ -4007,13 +4017,21 @@ class MatterportService {
         // // set 'translate' mode to position the selection.
         myControl.inputs.mode = mode;
         modelNode.obj3D.controls = myControl; // store gizmoCtrl inside object
-        if (!this.lastObject3D || !this.lastObject3D.controls) {
-            try {
-                modelNode.obj3D.uuid = this.lastObject3D.uuid || this.lastObject3D.id;
-            }
-            catch (e) {
-                console.log(`id obj in Scene was not assigned to id from DB since`);
+        if (isNewObject) { //i keep the current solution for new objects
+            if (!this.lastObject3D || !this.lastObject3D.controls) {
+                try {
+                    modelNode.obj3D.uuid = this.lastObject3D.uuid || this.lastObject3D.id;
+                }
+                catch (e) {
+                    console.log(`id obj in Scene was not assigned to id from DB since`);
+                }
+                this.lastObject3D = modelNode.obj3D;
             }
+        }
+        else { //objects already in place have to become the "lastObject" (i think?)
+            console.log("in my solution !");
+            console.log(modelNode);
+            console.log(modelNode.obj3D.uuid);
             this.lastObject3D = modelNode.obj3D;
         }
         return modelNode;