@eturnity/eturnity_3d 7.30.0 → 7.32.1

package/src/helper/materialMixin.js

@@ -4,7 +4,7 @@ import {
   beamOpacity,
   node3DColor,
   node3dOpacity,
-  defaultTextureUrls
+  defaultTextureUrls,
 } from '../config'
 export default {
   data() {
@@ -19,25 +19,25 @@ export default {
 
     this.material.panelSide = new THREE.MeshLambertMaterial({
       color: 0xdddddd,
-      side: THREE.DoubleSide
+      side: THREE.DoubleSide,
     })
 
     this.material.wall = new THREE.MeshLambertMaterial({
       color: wallColor,
       side: THREE.DoubleSide,
       transparent: true,
-      opacity: this.wallColor == '#ffffff00' ? 0.2 : 1
+      opacity: this.wallColor == '#ffffff00' ? 0.2 : 1,
     })
 
     this.material.obstacle = new THREE.MeshPhongMaterial({
       color: 0xff0000,
-      side: THREE.DoubleSide
+      side: THREE.DoubleSide,
     })
 
     this.material.edge = new THREE.MeshBasicMaterial({
       color: beamColor,
       transparent: true,
-      opacity: beamOpacity
+      opacity: beamOpacity,
     })
     //Creating dot alpha texture for nodes
     const canvas = document.createElement('canvas'),
@@ -59,7 +59,7 @@ export default {
       sizeAttenuation: false,
       transparent: true,
       color: 0xffffff,
-      opacity: 1
+      opacity: 1,
     })
 
     this.material.panel = {}
@@ -71,7 +71,7 @@ export default {
       )
       this.material.panel['default_' + k] = new THREE.MeshBasicMaterial({
         map: texture,
-        side: THREE.DoubleSide
+        side: THREE.DoubleSide,
       })
     }
     this.material.panel['userDeactivatedPanel'] = new THREE.MeshBasicMaterial({
@@ -79,7 +79,7 @@ export default {
       transparent: true,
       alphaTest: 0,
       opacity: 0.2,
-      side: THREE.DoubleSide
+      side: THREE.DoubleSide,
     })
     this.material.projectionTiles = []
 
@@ -96,7 +96,7 @@ export default {
       flatShading: true,
       side: THREE.DoubleSide,
       transparent: true,
-      opacity: 0.5
+      opacity: 0.5,
     })
 
     this.material.highlight = new THREE.MeshPhongMaterial({
@@ -107,7 +107,7 @@ export default {
       side: THREE.DoubleSide,
       transparent: true,
       opacity: 0.4,
-      alphaTest: 0.3
+      alphaTest: 0.3,
     })
     this.material.selected = new THREE.MeshPhongMaterial({
       color: 0x5050ff,
@@ -117,26 +117,26 @@ export default {
       side: THREE.DoubleSide,
       transparent: true,
       opacity: 0.5,
-      alphaTest: 0.3
+      alphaTest: 0.3,
     })
     this.material.hidden = new THREE.MeshBasicMaterial({
       color: 0xffffff,
       transparent: true,
       alphaTest: 1,
       opacity: 0.2,
-      side: THREE.DoubleSide
+      side: THREE.DoubleSide,
     })
     this.material.moduleField = new THREE.MeshBasicMaterial({
       color: 0xe0e0ff,
       side: THREE.DoubleSide,
       transparent: true,
-      opacity: 0.3
+      opacity: 0.3,
     })
     this.material.moduleFieldWithPanelOveride = new THREE.MeshBasicMaterial({
       color: 0xfc9d03,
       side: THREE.DoubleSide,
       transparent: true,
-      opacity: 0.8
+      opacity: 0.8,
     })
     this.material.curvedRoof = new THREE.MeshPhongMaterial({
       color: 0xffff00,
@@ -145,7 +145,7 @@ export default {
       flatShading: true,
       side: THREE.DoubleSide,
       transparent: true,
-      opacity: 0.5
+      opacity: 0.5,
     })
   },
   watch: {
@@ -157,6 +157,6 @@ export default {
       } else {
         this.material.wall.opacity = 1
       }
-    }
-  }
+    },
+  },
 }

package/src/helper/projectedMaterial.js

