@smarterplan/ngx-smarterplan-core 1.2.31 → 1.2.33

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

@@ -2494,6 +2494,7 @@ class MatterportService {
         this.ngZone = ngZone;
         this.slots = []; //SlotNode[] = [];
         this.nodes = [];
+        this.lastCameraPosition = { x: 0.0, y: 0.0, z: 0.0 };
         this.cursorPositionButtonDisplayed = false;
         // Measure mode
         this.isMeasureModeOn = false;
@@ -2797,6 +2798,7 @@ class MatterportService {
                     // console.log('Leaving sweep ' + oldSweep);
                     // console.log('Entering sweep ' + newSweep);
                     this.inTransitionSweep = false;
+                    this.displayAzimutalCrown();
                 }.bind(this));
                 this.sdk.on(this.sdk.Sweep.Event.EXIT, function (fromSweep, toSweep) {
                     //   console.log('Leaving sweep ' + fromSweep);
@@ -3748,6 +3750,7 @@ class MatterportService {
             const nodeControl = sceneObject.addNode();
             this.objectControl = nodeControl.addComponent('mp.transformControls');
             nodeControl.start();
+            //this.add3DObject({},null);
             resolve();
         });
     }
@@ -3761,6 +3764,7 @@ class MatterportService {
             let isAnimatedSecurityCamera = false;
             let isNestThermostat = false;
             let isSmarterplanPromotionalVideo = false;
+            let isAzimuthalCrown = false;
             /**
              * TODO: refacto with an enum or switch/case
              */
@@ -3773,6 +3777,9 @@ class MatterportService {
             if (obj.object === 'video') {
                 isSmarterplanPromotionalVideo = true;
             }
+            if (obj.object === 'azimuth') {
+                isAzimuthalCrown = true;
+            }
             const modelNode = sceneObject.addNode();
             let component = null;
             const initial = {
@@ -3821,6 +3828,13 @@ class MatterportService {
             modelNode.obj3D.position.set(obj.position.x, obj.position.y, obj.position.z);
             modelNode.obj3D.rotation.set(obj.rotation.x, obj.rotation.y, obj.rotation.z);
             modelNode.obj3D.scale.set(obj.scale.x, obj.scale.y, obj.scale.z);
+            if (isAzimuthalCrown) {
+                /*if(modelNode.obj3D.scale.x >= 1.0){
+                  modelNode.obj3D.scale.set(obj.scale.x/5000, obj.scale.y/5000, obj.scale.z/5000);
+                }*/
+                this.azimuthalCrown = modelNode;
+                this.displayAzimutalCrown();
+            }
             // 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) {
@@ -3837,6 +3851,21 @@ class MatterportService {
             // Store this in memory Map dictionnary
             this.dictionnaryObjects3D.set(modelNode.obj3D.uuid, modelNode);
             this.dictionnarySceneObjects3D.set(modelNode.obj3D.uuid, sceneObject);
+            /*this.sdk.Camera.pose.subscribe(
+              function (pose: any) {
+                //console.log("in callback")
+                //console.log(this.lastCameraPosition)
+                //console.log(pose.position)
+                if((pose.position.x == this.lastCameraPosition.x && pose.position.y == this.lastCameraPosition.y && pose.position.z == this.lastCameraPosition.z) || this.inTransitionMode || this.inTransitionSweep){
+                  //console.log("returning")
+                  return;
+                }
+                console.log("camera pos:",pose.position);
+                this.lastCameraPosition = {...pose.position};
+                if(this.lastObject3D){
+                  this.lastObject3D.position.set(pose.position.x+.5,pose.position.y+.5,pose.position.z+.5);
+                }
+              }.bind(this));*/
             if (isAnimatedSecurityCamera) {
                 const animator = modelNode.addComponent('mp.securityCamera', {
                     "nearPlane": 0.1,
@@ -3913,6 +3942,11 @@ class MatterportService {
     getSceneNodeFromObject3DId(uuid) {
         return this.dictionnarySceneObjects3D.get(uuid);
     }
+    async displayAzimutalCrown() {
+        if (this.azimuthalCrown) {
+            this.azimuthalCrown.obj3D.position.set(this.poseCamera.position.x, this.poseCamera.position.y, this.poseCamera.position.z);
+        }
+    }
     async attachGizmoControlTo3DObject(modelNode, sceneObject, mode, visible) {
         // Create a scene node with a transform control component.
         let node = null;