@eturnity/eturnity_3d 1.0.27 → 1.0.29

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eturnity/eturnity_3d",
   "private": false,
-  "version": "1.0.27",
+  "version": "1.0.29",
   "main": "dist/main.js",
   "scripts": {
     "dev": "vue-cli-service serve --skip-plugins @vue/cli-plugin-eslint",

package/src/components/ThreeCanvasViewer.vue

@@ -54,6 +54,7 @@ export default {
         camera: false
       },
       screenshotable: false
+      areModuleFieldsVisible:false;
     }
   },
   mixins: [renderMixin,threeMixin],

package/src/helper/materials.js

@@ -38,7 +38,7 @@ material.flatRoof = new THREE.MeshPhongMaterial({
     })
 
 material.moduleField = new THREE.MeshLambertMaterial({
-    color: 0xff0000,
+    color: 0x2582be,
     side:THREE.DoubleSide,
 })    
 material.curvedRoof = new THREE.MeshPhongMaterial({

package/src/helper/renderMixin.js

@@ -265,6 +265,7 @@ export default {
       //   }
       // }
       this.renderBuilding()
+      this.renderModuleFields()
       this.renderPanels()
       this.renderRoofsMargin()
     },
@@ -721,11 +722,16 @@ export default {
       this.clearByType('moduleFieldsMeshes')
 
       this.moduleFields.forEach((moduleFieldPolygon) => {
+        if(!moduleFieldPolygon.data.number_of_panels_override && !this.areModuleFieldsVisible )return
         const geometry = getBufferModuleFieldGeometry(moduleFieldPolygon)
         if (geometry) {
           const mesh = new THREE.Mesh(geometry, this.material.moduleField)
           geometry.dispose()
           mesh.matrixAutoUpdate = false
+          mesh.userData.version = moduleFieldPolygon.version
+          mesh.userData.type = 'moduleFieldsMeshes'
+          mesh.userData.meshId = moduleFieldPolygon.id
+          mesh.userData.polygonId = moduleFieldPolygon.id
           this.scene.add(mesh)
           this.meshes.moduleFieldsMeshes[moduleFieldPolygon.id] = mesh
         }
@@ -746,8 +752,8 @@ export default {
     },
     renderPanels() {
       this.clearRemovedOnes('panelsMeshes')
-      //clear UserDeactivatedModules
       Object.values(this.meshes.panelsMeshes).forEach((mesh) => {
+        //clear UserDeactivatedModules
         if (
           this.polygons.find(
             (poly) =>
@@ -757,10 +763,18 @@ export default {
         ) {
           this.clearMesh(mesh)
         }
+        //clear panel on moduleField with overriden number of panel
+        let panel=this.polygons.find(poly=>mesh.userData.polygonId==poly.id)
+        if (
+          !panel || panel.moduleField.data.number_of_panels_override
+        ) {
+          this.clearMesh(mesh)
+        }
       })
 
       this.panels.forEach((panelPolygon) => {
         //definition of the material
+        if(panelPolygon.moduleField.data.number_of_panels_override) return
          let material = this.material.panel['default_'+this.module_texture_version_id]
          if (panelPolygon.moduleField.pvData) {
            let pvId = panelPolygon.moduleField.pvData.id