@@ -117,7 +117,7 @@ class ProjectedMaterial extends THREE.MeshPhysicalMaterial {
       addLoadListener(texture, () => {
         this.uniforms.isTextureLoaded.value = true
         this.dispatchEvent({
-          type: 'textureload'
+          type: 'textureload',
         })
 
         _classPrivateFieldLooseBase(this, _saveDimensions)[_saveDimensions]()
@@ -176,22 +176,22 @@ class ProjectedMaterial extends THREE.MeshPhysicalMaterial {
 
     super(options)
     Object.defineProperty(this, _saveCameraMatrices, {
-      value: _saveCameraMatrices2
+      value: _saveCameraMatrices2,
     })
     Object.defineProperty(this, _saveDimensions, {
-      value: _saveDimensions2
+      value: _saveDimensions2,
     })
     Object.defineProperty(this, _camera, {
       writable: true,
-      value: void 0
+      value: void 0,
     })
     Object.defineProperty(this, _cover, {
       writable: true,
-      value: void 0
+      value: void 0,
     })
     Object.defineProperty(this, _textureScale, {
       writable: true,
-      value: void 0
+      value: void 0,
     })
     Object.defineProperty(this, _saveCameraProjectionMatrix, {
       writable: true,
@@ -201,10 +201,10 @@ class ProjectedMaterial extends THREE.MeshPhysicalMaterial {
         )
 
         _classPrivateFieldLooseBase(this, _saveDimensions)[_saveDimensions]()
-      }
+      },
     })
     Object.defineProperty(this, 'isProjectedMaterial', {
-      value: true
+      value: true,
     }) // save the private variables
     _classPrivateFieldLooseBase(this, _camera)[_camera] = camera
     _classPrivateFieldLooseBase(this, _cover)[_cover] = cover
@@ -219,48 +219,48 @@ class ProjectedMaterial extends THREE.MeshPhysicalMaterial {
     )
     this.uniforms = {
       projectedTexture: {
-        value: texture
+        value: texture,
       },
       // this avoids rendering black if the texture
       // hasn't loaded yet
       isTextureLoaded: {
-        value: Boolean(texture.image)
+        value: Boolean(texture.image),
       },
       // don't show the texture if we haven't called project()
       isTextureProjected: {
-        value: false
+        value: false,
       },
       // if we have multiple materials we want to show the
       // background only of the first material
       backgroundOpacity: {
-        value: 1
+        value: 1,
       },
       // these will be set on project()
       viewMatrixCamera: {
-        value: new THREE.Matrix4()
+        value: new THREE.Matrix4(),
       },
       projectionMatrixCamera: {
-        value: new THREE.Matrix4()
+        value: new THREE.Matrix4(),
       },
       projPosition: {
-        value: new THREE.Vector3()
+        value: new THREE.Vector3(),
       },
       projDirection: {
-        value: new THREE.Vector3(0, 0, -1)
+        value: new THREE.Vector3(0, 0, -1),
       },
       // we will set this later when we will have positioned the object
       savedModelMatrix: {
-        value: new THREE.Matrix4()
+        value: new THREE.Matrix4(),
       },
       widthScaled: {
-        value: _widthScaled
+        value: _widthScaled,
       },
       heightScaled: {
-        value: _heightScaled
+        value: _heightScaled,
       },
       textureOffset: {
-        value: textureOffset
-      }
+        value: textureOffset,
+      },
     }
 
     this.onBeforeCompile = (shader) => {
@@ -311,7 +311,7 @@ class ProjectedMaterial extends THREE.MeshPhysicalMaterial {
           #ifndef ORTHOGRAPHIC
           vWorldPosition = savedModelMatrix * vec4(position, 1.0);
           #endif
-        `
+        `,
       })
       shader.fragmentShader = monkeyPatch(shader.fragmentShader, {
         header:
@@ -375,7 +375,7 @@ class ProjectedMaterial extends THREE.MeshPhysicalMaterial {
             // https://learnopengl.com/Advanced-OpenGL/Blending
             diffuseColor = textureColor * textureColor.a + diffuseColor * (1.0 - textureColor.a);
           }
-        `
+        `,
       })
     } // Listen on resize if the camera used for the projection
     // is the same used to render.
