@eturnity/eturnity_3d 9.7.0-EPDM-13987.0 → 9.7.0-dev-25.0

package/package.json

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

package/src/Overlay/ThreeDModelOverlay.js

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

package/src/helper/cameraMixin.js

@@ -440,10 +440,7 @@ export default {
         this.setTweenTo({ position, target })
       }
     },
-    setCameraGlobalPositionImmediately() {
-      this.setCameraGlobalPosition({ duration: 0 })
-    },
-    setCameraGlobalPosition({ duration = 1500 } = {}) {
+    setCameraGlobalPosition() {
       if (this.camera.isOrthographicCamera) {
         this.setOrthographicCameraGlobalPosition()
       } else {
@@ -469,41 +466,10 @@ export default {
           positionVector.z,
         ]
         let target = [targetVector.x, targetVector.y, targetVector.z]
-        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, fov: newFov })
       }
-      this.setTweenTo({
-        position,
-        target,
-        duration,
-      })
     },
-    setCameraGlobalVerticalPosition(changeCameraTypeAsCallback = true) {
+    setCameraGlobalVerticalPosition() {
       let position, target
       let newFov = 10
       if (this.roofs.length != 0) {
@@ -532,12 +498,10 @@ export default {
         position,
         target,
         fov: newFov,
-        callback: changeCameraTypeAsCallback
-          ? this.turnPerspectiveCameraToOrthogonal
-          : undefined,
+        callback: this.turnPerspectiveCameraToOrthogonal,
       })
     },
-    setCameraOrthogonalTo(polygon, { duration = 1000 } = {}) {
+    setCameraOrthogonalTo(polygon) {
       if (polygon) {
         let polygonRef = polygon
         const targetVector = polygonRef.meanPoint
@@ -555,7 +519,7 @@ export default {
           positionVector.y / 1000 - 1,
           positionVector.z / 1000,
         ]
-        this.setTweenTo({ position, target, duration })
+        this.setTweenTo({ position, target })
       }
     },
     setCameraSideTo(polygon) {
@@ -589,24 +553,11 @@ export default {
         position,
         target,
         fov = 50,
-        duration = 1500,
+        duration = 2000,
         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.itemId)
+              .map((i) => i.polygonId)
               .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,7 +321,6 @@ 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
 }
 
@@ -406,7 +405,6 @@ 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
 }
 
@@ -442,7 +440,6 @@ export function getBufferModuleFieldGeometry(moduleFieldPolygon) {
   geometry.setAttribute('uv', new THREE.BufferAttribute(uvs, 2))
 
   geometry.computeVertexNormals()
-  geometry.userData.version = 0
   return geometry
 }
 
@@ -488,7 +485,6 @@ 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) {
@@ -523,40 +519,38 @@ export function getBufferPanelGeometry(panelPolygon) {
     return null
   }
   const vertices = new Float32Array(trianglesVertices)
-  var A = panelPolygon.outline[2]
-  var B = panelPolygon.outline[3]
-  var C = panelPolygon.outline[1]
-  var D = panelPolygon.outline[0]
-  const AB = getDistanceBetweenPoints(A, B)
-  const AC = getDistanceBetweenPoints(A, C)
-  let uvs
-  if (AB < AC) {
-    uvs = new Float32Array([
-      0, 1, 0, 0, 1, 0,
-
-      0, 1, 1, 0, 1, 1,
-    ])
-  } else {
-    uvs = new Float32Array([
-      0, 0, 1, 0, 1, 1,
-
-      1, 0, 0, 1, 1, 1,
-    ])
-  }
+  const uvs = getPanelUVsFromOutline(panelPolygon.outline)
 
   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 updateBufferPanelGeometry(panelPolygon, geometry) {
   const panelOutlineTop = getPanelOutlineWithHeightOffset(panelPolygon)
   geometry = updateBufferRoofGeometry(panelOutlineTop, [], geometry)
+  if (geometry && panelPolygon.outline && panelPolygon.outline.length >= 4) {
+    const uvs = getPanelUVsFromOutline(panelPolygon.outline)
+    geometry.setAttribute('uv', new THREE.BufferAttribute(uvs, 2))
+    geometry.attributes.uv.needsUpdate = true
+  }
   return geometry
 }
 
+export function getPanelUVsFromOutline(outline) {
+  const A = outline[3]
+  const B = outline[2]
+  const C = outline[0]
+  const AB = getDistanceBetweenPoints(A, B)
+  const AC = getDistanceBetweenPoints(A, C)
+  const uvs =
+    AB < AC
+      ? new Float32Array([0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1])
+      : new Float32Array([1, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0])
+  return uvs
+}
+
 export function getTriangleVerticesForSidePanels(outlineBottom, outlineUp) {
   const triangleVertices = []
   const length = outlineBottom.length
@@ -641,7 +635,6 @@ 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,12 +6,9 @@ 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))
@@ -69,9 +66,6 @@ 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
 
