@eturnity/eturnity_3d 7.2.4-qa-7.4.3 → 7.2.4-qa-7.6.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eturnity/eturnity_3d",
   "private": false,
-  "version": "7.2.4-qa-7.4.3",
+  "version": "7.2.4-qa-7.6.3",
   "main": "dist/main.js",
   "scripts": {
     "dev": "vue-cli-service serve --skip-plugins @vue/cli-plugin-eslint",
@@ -10,7 +10,7 @@
     "prettier": "prettier --write \"**/*.{js,vue}\""
   },
   "dependencies": {
-    "@eturnity/eturnity_maths": "7.2.3-qa-7.4.0",
+    "@eturnity/eturnity_maths": "7.2.3-qa-7.6.0",
     "core-js": "^2.6.12",
     "cors": "^2.8.5",
     "earcut": "^2.2.4",

package/src/helper/cameraMixin.js

@@ -89,7 +89,6 @@ export default {
     },
     turnOrthogonalCameraToPerspective() {
       this.camera = this.perspectiveCamera
-      console.log(this.orthographicCamera)
       let altitude =
         (this.orthographicCamera.right - this.orthographicCamera.left) /
         ((this.perspectiveCamera.fov * Math.PI) / 180) /
@@ -344,7 +343,6 @@ export default {
               onCompleteCallback()
             })
         } else {
-          console.log('setTween Camera not Vertical')
           this.camera.up = { x: 0, y: 0, z: 1 }
           this.tweenCamera = new TWEEN.Tween(currentTweenVar)
             .to({ t: 1 }, 2000)

package/src/helper/render/clear.js

@@ -35,18 +35,18 @@ export default {
             let meshTop = this.meshes.panelsMeshes[panel.id + '_top']
             let meshSide = this.meshes.panelsMeshes[panel.id + '_side']
             if (meshTop || meshSide) {
-              this.clearMesh(meshTop)
-              this.clearMesh(meshSide)
+              this.clearMeshFromScene(meshTop, this.scene)
+              this.clearMeshFromScene(meshSide, this.scene)
             }
           })
         )
       )
     },
-    clearMesh(mesh) {
-      if (!mesh || !this.scene) {
+    clearMeshFromScene(mesh, scene) {
+      if (!mesh || !scene) {
         return
       }
-      this.scene.remove(mesh)
+      scene.remove(mesh)
       if (mesh.geometry && mesh.geometry.dispose) {
         mesh.geometry.dispose()
         mesh.geometry = null
@@ -72,14 +72,14 @@ export default {
     clearEdgesRemovedOnes() {
       Object.values(this.meshes['edgeMeshes']).forEach((mesh) => {
         if (!this.edgeIds.includes(mesh.userData.edgeId)) {
-          this.clearMesh(mesh)
+          this.clearMeshFromScene(mesh, this.scene)
         }
       })
     },
     clearRemovedOnes(type) {
       Object.values(this.meshes[type]).forEach((mesh) => {
         if (!this.polygonIds.includes(mesh.userData.polygonId)) {
-          this.clearMesh(mesh)
+          this.clearMeshFromScene(mesh, this.scene)
         }
       })
     },

package/src/helper/render/imageOverlay.js

@@ -34,7 +34,7 @@ export default {
   methods: {
     renderImageOverlayOnBackground() {
       if (!this.imageOverlay || !this.imageOverlayMaterial) {
-        this.clearMesh(this.meshes.backgroundMesh)
+        this.clearMeshFromScene(this.meshes.backgroundMesh, this.scene)
         this.meshes.backgroundMesh = null
         return
       }

package/src/helper/render/panel.js

@@ -45,14 +45,14 @@ export default {
               poly.layer == 'user_deactivated_panel'
           )
         ) {
-          this.clearMesh(mesh)
+          this.clearMeshFromScene(mesh, this.scene)
         }
         //clear panel on moduleField with overriden number of panel
         let panel = this.polygons.find(
           (poly) => mesh.userData.polygonId == poly.id
         )
         if (!panel || panel.moduleField.data.number_of_panels_override) {
-          this.clearMesh(mesh)
+          this.clearMeshFromScene(mesh, this.scene)
         }
       })
 
@@ -182,7 +182,7 @@ export default {
       )
       //if no panels, no materialIds,
       for (let materialId of materialIdsToRemove) {
-        this.clearMesh(this.mergedPanelTopMeshes[materialId])
+        this.clearMeshFromScene(this.mergedPanelTopMeshes[materialId], this.scene)
         delete this.mergedPanelTopMeshes[materialId]
       }
       this.mergedPanelSideMesh = this.updateOrCreateMergedMesh(

package/src/helper/render/tile.js

@@ -56,7 +56,7 @@ export default {
         return !tileToRenderIds.includes(id)
       })
       for (let id of idsToRemove) {
-        this.clearMesh(this.meshes.tileMeshes[id])
+        this.clearMeshFromScene(this.meshes.tileMeshes[id], this.scene)
       }
     },
     async renderProviderTiles() {

package/src/helper/renderMixin.js

@@ -211,6 +211,11 @@ export default {
               method: this.renderObstacles,
               arg: []
             })
+            methodList.push({
+              name: 'renderNodes',
+              method: this.renderNodes,
+              arg: []
+            })
           } else if (params.layer == 'obstacle') {
             methodList.push({
               name: 'renderBase',
@@ -228,11 +233,6 @@ export default {
               arg: []
             })
           }
-          methodList.push({
-            name: 'renderRoofsMargin',
-            method: this.renderRoofsMargin,
-            arg: []
-          })
           break
         case 'removePanels': //params.panels
         case 'removeModuleField': //params:moduleField

package/src/helper/threeMixin.js

@@ -106,10 +106,10 @@ export default {
           this.camera,
           this.renderer.domElement
         )
-        this.orbitControl.maxPolarAngle = (0.95 * Math.PI) / 2
+        this.orbitControl.maxPolarAngle = Math.PI / 2
         this.orbitControl.mouseButtons = {
-          RIGHT: THREE.MOUSE.PAN,
           LEFT: THREE.MOUSE.ROTATE,
+          RIGHT: THREE.MOUSE.PAN,
           MIDDLE: THREE.MOUSE.DOLLY
         }
         this.orbitControl.screenSpacePanning = false