@eturnity/eturnity_3d 8.46.2 → 9.7.0-EPDM-13987.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eturnity/eturnity_3d",
   "private": false,
-  "version": "8.46.2",
+  "version": "9.7.0-EPDM-13987.0",
   "files": [
     "dist",
     "src"
@@ -16,7 +16,7 @@
     "merge-remote-master": "node scripts/merge-remote-master.js"
   },
   "dependencies": {
-    "@eturnity/eturnity_maths": "8.46.2",
+    "@eturnity/eturnity_maths": "9.7.0-EPDM-13987.0",
     "@originjs/vite-plugin-commonjs": "1.0.3",
     "core-js": "3.30.2",
     "cors": "2.8.5",

package/src/Overlay/ThreeDModelOverlay.js

@@ -122,7 +122,6 @@ export default class ThreeDModelOverlay extends Overlay {
           return
         }
         group = new this.Paper.Group()
-
         group.addChild(this.renderImagePlaceHolder(paperJSComponent))
         group.itemType = 'placeholderOverlays'
         group.type = 'imageOverlays'
@@ -138,7 +137,6 @@ export default class ThreeDModelOverlay extends Overlay {
       this.hasPlaceholderPath = true
       return
     }
-
     if (this.hasPlaceholderPath) {
       if (group) {
         paperJSComponent.clearPath(group)

package/src/helper/cameraMixin.js

@@ -440,7 +440,10 @@ export default {
         this.setTweenTo({ position, target })
       }
     },
-    setCameraGlobalPosition() {
+    setCameraGlobalPositionImmediately() {
+      this.setCameraGlobalPosition({ duration: 0 })
+    },
+    setCameraGlobalPosition({ duration = 1500 } = {}) {
       if (this.camera.isOrthographicCamera) {
         this.setOrthographicCameraGlobalPosition()
       } else {
@@ -466,10 +469,41 @@ export default {
           positionVector.z,
         ]
         let target = [targetVector.x, targetVector.y, targetVector.z]
-        this.setTweenTo({ position, target, fov: newFov })
+        this.setTweenTo({ position, target, fov: newFov, duration })
+      }
+    },
+    setCameraGlobalAlmostVerticalPosition({ duration = 1000 } = {}) {
+      let position, target
+      if (this.roofs.length != 0) {
+        let bounds = this.roofsBounds
+        let targetVector = {
+          x: (bounds.xMax + bounds.xMin) / 2000,
+          y: (bounds.yMax + bounds.yMin) / 2000,
+          z: 0,
+        }
+        let objectRadius_m = Math.max(
+          (bounds.xMax - bounds.xMin) / 2000,
+          (bounds.yMax - bounds.yMin) / 2000
+        )
+
+        let distance =
+          2 *
+          (objectRadius_m / Math.sin(((this.camera.fov / 2) * Math.PI) / 180))
+        let cameraMoveVector = { x: 0, y: 0, z: distance }
+        const positionVector = addVector(targetVector, cameraMoveVector)
+        position = [positionVector.x, positionVector.y - 1, positionVector.z]
+        target = [targetVector.x, targetVector.y, targetVector.z]
+      } else {
+        position = [0, -1, 300]
+        target = [0, 0, 0]
       }
+      this.setTweenTo({
+        position,
+        target,
+        duration,
+      })
     },
-    setCameraGlobalVerticalPosition() {
+    setCameraGlobalVerticalPosition(changeCameraTypeAsCallback = true) {
       let position, target
       let newFov = 10
       if (this.roofs.length != 0) {
@@ -498,10 +532,12 @@ export default {
         position,
         target,
         fov: newFov,
-        callback: this.turnPerspectiveCameraToOrthogonal,
+        callback: changeCameraTypeAsCallback
+          ? this.turnPerspectiveCameraToOrthogonal
+          : undefined,
       })
     },
-    setCameraOrthogonalTo(polygon) {
+    setCameraOrthogonalTo(polygon, { duration = 1000 } = {}) {
       if (polygon) {
         let polygonRef = polygon
         const targetVector = polygonRef.meanPoint
@@ -519,7 +555,7 @@ export default {
           positionVector.y / 1000 - 1,
           positionVector.z / 1000,
         ]
-        this.setTweenTo({ position, target })
+        this.setTweenTo({ position, target, duration })
       }
     },
     setCameraSideTo(polygon) {
@@ -553,11 +589,24 @@ export default {
         position,
         target,
         fov = 50,
-        duration = 2000,
+        duration = 1500,
         callback = () => {},
       } = payload
       TWEEN.removeAll()
       if (this.camera) {
+        if (duration == 0) {
+          this.camera.fov = fov
+          this.camera.position.set(position[0], position[1], position[2])
+
+          this.camera.updateProjectionMatrix()
+
+          this.orbitControl.target.set(target[0], target[1], target[2])
+          if (this.orbitControl && this.orbitControl.update) {
+            this.orbitControl.update()
+          }
+          callback()
+          return
+        }
         const currentTweenVar = {
           t: 0,
         }

package/src/helper/render/edge.js

@@ -60,7 +60,7 @@ export default {
           (edge.layer != 'moduleField' ||
             !this.selectedModuleField ||
             !edge.belongsTo
-              .map((i) => i.polygonId)
+              .map((i) => i.itemId)
               .includes(this.selectedModuleField.id))
         ) {
           return

package/src/helper/render/geometryHandler.js

@@ -263,7 +263,7 @@ export function getBufferWallGeometry(polygon) {
   // itemSize = 3 because there are 3 values (components) per vertex
   geometry.setAttribute('position', new THREE.BufferAttribute(vertices, 3))
   geometry.computeVertexNormals()
-
+  geometry.userData.version = 0
   return geometry
 }
 
@@ -321,6 +321,7 @@ export function getBufferObstacleGeometry(obstaclePolygon, roofPolygon) {
   // itemSize = 3 because there are 3 values (components) per vertex
   geometry.setAttribute('position', new THREE.BufferAttribute(vertices, 3))
   geometry.computeVertexNormals()
+  geometry.userData.version = 0
   return geometry
 }
 
@@ -405,6 +406,7 @@ export function getBufferObstacleSideGeometry(obstaclePolygon, roofPolygon) {
   // itemSize = 3 because there are 3 values (components) per vertex
   geometry.setAttribute('position', new THREE.BufferAttribute(vertices, 3))
   geometry.computeVertexNormals()
+  geometry.userData.version = 0
   return geometry
 }
 
@@ -440,6 +442,7 @@ export function getBufferModuleFieldGeometry(moduleFieldPolygon) {
   geometry.setAttribute('uv', new THREE.BufferAttribute(uvs, 2))
 
   geometry.computeVertexNormals()
+  geometry.userData.version = 0
   return geometry
 }
 
@@ -485,6 +488,7 @@ export function getBufferImageOverlayGeometry(corners) {
   geometry.setAttribute('position', new THREE.BufferAttribute(vertices, 3))
   geometry.setAttribute('uv', new THREE.BufferAttribute(uvs, 2))
   geometry.computeVertexNormals()
+  geometry.userData.version = 0
   return geometry
 }
 export function getPanelOutlineWithHeightOffset(panelPolygon) {
@@ -544,6 +548,7 @@ export function getBufferPanelGeometry(panelPolygon) {
   geometry.setAttribute('uv', new THREE.BufferAttribute(uvs, 2))
 
   geometry.computeVertexNormals()
+  geometry.userData.version = 0
   return geometry
 }
 export function updateBufferPanelGeometry(panelPolygon, geometry) {
@@ -636,6 +641,7 @@ export function getBufferPanelSideGeometry(panelPolygon) {
   // itemSize = 3 because there are 3 values (components) per vertex
   geometry.setAttribute('position', new THREE.BufferAttribute(vertices, 3))
   geometry.computeVertexNormals()
+  geometry.userData.version = 0
   return geometry
 }
 

package/src/helper/render/mergedGeometry.js

@@ -6,9 +6,12 @@ export default {
       const mergedVertices = []
       const mergedNormals = []
       const mergedUvs = []
-      const geometryVersion = mergedGeometry.userData.version || 0
+      const geometryVersion = mergedGeometry?.userData?.version || 0
       let geometryChanged = false
       geometries.forEach((geometry) => {
+        if (!geometry || !geometry.attributes?.position || !geometry.attributes?.normal) {
+          return
+        }
         const positions = geometry.attributes.position.array
         const normals = geometry.attributes.normal.array
         mergedVertices.push(...positions.slice(0, 3 * geometry.drawRange.count))
@@ -66,6 +69,9 @@ export default {
       const mergedUvs = []
 
       geometries.forEach((geometry) => {
+        if (!geometry || !geometry.attributes?.position || !geometry.attributes?.normal) {
+          return
+        }
         const positions = geometry.attributes.position.array
         const normals = geometry.attributes.normal.array
 
@@ -96,11 +102,16 @@ export default {
     },
 
     updateOrCreateMergedMesh(mesh, geometries, material) {
-      if (!mesh) {
+      if (!mesh || !mesh.geometry) {
         let mergedGeometry = this.createMergedGeometry(geometries)
-        mesh = new THREE.Mesh(mergedGeometry, material)
-        // Add the merged mesh to the scene
-        this.scene.add(mesh)
+        if (!mesh) {
+          mesh = new THREE.Mesh(mergedGeometry, material)
+          // Add the merged mesh to the scene
+          this.scene.add(mesh)
+        } else {
+          mesh.geometry = mergedGeometry
+          if (material) mesh.material = material
+        }
       } else {
         let mergedGeometry = this.updateMergedGeometry(
           geometries,

package/src/helper/render/roof.js

@@ -99,8 +99,10 @@ export default {
           geometry = mesh.geometry
           geometry = this.updateRoofGeometry(geometry, roofPolygon)
           //in order to be able to render multiple material on it (background and image overlay)
-          mesh.geometry = geometry
-          mesh.updateMatrix()
+          if (geometry) {
+            mesh.geometry = geometry
+            mesh.updateMatrix()
+          }
         }
 
         if (!this.meshes.roofMeshes[roofPolygon.id]) {
@@ -137,7 +139,9 @@ export default {
               [],
               mesh.geometry
             )
-            mesh.geometry = geometry
+            if (geometry) {
+              mesh.geometry = geometry
+            }
             mesh.userData.version = roofPolygon.version
           }
           mesh.visible = roofPolygon.maximumGap > maximumGapLimit

package/src/helper/render/shadingMaterial/helper.js

@@ -10,7 +10,7 @@ export function getEdgesForHorizonForShader(plane, edges) {
   let obstacleEdgesForHorizon = edges
     .filter((e) => e.layer == 'obstacle')
     .map((e) => {
-      const obstaclePolygon = e.belongsTo[0].polygon
+      const obstaclePolygon = e.belongsTo[0].item
       let obstacleHeight
       if (obstaclePolygon.isParallel) {
         obstacleHeight = parseInt(obstaclePolygon.height || 0)

package/src/helper/render/texture.js

@@ -1,7 +1,7 @@
 export default {
   methods: {
     applyTextureOnMesh(materials, mesh) {
-      if (mesh && materials && materials.length > 0) {
+      if (mesh && mesh.geometry && materials && materials.length > 0) {
         const materialsVersionsOnMesh = mesh.userData.materialsVersions
         if (materialsVersionsOnMesh) {
           const materialUuids = materials.map((m) => m.uuid)

package/src/helper/renderMixin.js

@@ -155,6 +155,14 @@ export default {
             arg: [],
           })
           break
+        case 'setCameraGlobalPositionImmediately':
+          methodList.push({
+            name: 'setCameraGlobalPositionImmediately',
+            method: this.setCameraGlobalPositionImmediately,
+            arg: [],
+          })
+          break
+
         case 'setCameraInitialPosition':
           methodList.push({
             name: 'setCameraInitialPosition',