@@ -102,16 +96,11 @@ export default {
     },
 
     updateOrCreateMergedMesh(mesh, geometries, material) {
-      if (!mesh || !mesh.geometry) {
+      if (!mesh) {
         let mergedGeometry = this.createMergedGeometry(geometries)
-        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
-        }
+        mesh = new THREE.Mesh(mergedGeometry, material)
+        // Add the merged mesh to the scene
+        this.scene.add(mesh)
       } else {
         let mergedGeometry = this.updateMergedGeometry(
           geometries,

package/src/helper/render/roof.js

@@ -99,10 +99,8 @@ 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)
-          if (geometry) {
-            mesh.geometry = geometry
-            mesh.updateMatrix()
-          }
+          mesh.geometry = geometry
+          mesh.updateMatrix()
         }
 
         if (!this.meshes.roofMeshes[roofPolygon.id]) {
@@ -139,9 +137,7 @@ export default {
               [],
               mesh.geometry
             )
-            if (geometry) {
-              mesh.geometry = 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].item
+      const obstaclePolygon = e.belongsTo[0].polygon
       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 && mesh.geometry && materials && materials.length > 0) {
+      if (mesh && materials && materials.length > 0) {
         const materialsVersionsOnMesh = mesh.userData.materialsVersions
         if (materialsVersionsOnMesh) {
           const materialUuids = materials.map((m) => m.uuid)

package/src/helper/renderMixin.js

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

package/dist/assets/theme.js

@@ -1,43 +0,0 @@
-const theme = {
-  colors: {
-    primary: '#282387',
-    secondary: '#818181',
-    tertiary: '#d5d5d5',
-    black: '#263238',
-    yellow: '#fdb813',
-    darkGray: '#818181',
-    mediumGray: '#d5d5d5',
-    lightGray: '#f2f2f2',
-    white: '#fff',
-    blue: '#48a2d0',
-    red: '#FF5656',
-    blue1: '#e4efff',
-    blue2: '#F6FAFF',
-    grey1: '#666',
-    grey2: '#c4c4c4',
-    grey3: '#b2b9c5',
-    grey4: '#dee2eb',
-    grey5: '#fafafa',
-    grey6: '#555d61',
-    turquoise: '#20A4CA',
-    green: '#99db0c',
-    purple: '#505ca6',
-    disabled: '#dfe1e1',
-    transparentWhite1: '#ffffff32',
-    transparentBlack1: '#263238e6',
-    transparentBlue1: '#20a4cae6',
-    blueElectric: '#66dffa',
-    eturnityGrey: '#263238'
-  },
-
-  screen: {
-    mobileSmall: '345px',
-    mobile: '425px',
-    mobileLarge: '530px',
-    tablet: '768px',
-    tabletLarge: '950px'
-  },
-  borderRadius: '4px'
-}
-
-export default theme

package/dist/assets/vue.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="37.07" height="36" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 198"><path fill="#41B883" d="M204.8 0H256L128 220.8L0 0h97.92L128 51.2L157.44 0h47.36Z"></path><path fill="#41B883" d="m0 0l128 220.8L256 0h-51.2L128 132.48L50.56 0H0Z"></path><path fill="#35495E" d="M50.56 0L128 133.12L204.8 0h-47.36L128 51.2L97.92 0H50.56Z"></path></svg>