@@ -394,7 +394,7 @@ class ProjectedMaterial extends THREE.MeshPhysicalMaterial {
     addLoadListener(texture, () => {
       this.uniforms.isTextureLoaded.value = true
       this.dispatchEvent({
-        type: 'textureload'
+        type: 'textureload',
       })
 
       _classPrivateFieldLooseBase(this, _saveDimensions)[_saveDimensions]()
@@ -577,7 +577,9 @@ function _saveCameraMatrices2() {
   this.uniforms.viewMatrixCamera.value.copy(viewMatrixCamera)
   this.uniforms.projectionMatrixCamera.value.copy(projectionMatrixCamera)
   this.uniforms.projPosition.value.setFromMatrixPosition(modelMatrixCamera)
-  this.uniforms.projDirection.value.set(0, 0, 1).transformDirection(modelMatrixCamera) 
+  this.uniforms.projDirection.value
+    .set(0, 0, 1)
+    .transformDirection(modelMatrixCamera)
   // tell the shader we've projected
   this.uniforms.isTextureProjected.value = true
 }

package/src/helper/render/base.js

@@ -1,13 +1,13 @@
 import * as THREE from 'three'
 import {
   getBufferWallGeometry,
-  updateBufferWallGeometry
+  updateBufferWallGeometry,
 } from './geometryHandler'
 export default {
   methods: {
     data() {
       return {
-        mergedBaseMesh: null
+        mergedBaseMesh: null,
       }
     },
     renderBase() {
@@ -50,6 +50,6 @@ export default {
         this.material.wall
       )
       this.mergedBaseMesh.renderOrder = 10
-    }
-  }
+    },
+  },
 }

package/src/helper/render/clear.js

@@ -15,12 +15,13 @@ export default {
         //in case of map, bumpMap, normalMap, envMap ...
         Object.keys(obj.material).forEach((prop) => {
           if (!obj.material[prop]) return
-          if (
-            false &&
-            obj.material[prop] !== null &&
-            typeof obj.material[prop].dispose === 'function'
-          )
-            obj.material[prop].dispose()
+          // commenting below code because it will never trigger due to 'false'
+          // if (
+          //   false &&
+          //   obj.material[prop] !== null &&
+          //   typeof obj.material[prop].dispose === 'function'
+          // )
+          //   obj.material[prop].dispose()
         })
         if (obj.material.dispose) obj.material.dispose()
       }
@@ -80,6 +81,6 @@ export default {
       if (this.renderer) {
         this.renderer.renderLists.dispose()
       }
-    }
-  }
+    },
+  },
 }

package/src/helper/render/edge.js

@@ -96,6 +96,6 @@ export default {
           this.scene.add(cylinder)
         }
       })
-    }
-  }
+    },
+  },
 }

package/src/helper/render/geometryHandler.js

@@ -9,7 +9,7 @@ import {
   hasNaN,
   getDistanceBetweenPoints,
   intersectOutlines,
-  isSameSegment2D
+  isSameSegment2D,
 } from '@eturnity/eturnity_maths'
 
 export function getTriangleVerticesFromOutline(
@@ -163,7 +163,7 @@ export function getWallVertices(polygon) {
         p_bottom_1.z / 1000,
         p_bottom_0.x / 1000,
         p_bottom_0.y / 1000,
-        p_bottom_0.z / 1000
+        p_bottom_0.z / 1000,
       ]
     )
   })
@@ -178,7 +178,7 @@ export function getWallVertices(polygon) {
           p,
           polygon.normalVector,
           polygon.flatOutline[0]
-        ).z
+        ).z,
       }
     })
 
@@ -218,7 +218,7 @@ export function getWallVertices(polygon) {
             p_bottom_0.z / 1000,
             p_bottom_1.x / 1000,
             p_bottom_1.y / 1000,
-            p_bottom_1.z / 1000
+            p_bottom_1.z / 1000,
           ]
         )
       }
@@ -306,7 +306,7 @@ export function getBufferObstacleGeometry(obstaclePolygon, roofPolygon) {
       const vectorFromBottomToTop = multiplyVector(obstacleHeight, {
         x: 0,
         y: 0,
-        z: 1
+        z: 1,
       })
       p_up_0 = addVector(p_bottom_0, vectorFromBottomToTop)
     }
