@eturnity/eturnity_3d 7.30.0 → 7.32.1

package/src/helper/render/roof.js

@@ -2,11 +2,11 @@ import * as THREE from 'three'
 import { maximumGapLimit } from '../../config'
 import {
   getBufferRoofGeometry,
-  updateBufferRoofGeometry
+  updateBufferRoofGeometry,
 } from './geometryHandler'
 import {
   intersectOutlines,
-  verticalProjectionOnPlane
+  verticalProjectionOnPlane,
 } from '@eturnity/eturnity_maths'
 import { debounce } from 'lodash'
 export default {
@@ -28,7 +28,7 @@ export default {
               p,
               roofPolygon.normalVector,
               roofPolygon.flatOutline[0]
-            ).z
+            ).z,
           }
         })
         return outline
@@ -57,7 +57,7 @@ export default {
               p,
               roofPolygon.normalVector,
               roofPolygon.flatOutline[0]
-            ).z
+            ).z,
           }
         })
         return outline
@@ -156,6 +156,6 @@ export default {
           }
         }
       })
-    }
-  }
+    },
+  },
 }

package/src/helper/render/texture.js

@@ -37,11 +37,11 @@ export default {
           return {
             uuid: m.uuid,
             materialVersion: m.userData.version,
-            geometryVersion: mesh.geometry.userData.version
+            geometryVersion: mesh.geometry.userData.version,
           }
         })
         mesh.needsUpdate = true
       }
-    }
-  }
+    },
+  },
 }

package/src/helper/render/tile.js

@@ -1,12 +1,12 @@
 import * as THREE from 'three'
 import {
   getBufferRoofGeometry,
-  updateBufferRoofGeometry
+  updateBufferRoofGeometry,
 } from './geometryHandler'
 import {
   distanceToDeltaLatLng,
   latLngToTileXY,
-  tileToCorners
+  tileToCorners,
 } from '@eturnity/eturnity_maths'
 import { earthRadius } from '../../config'
 import { debounce } from 'lodash'
@@ -19,7 +19,7 @@ export default {
       pendingTiles: [],
       numberOfTilesRendered: 0,
       numberOfTilesToRender: 0,
-      tileToRender: []
+      tileToRender: [],
     }
   },
   methods: {
@@ -128,7 +128,7 @@ export default {
             xTile,
             yTile,
             zoomLvl,
-            isTileOnRoofBound: true
+            isTileOnRoofBound: true,
           })
         }
       }
@@ -169,7 +169,7 @@ export default {
                 xTile,
                 yTile,
                 zoomLvl,
-                isTileOnRoofBound: false
+                isTileOnRoofBound: false,
               })
             }
           }
@@ -228,69 +228,77 @@ export default {
           return
         }
 
