@eturnity/eturnity_3d 8.34.4 → 8.34.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eturnity/eturnity_3d",
   "private": false,
-  "version": "8.34.4",
+  "version": "8.34.6",
   "files": [
     "dist",
     "src"

package/src/helper/UpdateRoofModuleFieldRelations.js

@@ -106,7 +106,7 @@ export function updateModuleFieldFittingPanels(moduleField) {
     })
   })
 
-  const hasCustomTexture = moduleField.pvData?.texture_img_url
+  const hasCustomTexture = !!moduleField.pvData?.texture_img_url
   const defaultTextureIndex = moduleField.pvData?.module_texture_version_id || 0
   const color = hasCustomTexture
     ? moduleField.pvData?.backsheet_color

package/src/helper/render/loader.js

@@ -42,11 +42,13 @@ export default {
       const promiseArray = this.moduleFields.map(async (mf) => {
         const pvId = mf.data.component_id_pv_module
         if (!this.material.panel[pvId]) {
-          if (!mf.data.texture_img_url) {
+          if (!mf.pvData.texture_img_url) {
             this.material.panel[pvId] =
               this.material.panel[`default_${this.moduleTextureVersionId}`]
           } else {
-            const texture = await this.loadTextureAsync(mf.data.texture_img_url)
+            const texture = await this.loadTextureAsync(
+              mf.pvData.texture_img_url
+            )
             texture.encoding = THREE.sRGBEncoding
             texture.colorSpace = THREE.SRGBColorSpace
             this.material.panel[pvId] = new THREE.MeshPhongMaterial({

package/src/store/hydrateData.js

@@ -153,8 +153,8 @@ export async function hydratePolygons({
     moduleField.pvData.module_texture_version_id =
       moduleFieldResp.module_texture_version_id
     moduleField.pvData.backsheet_color = moduleFieldResp.backsheet_color
+    moduleField.pvData.texture_img_url = moduleFieldResp.texture_img_url
     moduleField.data = {}
-    moduleField.data.texture_img_url = moduleFieldResp.texture_img_url
     moduleField.data.col_spacing_mm = moduleFieldResp.col_spacing_mm
     moduleField.data.is_row_spacing_automatic =
       moduleFieldResp.is_row_spacing_automatic
@@ -211,7 +211,7 @@ export async function hydratePolygons({
     })
 
     modules.forEach((module) => {
-      const panel = new Polygon(module.outline, '')
+      let panel = new Polygon(module.outline, '')
       panel.id = module.module_uuid
       panel.gridIndex = module.gridIndex
       panel.row_index = module.row_index
@@ -223,12 +223,15 @@ export async function hydratePolygons({
         panel.poolGroupUuidColor = `#${panel.poolGroupUuid.slice(0, 6)}`
       }
       panel.available = true
+
       if (module.is_active) {
         panel.layer = 'panel'
+        panel = updateComputedGeometryPolygon(panel)
         MFpanels.push(panel)
         panels.push(panel)
       } else {
         panel.layer = 'user_deactivated_panel'
+        panel = updateComputedGeometryPolygon(panel)
         MFuserDeactivatedPanels.push(panel)
         userDeactivatedPanels.push(panel)
       }