@@ -369,7 +369,7 @@ export function getBufferObstacleSideGeometry(obstaclePolygon, roofPolygon) {
       const vectorFromBottomToTop = multiplyVector(obstacleHeight, {
         x: 0,
         y: 0,
-        z: 1
+        z: 1,
       })
       p_up_0 = addVector(p_bottom_0, vectorFromBottomToTop)
       p_up_1 = addVector(p_bottom_1, vectorFromBottomToTop)
@@ -393,7 +393,7 @@ export function getBufferObstacleSideGeometry(obstaclePolygon, roofPolygon) {
         p_bottom_0.z / 1000,
         p_bottom_1.x / 1000,
         p_bottom_1.y / 1000,
-        p_bottom_1.z / 1000
+        p_bottom_1.z / 1000,
       ]
     )
   })
@@ -433,7 +433,7 @@ export function getBufferModuleFieldGeometry(moduleFieldPolygon) {
   var uvs = new Float32Array([
     1, 1, 0, 1, 0, 0,
 
-    1, 1, 0, 0, 1, 0
+    1, 1, 0, 0, 1, 0,
   ])
 
   geometry.setAttribute('position', new THREE.BufferAttribute(vertices, 3))
@@ -473,13 +473,13 @@ export function getBufferImageOverlayGeometry(corners) {
     uvs = new Float32Array([
       0, 1, 0, 0, 1, 0,
 
-      0, 1, 1, 0, 1, 1
+      0, 1, 1, 0, 1, 1,
     ])
   } else {
     uvs = new Float32Array([
       0, 0, 1, 0, 1, 1,
 
-      1, 0, 0, 1, 1, 1
+      1, 0, 0, 1, 1, 1,
     ])
   }
   geometry.setAttribute('position', new THREE.BufferAttribute(vertices, 3))
@@ -530,13 +530,13 @@ export function getBufferPanelGeometry(panelPolygon) {
     uvs = new Float32Array([
       0, 1, 0, 0, 1, 0,
 
-      0, 1, 1, 0, 1, 1
+      0, 1, 1, 0, 1, 1,
     ])
   } else {
     uvs = new Float32Array([
       0, 0, 1, 0, 1, 1,
 
-      1, 0, 0, 1, 1, 1
+      1, 0, 0, 1, 1, 1,
     ])
   }
 
@@ -581,7 +581,7 @@ export function getTriangleVerticesForSidePanels(outlineBottom, outlineUp) {
         p_up_1.z / 1000,
         p_bottom_1.x / 1000,
         p_bottom_1.y / 1000,
-        p_bottom_1.z / 1000
+        p_bottom_1.z / 1000,
       ]
     )
   }
@@ -668,7 +668,7 @@ export function getBufferRoofMarginGeometry(polygon, roofPolygon = null) {
               p,
               roofPolygon.normalVector,
               roofPolygon.flatOutline[0]
-            ).z
+            ).z,
           }
         })
       }
@@ -741,7 +741,7 @@ export function getExtrusionGeometry(
     curveSegments: 10,
     bevelEnabled: false,
     material: 0,
-    extrudeMaterial: 1
+    extrudeMaterial: 1,
   }
 
   const geometry = new THREE.ExtrudeGeometry(shapes, settings)

package/src/helper/render/imageOverlay.js

@@ -15,8 +15,8 @@ export default {
   },
   computed: {
     ...mapGetters({
-      imageOverlay: 'getImageOverlay'
-    })
+      imageOverlay: 'getImageOverlay',
+    }),
   },
   methods: {
     renderImageOverlayOnBackground() {
@@ -51,6 +51,6 @@ export default {
       overlayMaterialsPromises = overlayMaterialsPromises.filter((p) => !!p)
       this.imageOverlayMaterial = await Promise.all(overlayMaterialsPromises)
       return this.imageOverlayMaterial
-    }
-  }
+    },
+  },
 }

package/src/helper/render/index.js

@@ -34,6 +34,6 @@ export default {
     projectionMaterial,
     tile,
     tileProjection,
-    mergedGeometry
-  ]
+    mergedGeometry,
+  ],
 }

