@eturnity/eturnity_3d 9.19.0 → 9.25.0

package/package.json

@@ -1,13 +1,20 @@
 {
   "name": "@eturnity/eturnity_3d",
   "private": false,
-  "version": "9.19.0",
+  "version": "9.25.0",
   "files": [
     "dist",
     "src"
   ],
   "main": "./dist/main.umd.js",
   "module": "./dist/main.es.js",
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "lint": "eslint --ext .js,.vue --ignore-path .gitignore --fix src`",
+    "prettier": "prettier --write \"**/*.{js,vue}\"",
+    "merge-remote-master": "node scripts/merge-remote-master.js"
+  },
   "dependencies": {
     "@eturnity/eturnity_maths": "9.19.0",
     "@originjs/vite-plugin-commonjs": "1.0.3",
@@ -53,12 +60,5 @@
       "require": "./dist/main.umd.js"
     },
     "./src/*": "./src/*"
-  },
-  "scripts": {
-    "dev": "vite",
-    "build": "vite build",
-    "lint": "eslint --ext .js,.vue --ignore-path .gitignore --fix src`",
-    "prettier": "prettier --write \"**/*.{js,vue}\"",
-    "merge-remote-master": "node scripts/merge-remote-master.js"
   }
-}
+}

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({

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>