@eturnity/eturnity_3d 8.4.2 → 8.4.3-EPDM-12330.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eturnity/eturnity_3d",
   "private": false,
-  "version": "8.4.2",
+  "version": "8.4.3-EPDM-12330.0",
   "files": [
     "dist",
     "src"
@@ -15,7 +15,7 @@
     "prettier": "prettier --write \"**/*.{js,vue}\""
   },
   "dependencies": {
-    "@eturnity/eturnity_maths": "8.4.1",
+    "@eturnity/eturnity_maths": "8.4.2",
     "@originjs/vite-plugin-commonjs": "1.0.3",
     "core-js": "3.30.2",
     "cors": "2.8.5",

package/src/components/ThreeCanvasViewer.vue

@@ -53,6 +53,7 @@
         isInteractive: this.isInteractive,
         isPerspectiveCamera,
         DOMElement: this.$refs.canvas3DContainer,
+        isScreenshotForPDF: true,
       })
 
       await this.loadPanelsTexture()

package/src/helper/render/tile.js

@@ -26,7 +26,7 @@ export default {
     debouncedRenderTiles: debounce(function () {
       this.renderTiles()
     }, 1000),
-    async renderTiles() {
+    async renderTiles(isScreenshotForPDF = false) {
       if (!this.scene) {
         return
       }
@@ -36,9 +36,9 @@ export default {
           this.selectedMapLayer.key
         )
       ) {
-        this.renderGoogleTiles()
+        this.renderGoogleTiles(isScreenshotForPDF)
       } else {
-        this.renderProviderTiles()
+        this.renderProviderTiles(isScreenshotForPDF)
       }
     },
     removeUnusedTiles() {
@@ -58,7 +58,7 @@ export default {
         this.clearMeshFromScene(this.meshes.tileMeshes[id], this.scene)
       }
     },
-    async renderProviderTiles() {
+    async renderProviderTiles(isScreenshotForPDF = false) {
       if (this.googleBackgroundMap) {
         this.googleBackgroundMap.clear()
         this.scene.remove(this.googleBackgroundMap)
@@ -186,7 +186,7 @@ export default {
         zoomLvl = this.tileToRender[k].zoomLvl
         let isTileOnRoofBound = this.tileToRender[k].isTileOnRoofBound
         promiseArray.push(
-          this.renderTile(xTile, yTile, zoomLvl, isTileOnRoofBound)
+          this.renderTile(xTile, yTile, zoomLvl, isTileOnRoofBound, isScreenshotForPDF)
         )
       }
       Promise.all(promiseArray).then((res) => {
@@ -215,7 +215,7 @@ export default {
         (t) => t.meshId != meshId || t.mapLayer != mapLayer
       )
     },
-    async renderTile(x, y, zoomLvl, isTileOnRoofBound = false) {
+    async renderTile(x, y, zoomLvl, isTileOnRoofBound = false, isScreenshotForPDF = false) {
       const promise = new Promise((resolve, reject) => {
         const meshId = 'tile_' + x + '_' + y + '_' + zoomLvl
         const mapLayer = this.provider.mapLayer
@@ -295,13 +295,22 @@ export default {
               mesh.castShadow = false
               mesh.updateMatrix()
             } else {
-              material = new THREE.MeshPhongMaterial({
-                map: texture,
-                color: 0xffffff,
-                side: THREE.FrontSide,
-                transparent: false,
-                shininess: 0,
-              })
+              if (isScreenshotForPDF) {
+                material = new THREE.MeshStandardMaterial({
+                  map: texture,
+                  color: 0xffffff,
+                  side: THREE.FrontSide,
+                  transparent: false,
+                })
+              } else {
+                material = new THREE.MeshPhongMaterial({
+                  map: texture,
+                  color: 0xffffff,
+                  side: THREE.FrontSide,
+                  transparent: false,
+                  shininess: 0,
+                })
+              }
               material.map = texture
               material.needsUpdate = true
               geometry = getBufferRoofGeometry(corners)
@@ -333,7 +342,7 @@ export default {
       })
       return promise
     },
-    async renderGoogleTiles() {
+    async renderGoogleTiles(isScreenshotForPDF = false) {
       this.clearByType('tileMeshes')
       if (!this.googleBackgroundMap) {
         this.googleBackgroundMap = new THREE.Group()
@@ -448,11 +457,19 @@ export default {
               googleMapType
             )
           }
-          planeMaterial[indexGoogleBackground] = new THREE.MeshPhongMaterial({
-            map: planeTexture[indexGoogleBackground],
-            side: THREE.DoubleSide,
-            shininess: 0,
-          })
+
+          if (isScreenshotForPDF) {
+            planeMaterial[indexGoogleBackground] = new THREE.MeshStandardMaterial({
+              map: planeTexture[indexGoogleBackground],
+              side: THREE.DoubleSide,
+            })
+          } else {
+            planeMaterial[indexGoogleBackground] = new THREE.MeshPhongMaterial({
+              map: planeTexture[indexGoogleBackground],
+              side: THREE.DoubleSide,
+              shininess: 0,
+            })
+          }
           backgroundPlane[indexGoogleBackground] = new THREE.Mesh(
             planeGeometry[indexGoogleBackground],
             planeMaterial[indexGoogleBackground]

package/src/helper/threeMixin.js

@@ -39,6 +39,7 @@ export default {
       isInteractive = true,
       isPerspectiveCamera = true,
       DOMElement = this.$refs.canvas3DContainer,
+      isScreenshotForPDF = false,
     } = {}) {
       this.DOMElement = DOMElement
 
@@ -57,7 +58,7 @@ export default {
 
       this.updateSunLight()
 
-      this.initialiseThreeMap()
+      this.initialiseThreeMap(isScreenshotForPDF)
 
       if (isInteractive) {
         this.initialiseControl(isPerspectiveCamera)
@@ -201,13 +202,13 @@ export default {
       }
       this.render()
     },
-    initialiseThreeMap() {
+    initialiseThreeMap(isScreenshotForPDF = false) {
       //Extention of the map with geo-map
       if (!this.selectedMapLayer) {
         this.initialiseMapLayer()
       }
       this.provider = new CustomProvider('', this.selectedMapLayer.key)
-      this.renderTiles()
+      this.renderTiles(isScreenshotForPDF)
     },
     initialiseMapLayer() {
       if (!this.layers || this.layers.length == 0) {

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>