@eturnity/eturnity_3d 9.16.0 → 9.19.0-EPDM-19633.0

package/package.json

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

package/src/helper/cameraMixin.js

@@ -174,6 +174,7 @@ export default {
     },
     turnOrthogonalCameraToPerspective() {
       if (this.perspectiveCamera.id == this.camera.id) {
+        this.setCameraGlobalPosition({ duration: 1000 })
         return
       }
       this.camera = this.perspectiveCamera
@@ -398,7 +399,21 @@ export default {
     setCameraInitialPosition() {
       if (this.roofs.length == 0) return
       let newFov = 50
+      if (
+        this.roofsBounds.xMax === Infinity ||
+        this.roofsBounds.xMin === -Infinity ||
+        this.roofsBounds.yMax === Infinity ||
+        this.roofsBounds.yMin === -Infinity
+      ) {
+        this.roofsBounds = {
+          xMin: -10000,
+          xMax: 10000,
+          yMin: -10000,
+          yMax: 10000,
+        }
+      }
       let bounds = this.roofsBounds
+
       let targetVector = {
         x: (bounds.xMax + bounds.xMin) / 2000,
         y: (bounds.yMax + bounds.yMin) / 2000,
@@ -449,6 +464,21 @@ export default {
       } else {
         let newFov = 50
         let bounds = this.roofsBounds
+        if (
+          bounds.xMax === Infinity ||
+          bounds.xMin === -Infinity ||
+          bounds.yMax === Infinity ||
+          bounds.yMin === -Infinity
+        ) {
+          bounds = {
+            xMin: -10000,
+            xMax: 10000,
+            yMin: -10000,
+            yMax: 10000,
+            zMin: 0,
+            zMax: 0,
+          }
+        }
         let targetVector = {
           x: (bounds.xMax + bounds.xMin) / 2000,
           y: (bounds.yMax + bounds.yMin) / 2000,

package/src/helper/render/loader.js

@@ -4,9 +4,12 @@ export default {
   methods: {
     loadTextureAsync(url) {
       return new Promise((resolve) => {
-        this.loader.load(url, (texture) => {
-          resolve(texture)
-        })
+        this.loader.load(
+          url,
+          (texture) => resolve(texture),
+          () => {},
+          () => resolve(null)
+        )
       })
     },
     async loadNewPanelTextures() {
@@ -42,13 +45,20 @@ export default {
       const promiseArray = this.moduleFields.map(async (mf) => {
         const pvId = mf.data.component_id_pv_module
         if (!this.material.panel[pvId]) {
+          const defaultPanelMaterial =
+            this.material.panel[
+              `default_${mf.pvData.module_texture_version_id || 0}`
+            ]
           if (!mf.pvData.texture_img_url) {
-            this.material.panel[pvId] =
-              this.material.panel[`default_${this.moduleTextureVersionId}`]
+            this.material.panel[pvId] = defaultPanelMaterial
           } else {
             const texture = await this.loadTextureAsync(
               mf.pvData.texture_img_url
             )
+            if (!texture) {
+              this.material.panel[pvId] = defaultPanelMaterial
+              return
+            }
             texture.encoding = THREE.sRGBEncoding
             texture.colorSpace = THREE.SRGBColorSpace
             this.material.panel[pvId] = new THREE.MeshPhongMaterial({