-      let mesh = this.meshes.tileMeshes[meshId]
-      if (mesh && this.provider.mapLayer == mesh.userData.mapLayer) {
-        resolve()
-        return
-      }
-
-      const latitude = this.layoutSettings.layout_latitude
-      const longitude = this.layoutSettings.layout_longitude
-      let geometry, material
-      const imagePromise = cancellablePromise(
-        this.provider.fetchTile(zoomLvl, x, y)
-      )
-      this.pendingTiles.push({ x, y, zoomLvl, mapLayer, meshId, imagePromise })
-      this.isReady.texturesToLoad++
-      imagePromise.then((image) => {
-        this.isReady.texturesLoaded++
-        if (!image) {
-          this.removeTileFromPending(meshId, mapLayer)
+        let mesh = this.meshes.tileMeshes[meshId]
+        if (mesh && this.provider.mapLayer == mesh.userData.mapLayer) {
           resolve()
           return
         }
-        const texture = new THREE.Texture(image)
-        if (isTileOnRoofBound) {
-          this.newTileMaterial(texture, x, y, zoomLvl, mapLayer)
-        }
-        texture.generateMipmaps = false
-        texture.format = THREE.RGBAFormat
-        texture.needsUpdate = true
-        let corners = tileToCorners(x, y, zoomLvl, latitude, longitude)
-        corners = corners.map((c) => {
-          return { ...c, z: -100 }
+
+        const latitude = this.layoutSettings.layout_latitude
+        const longitude = this.layoutSettings.layout_longitude
+        let geometry, material
+        const imagePromise = cancellablePromise(
+          this.provider.fetchTile(zoomLvl, x, y)
+        )
+        this.pendingTiles.push({
+          x,
+          y,
+          zoomLvl,
+          mapLayer,
+          meshId,
+          imagePromise,
         })
-        if (mesh) {
-          geometry = mesh.geometry
-          material = mesh.material
-          geometry = updateBufferRoofGeometry(corners, [], geometry)
-          mesh.geometry = geometry
-          material.map = texture
-          material.needsUpdate = true
-          mesh.userData.mapLayer = this.provider.mapLayer
-          mesh.userData.type = 'tileMeshes'
-          mesh.userData.meshId = meshId
-          mesh.frustumCulled = false
-          mesh.needsUpdate = true
-          mesh.updateMatrix()
-        } else {
-          material = new THREE.MeshBasicMaterial({
-            map: texture,
-            color: 0xffffff,
-            side: THREE.FrontSide,
-            transparent: false,
-            // opacity:isTileOnRoofBound?0.8:1,
-            // color:isTileOnRoofBound?'red':'white'
-          })
-          material.map = texture
-          material.needsUpdate = true
-          geometry = getBufferRoofGeometry(corners)
-          if (geometry) {
-            mesh = new THREE.Mesh(geometry, material)
-            mesh.userData.type = 'tileMeshes'
-            mesh.userData.meshId = meshId
-            mesh.userData.mapLayer = this.provider.mapLayer
-            mesh.name = meshId
+        this.isReady.texturesToLoad++
+        imagePromise
+          .then((image) => {
+            this.isReady.texturesLoaded++
+            if (!image) {
+              this.removeTileFromPending(meshId, mapLayer)
+              resolve()
+              return
+            }
+            const texture = new THREE.Texture(image)
+            if (isTileOnRoofBound) {
+              this.newTileMaterial(texture, x, y, zoomLvl, mapLayer)
+            }
+            texture.generateMipmaps = false
+            texture.format = THREE.RGBAFormat
+            texture.needsUpdate = true
+            let corners = tileToCorners(x, y, zoomLvl, latitude, longitude)
+            corners = corners.map((c) => {
+              return { ...c, z: -100 }
+            })
+            if (mesh) {
+              geometry = mesh.geometry
+              material = mesh.material
+              geometry = updateBufferRoofGeometry(corners, [], geometry)
+              mesh.geometry = geometry
+              material.map = texture
+              material.needsUpdate = true
+              mesh.userData.mapLayer = this.provider.mapLayer
+              mesh.userData.type = 'tileMeshes'
+              mesh.userData.meshId = meshId
+              mesh.frustumCulled = false
+              mesh.needsUpdate = true
+              mesh.updateMatrix()
+            } else {
+              material = new THREE.MeshBasicMaterial({
+                map: texture,
+                color: 0xffffff,
+                side: THREE.FrontSide,
+                transparent: false,
+                // opacity:isTileOnRoofBound?0.8:1,
+                // color:isTileOnRoofBound?'red':'white'
+              })
+              material.map = texture
+              material.needsUpdate = true
+              geometry = getBufferRoofGeometry(corners)
+              if (geometry) {
+                mesh = new THREE.Mesh(geometry, material)
+                mesh.userData.type = 'tileMeshes'
+                mesh.userData.meshId = meshId
+                mesh.userData.mapLayer = this.provider.mapLayer
+                mesh.name = meshId
 
                 if (!this.scene.getObjectByName(meshId)) {
                   this.meshes.tileMeshes[meshId] = mesh
@@ -358,7 +366,7 @@ export default {
       }
       let roofsBoundCenterMeter = {
         x: (xMax + xMin) / 2000,
-        y: (yMax + yMin) / 2000
+        y: (yMax + yMin) / 2000,
       }
       let deltaLatLng = distanceToDeltaLatLng(
         roofsBoundCenterMeter.x * 1000,
@@ -367,7 +375,7 @@ export default {
       )
       let roofsBoundCenterLatLng = {
         lat: this.layoutSettings.layout_latitude + deltaLatLng.lat,
-        lng: this.layoutSettings.layout_longitude + deltaLatLng.lng
+        lng: this.layoutSettings.layout_longitude + deltaLatLng.lng,
       }
 
       let apiKey = process.env.VUE_APP_GOOGLE_MAP_API_KEY
@@ -378,7 +386,7 @@ export default {
       let zoomLevels = [
         roofsBoundZoomLvl,
         roofsBoundZoomLvl - 2,
-        roofsBoundZoomLvl - 4
+        roofsBoundZoomLvl - 4,
       ]
       this.numberOfTilesToRender = zoomLevels.length
       for (
@@ -401,7 +409,7 @@ export default {
 
         //to remove attribution in bottom of the image
         var uvs = new Float32Array([
-          0, 0.95, 1, 0.95, 0, 0.05, 1, 0.05, 0, 0.05, 1, 0.95
+          0, 0.95, 1, 0.95, 0, 0.05, 1, 0.05, 0, 0.05, 1, 0.95,
         ])
         planeGeometry[indexGoogleBackground].setAttribute(
           'uv',
@@ -426,7 +434,7 @@ export default {
           }
           planeMaterial[indexGoogleBackground] = new THREE.MeshBasicMaterial({
             map: texture[indexGoogleBackground],
-            side: THREE.DoubleSide
+            side: THREE.DoubleSide,
           })
           backgroundPlane[indexGoogleBackground] = new THREE.Mesh(
             planeGeometry[indexGoogleBackground],
@@ -460,7 +468,7 @@ export default {
       }
 
       this.render()
-    }
+    },
   },
   watch: {
     selectedMapLayer(newMapLayer) {
@@ -470,6 +478,6 @@ export default {
           return false
         }
       })
-    }
-  }
+    },
+  },
 }

package/src/helper/render/tileProjection.js

@@ -6,7 +6,7 @@ export default {
   data() {
     return {
       tileProjectionTextures: [],
-      tileProjectionMaterials: []
+      tileProjectionMaterials: [],
     }
   },
   methods: {
@@ -26,7 +26,7 @@ export default {
         camera: cameraProjection,
         texture: texture,
         transparent: true,
-        side: THREE.DoubleSide
+        side: THREE.DoubleSide,
       })
       tileProjectionMaterial.camera = cameraProjection
       tileProjectionMaterial.userData = {}
@@ -70,7 +70,7 @@ export default {
         camera: cameraProjection,
         texture: texture,
         transparent: true,
-        side: THREE.DoubleSide
+        side: THREE.DoubleSide,
       })
       tileProjectionMaterial.camera = cameraProjection
       tileProjectionMaterial.userData = {}
@@ -114,7 +114,7 @@ export default {
       width = height
       tileCenter = {
         x: (corners[0].x + corners[2].x) / 2,
-        y: (corners[0].y + corners[2].y) / 2
+        y: (corners[0].y + corners[2].y) / 2,
       }
 
       camera.left = corners[0].x / 1000
@@ -123,12 +123,12 @@ export default {
       camera.top = corners[2].y / 1000
 
       camera.updateProjectionMatrix()
-    }
+    },
   },
   watch: {
     selectedMapLayer(newMapLayer) {
       if (!newMapLayer) return
       this.disposeTileMaterialDifferentMapLayer(newMapLayer.key)
-    }
-  }
+    },
+  },
 }