package/src/helper/render/loader.js

@@ -13,7 +13,7 @@ export default {
             this.material.panel[pvId] = new THREE.MeshBasicMaterial({
               map: texture,
               side: THREE.FrontSide,
-              transparent: false
+              transparent: false,
             })
           }
         }
@@ -33,7 +33,7 @@ export default {
                 this.material.panel[pvId] = new THREE.MeshBasicMaterial({
                   map: texture,
                   side: THREE.FrontSide,
-                  transparent: false
+                  transparent: false,
                 })
                 resolve(texture)
               })
@@ -41,6 +41,6 @@ export default {
           }
         }
       }
-    }
-  }
+    },
+  },
 }

package/src/helper/render/margin.js

@@ -11,7 +11,7 @@ export default {
           'selectMargin',
           'selectModuleField',
           'drawRoof',
-          'drawObstacle'
+          'drawObstacle',
         ].includes(this.selectedTool)
       ) {
         return
@@ -42,7 +42,7 @@ export default {
               flatShading: true,
               side: THREE.DoubleSide,
               transparent: true,
-              opacity: 0.8
+              opacity: 0.8,
             })
             const mesh = new THREE.Mesh(geometry, material)
             geometry.dispose()
@@ -67,7 +67,7 @@ export default {
                 flatShading: true,
                 side: THREE.DoubleSide,
                 transparent: true,
-                opacity: 0.8
+                opacity: 0.8,
               })
               const mesh = new THREE.Mesh(geometry, material)
               geometry.dispose()
@@ -82,6 +82,6 @@ export default {
           })
         })
       })
-    }
-  }
+    },
+  },
 }

package/src/helper/render/mergedGeometry.js

@@ -110,6 +110,6 @@ export default {
       }
       mesh.frustumCulled = false
       return mesh
-    }
-  }
+    },
+  },
 }

package/src/helper/render/moduleField.js

@@ -29,6 +29,6 @@ export default {
           this.meshes.moduleFieldsMeshes[moduleFieldPolygon.id] = mesh
         }
       })
-    }
-  }
+    },
+  },
 }

package/src/helper/render/node.js

@@ -52,6 +52,6 @@ export default {
       if (this.overlayScene) {
         this.overlayScene.add(nodeMeshes)
       }
-    }
-  }
+    },
+  },
 }

package/src/helper/render/obstacle.js

@@ -1,7 +1,7 @@
 import * as THREE from 'three'
 import {
   getBufferObstacleGeometry,
-  getBufferObstacleSideGeometry
+  getBufferObstacleSideGeometry,
 } from './geometryHandler'
 export default {
   created() {
@@ -83,6 +83,6 @@ export default {
       )
       this.mergedObstacleSideMesh.renderOrder = 10
       this.applyTextureOnObstacles(this.material.roof)
-    }
-  }
+    },
+  },
 }

package/src/helper/render/overlay.js

@@ -11,7 +11,7 @@ export default {
     this.glbLoader = new GLTFLoader()
   },
   computed: {
-    ...mapState({})
+    ...mapState({}),
   },
   methods: {
     renderOverlays() {
@@ -36,6 +36,6 @@ export default {
       this.renderOverlays()
       this.updateProjectionMaterials()
       this.render()
-    }
-  }
+    },
+  },
 }

package/src/helper/render/panel.js

@@ -3,12 +3,12 @@ import {
   getBufferPanelGeometry,
   updateBufferPanelGeometry,
   getBufferPanelSideGeometry,
-  updateBufferPanelSideGeometry
+  updateBufferPanelSideGeometry,
 } from './geometryHandler'
 export default {
   data() {
     return {
-      arePanelVisible: true
+      arePanelVisible: true,
     }
   },
   created() {
@@ -221,6 +221,6 @@ export default {
       } else {
         this.hidePanels()
       }
-    }
-  }
+    },
+  },
 }

package/src/helper/render/projectionMaterial.js

@@ -29,6 +29,6 @@ export default {
       this.material.roof = [...this.material.roof, ...this.overlayMaterials]
       this.renderImageOverlayOnBackground()
       this.applyTextureOnRoofs()
-    }
-  }
+    },
+  },
 }