@eturnity/eturnity_3d 7.20.1 → 7.24.0

package/src/config.js

@@ -12,19 +12,38 @@ export const layerColors = {
   construction: {
     fillColor: 'transparent',
     strokeColor: theme.colors.blueElectric,
-    strokeWidth: 3
+    strokeWidth: 2
+  },
+  obstacleConstruction: {
+    fillColor: 'transparent',
+    strokeColor: theme.colors.red,
+    strokeWidth: 2
   },
   roof: {
     fillColor: 'rgba(255, 255, 255, 0.1)',
     strokeColor: 'white',
     strokeWidth: 0
   },
+  hoveredRoof: {
+    fillColor: '#0068DE30',
+    strokeColor: 'white',
+    strokeWidth: 0
+  },
+  hoveredObstacle: {
+    fillColor: theme.colors.transparentRed20,
+    strokeColor: theme.colors.red,
+    strokeWidth: 0
+  },
   roofInside: {
     fillColor: 'rgba(255, 255, 255, 0.1)',
     strokeColor: 'white',
     strokeWidth: 1
   },
-  obstacle: { fillColor: theme.colors.red, strokeColor: 'red', strokeWidth: 1 },
+  obstacle: {
+    fillColor: theme.colors.transparentRed10,
+    strokeColor: theme.colors.red,
+    strokeWidth: 2
+  },
   panel: {
     fillColor: 'rgba(115, 115, 229, 0.1)',
     strokeColor: '#ffffff',
@@ -33,7 +52,7 @@ export const layerColors = {
   user_deactivated_panel: {
     fillColor: 'rgba(115, 115, 229, 0.1)',
     strokeColor: 'white',
-    strokeWidth: 4
+    strokeWidth: 2
   },
   selectedPanel: {
     fillColor: '#0068DE80',
@@ -41,21 +60,91 @@ export const layerColors = {
     strokeWidth: 1
   },
   snap: { fillColor: 'transparent', strokeColor: 'white' },
+  snapTargetObstacle: { fillColor: theme.colors.red },
+  snapTarget: { fillColor: theme.colors.blueElectric },
   moduleField: {
-    fillColor: 'rgba(255, 255, 255, 0.1)',
+    fillColor: 'rgba(255, 255, 255, 0.2)',
+    strokeColor: 'transparent',
+    strokeWidth: 1
+  },
+  hoveredModuleFieldEdge: {
+    strokeColor: theme.colors.blue,
+    strokeWidth: 6
+  },
+  moduleFieldBaseLineEdge: {
+    strokeColor: theme.colors.purple2,
+    strokeWidth: 6
+  },
+  node: {
     strokeColor: 'white',
-    strokeWidth: 3
+    fillColor: 'rgba(255, 255, 255, 0.1)',
+    strokeWidth: 2
+  },
+  obstacleNode: {
+    strokeColor: theme.colors.red,
+    fillColor: 'rgba(255, 255, 255, 0.1)',
+    strokeWidth: 2
+  },
+  hoveredEdge: { strokeColor: theme.colors.blueElectric, strokeWidth: 3 },
+  hoveredNode: {
+    strokeColor: theme.colors.blueElectric,
+    strokeWidth: 6,
+    fillColor: '#48a2d080'
+  },
+  hoveredObstacleNode: {
+    strokeColor: theme.colors.red,
+    strokeWidth: 2,
+    fillColor: theme.colors.transparentRed50
+  },
+  hoveredMasterHandle: {
+    strokeColor: theme.colors.blueElectric,
+    strokeWidth: 3,
+    fillColor: 'black'
+  },
+  subHandleLink: { strokeColor: '#ffffffa0', strokeWidth: 2 },
+  selectedEdge: { strokeColor: theme.colors.blue, strokeWidth: 3 },
+  selectedEdgeObstacle: {
+    strokeColor: theme.colors.darkRed,
+    strokeWidth: 4
+  },
+  hoveredEdgeObstacle: {
+    strokeColor: theme.colors.pureRed,
+    strokeWidth: 2
+  },
+  selectedNode: {
+    strokeColor: theme.colors.blue,
+    strokeWidth: 2,
+    fillColor: theme.colors.blue
+  },
+  selectedObstacleNode: {
+    strokeColor: theme.colors.darkRed,
+    strokeWidth: 2,
+    fillColor: theme.colors.pureRed
+  },
+  hoveredModuleField: {
+    fillColor: '#0068DE30',
+    strokeColor: theme.colors.blueElectric,
+    strokeWidth: 5
   },
-  hoveredModuleFieldEdge: { strokeColor: theme.colors.blue, strokeWidth: 6 },
   tmpModuleField: {
-    fillColor: 'rgba(115, 115, 229, 0.4)',
+    fillColor: 'rgba(115, 115, 229, 0.2)',
     strokeColor: theme.colors.blue,
-    strokeWidth: 2
+    strokeWidth: 1
   },
   selectedModuleField: {
-    fillColor: '#0068DE80',
+    fillColor: '#0068DEA0',
     strokeColor: theme.colors.blue,
-    strokeWidth: 3
+    strokeWidth: 2
+  },
+  selectableModuleField: {
+    fillColor: 'rgba(255, 255, 255, 0.2)',
+    strokeColor: 'transparent',
+    strokeWidth: 2
+  },
+  overrideNumberOfPanelsModuleField: {
+    fillColor: '#fc8b0080',
+    strokeColor: 'transparent',
+    strokeWidth: 1
   },
   highlight: {
     fillColor: 'rgba(255, 255, 255, 0.2)',
@@ -65,23 +154,28 @@ export const layerColors = {
   selectedRoof: {
     fillColor: '#0068DE80',
     strokeColor: 'white',
-    strokeWidth: 3
+    strokeWidth: 2
   },
   selectedObstacle: {
-    fillColor: '#0068DE80',
-    strokeColor: theme.colors.blue,
-    strokeWidth: 2
+    fillColor: theme.colors.transparentRed50,
+    strokeColor: theme.colors.red,
+    strokeWidth: 1
   },
   selectedAndHighlighted: {
     fillColor: '#0068DEA0',
     strokeColor: theme.colors.blue,
-    strokeWidth: 3
+    strokeWidth: 2
   },
   flatWarning: {
     fillColor: '#ffff0090',
     strokeColor: 'yellow',
     strokeWidth: 1
   },
+  flatSelectedWarning: {
+    fillColor: '#a0a00090',
+    strokeColor: 'yellow',
+    strokeWidth: 1
+  },
   customLength: {
     fillColor: 'transparent',
     strokeColor: theme.colors.blueElectric,
@@ -94,8 +188,8 @@ export const layerColors = {
   },
   inclineDirectionArrow: {
     fillColor: 'transparent',
-    strokeColor: '#FF5656',
-    strokeWidth: 5
+    strokeColor: theme.colors.orange,
+    strokeWidth: 4
   },
   inclineLabel: {
     fillColor: theme.colors.transparentBlack1,
@@ -104,6 +198,15 @@ export const layerColors = {
   directionLabel: {
     fillColor: theme.colors.transparentBlack1,
     textColor: 'white'
+  },
+  imageOverlayHandle: {
+    fillColor: 'transparent',
+    strokeColor: theme.colors.blueElectric,
+    strokeWidth: 3
+  },
+  angleLabelColor: {
+    strokeColor: theme.colors.orange,
+    fillColor: theme.colors.orange
   }
 }
 

package/src/helper/UpdateRoofModuleFieldRelations.js

@@ -13,42 +13,80 @@ export function UpdateRoofModuleFieldRelations(state) {
   const panelPolygons = state.polygons.filter((poly) =>
     ['panel', 'user_deactivated_panel'].includes(poly.layer)
   )
+  panelPolygons.forEach((panel) => {
+    panel.roof = null
+  })
   //let's remove all moduleFields from roofs
+
   roofPolygons.forEach((roofPolygon) => {
-    //breaking circular reference for memory management
-    for (let k in roofPolygon.moduleFields) {
-      roofPolygon.moduleFields[k] = null
+    if (!roofPolygon.moduleFields) {
+      roofPolygon.moduleFields = []
     }
-    roofPolygon.moduleFields = []
+    roofPolygon.moduleFields.filter((mf) => {
+      moduleFieldPolygons.some((p) => p.id == mf.id)
+    })
   })
   moduleFieldPolygons.forEach((moduleFieldPolygon) => {
-    moduleFieldPolygon.roof = null
-  })
-  panelPolygons.forEach((panelPolygon) => {
-    panelPolygon.roof = null
+    if (
+      moduleFieldPolygon.roof &&
+      !roofPolygons.some((r) => r.id == moduleFieldPolygon.roof.id)
+    ) {
+      moduleFieldPolygon.roof = null
+    }
   })
 
   for (let k in moduleFieldPolygons) {
     const moduleField = moduleFieldPolygons[k]
-    //check if everypoint is in the same roof and if they are not too far from the flat surface.(at least above)
-    let roofPolygonCandidates = roofPolygons.filter((roof) => {
-      const intersection = intersectOutlines(moduleField.outline, roof.outline)
-      if (intersection.length == 0) return false
-      const intersectionArea = calculateArea(intersection[0])
-      return intersectionArea > 100 && moduleField.area <= roof.area + 0.1
-    })
-    //roofs on roof can lead to multiple roof under a point. moduleField is on the smallest
-    let smallestRoof = null
-    for (let roof of roofPolygonCandidates) {
-      if (!smallestRoof || smallestRoof.area > roof.area) {
-        smallestRoof = roof
-      }
-    }
-    let roofPolygon = smallestRoof
+    let roofPolygon = moduleField.roof
     if (!roofPolygon) {
-      continue
+      //check if everypoint is in the same roof and if they are not too far from the flat surface.(at least above)
+      let roofPolygonCandidates = roofPolygons.map((roof) => {
+        const intersection = intersectOutlines(
+          moduleField.outline,
+          roof.outline
+        )
+        if (intersection.length == 0) {
+          return {
+            roof,
+            intersectionArea: 0,
+            intersectionRatio: 0,
+            areaRatio: 0,
+            roofBiggerThanModuleField: 1
+          }
+        }
+        const intersectionArea_m2 = calculateArea(intersection[0]) / 1e6
+        return {
+          roof,
+          intersectionArea: intersectionArea_m2,
+          intersectionRatio: (intersectionArea_m2 / roof.area).toFixed(3),
+          areaRatio: (moduleField.area / roof.area).toFixed(3),
+          roofBiggerThanModuleField: roof.area >= moduleField.area ? 1 : -1
+        }
+      })
+      //roofs on roof can lead to multiple roof under a point. moduleField is on the smallest
+
+      roofPolygonCandidates
+        .sort((a, b) => b.roof.area - a.roof.area)
+        .sort((a, b) => a.intersectionArea - b.intersectionArea)
+        .sort(
+          (a, b) => a.roofBiggerThanModuleField - b.roofBiggerThanModuleField
+        )
+      let polygonCandidate = roofPolygonCandidates.pop()
+      if (!polygonCandidate) {
+        continue
+      }
+      roofPolygon = polygonCandidate.roof
+      if (!roofPolygon) {
+        continue
+      }
+
+      roofPolygon.moduleFields.push(moduleField)
     }
-    roofPolygon.moduleFields.push(moduleField)
+    roofPolygon = roofPolygons.find((r) => r.id == roofPolygon.id)
+    roofPolygon.moduleFields = [
+      ...roofPolygon.moduleFields.filter((mf) => mf.id != moduleField.id),
+      moduleField
+    ]
     moduleField.roof = roofPolygon
     moduleField.panels.forEach((panel) => (panel.roof = roofPolygon))
     panelPolygons.forEach((p) => {
@@ -72,7 +110,9 @@ export function UpdateRoofModuleFieldRelations(state) {
       return panelPolygons.find((panel) => panel.id == p.id)
   })
   state = { ...state, polygons: newPolygons }
+
   state = removeModuleFieldAndPanelsOnNoOrMultipleRoofs(state)
+
   return state
 }
 

package/src/helper/cameraMixin.js

@@ -8,6 +8,7 @@ import {
   substractVector
 } from '@eturnity/eturnity_maths'
 import { marginAroundBuildingForCameraViewInMeter } from '../config'
+import OverlayLayer from '../Overlay/OverlayLayer'
 export default {
   data() {
     return {
@@ -352,6 +353,19 @@ export default {
         this.orbitControl.update()
       }
     },
+    setCameraToOverlay(overlayId) {
+      const overlay = OverlayLayer.findById(overlayId)
+      if (overlay) {
+        const targetVector = overlay.positionOffset
+        const target = [
+          targetVector.x / 1000,
+          targetVector.y / 1000,
+          targetVector.z / 1000
+        ]
+        const position = [target[0], target[1] - 20, target[2] + 50]
+        this.setTweenTo({ position, target })
+      }
+    },
     setCameraGlobalPosition() {
       if (this.roofs.length == 0) return
       if (this.camera.isOrthographicCamera) {
@@ -597,6 +611,17 @@ export default {
       if (!!TWEEN) {
         TWEEN.update()
       }
+      let waitingBall = this.scene.getObjectByName('waitingBall')
+      if (waitingBall) {
+        const time = Date.now() * 0.001 // Get current time in seconds
+        const period = 3 // 3 seconds for a full cycle
+        const scale =
+          4 + 4 * Math.abs(Math.sin(((2 * Math.PI) / period) * time)) // Scale between 5 and 25
+
+        // Update the sphere's scale
+        waitingBall.scale.set(scale, scale, scale)
+        this.render()
+      }
       this.animationFrameId = requestAnimationFrame(this.animate)
     }
   },

package/src/helper/materialMixin.js

@@ -24,7 +24,9 @@ export default {
 
     this.material.wall = new THREE.MeshLambertMaterial({
       color: wallColor,
-      side: THREE.DoubleSide
+      side: THREE.DoubleSide,
+      transparent: true,
+      opacity: this.wallColor == '#ffffff00' ? 0.2 : 1
     })
 
     this.material.obstacle = new THREE.MeshPhongMaterial({
@@ -79,7 +81,13 @@ export default {
       opacity: 0.2,
       side: THREE.DoubleSide
     })
+    this.material.projectionTiles = []
+
     this.material.roof = [this.material.wall]
+    this.material.selectedRoof = [this.material.wall]
+    this.material.hoveredRoof = [this.material.wall]
+    this.material.warningRoof = [this.material.wall]
+    this.material.selectedWarningRoof = [this.material.wall]
 
     this.material.flatRoof = new THREE.MeshPhongMaterial({
       color: 0x00ff00,
@@ -144,6 +152,11 @@ export default {
     wallColor(color) {
       let wallColor = new THREE.Color(color)
       this.material.wall.color.set(wallColor)
+      if (color == '#ffffff00') {
+        this.material.wall.opacity = 0.2
+      } else {
+        this.material.wall.opacity = 1
+      }
     }
   }
 }