@eturnity/eturnity_3d 6.30.0 → 6.31.0

package/dist/vite.svg

@@ -0,0 +1 @@
+<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="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@eturnity/eturnity_3d",
   "private": false,
-  "version": "6.30.0",
+  "version": "6.31.0",
   "main": "dist/main.js",
   "scripts": {
     "dev": "vue-cli-service serve --skip-plugins @vue/cli-plugin-eslint",
     "build": "vue-cli-service build --skip-plugins @vue/cli-plugin-eslint"
   },
   "dependencies": {
-    "@eturnity/eturnity_maths": "6.29.0",
+    "@eturnity/eturnity_maths": "6.31.0",
     "axios": "^1.3.2",
     "core-js": "^2.6.12",
     "cors": "^2.8.5",

package/src/helper/materials.js

@@ -25,6 +25,7 @@ material.panel={}
         material.panel['default_'+k] = new THREE.MeshBasicMaterial({
             map: texture,
             side: THREE.DoubleSide,
+            transparent: true
         })
     }
 
@@ -45,7 +46,7 @@ material.moduleField = new THREE.MeshPhongMaterial({
         flatShading: true,
         side:THREE.DoubleSide,
         transparent:true,
-        opacity:0.8
+        opacity:0.6
 })    
 material.curvedRoof = new THREE.MeshPhongMaterial({
         color: 0xffff00,

package/src/helper/render/loader.js

@@ -12,7 +12,8 @@ export default {
               let texture = this.loader.load(component.texture_img_url)
               this.material.panel[pvId] = new THREE.MeshBasicMaterial({
                 map: texture,
-                side: THREE.DoubleSide
+                side: THREE.DoubleSide,
+                transparent: true
               })
             }
           }
@@ -29,7 +30,8 @@ export default {
               let texture = await this.loader.load(mf.data.texture_img_url)
               this.material.panel[pvId] = new THREE.MeshBasicMaterial({
                 map: texture,
-                side: THREE.DoubleSide
+                side: THREE.DoubleSide,
+                transparent: true
               })
             }
           }

package/src/helper/render/panel.js

@@ -33,6 +33,8 @@ export default {
           //definition of the material
           if(panelPolygon.moduleField.data.number_of_panels_override) return
            let material = this.material.panel['default_'+this.moduleTextureVersionId]
+           material.transparent=true
+           material.opacity=this.panelOpacity
            if (panelPolygon.moduleField.pvData) {
              let pvId = panelPolygon.moduleField.pvData.id
              if (this.material.panel[pvId]) {

package/src/helper/renderMixin.js

@@ -48,7 +48,9 @@ export default {
         state.threeDModule.moduleTextureVersionId,
       wallColor: (state) => state.threeDModule.wallColor,
       selectedMapLayer: (state) => state.threeDModule.selectedMapLayer,
+      panelOpacity: (state) => state.threeDModule.panelOpacity,
       pvDataMemo: (state) => state.threeDModule.pvDataMemo
+
     }),
     ...mapGetters({
       selectedTool: 'getSelectedTool',
@@ -148,6 +150,7 @@ export default {
         case 'newModuleField':
         case 'reactivatePanel':
         case 'deactivatePanels': //params.panels
+        case 'changePanelOpacity':
           methodList.push({
             name: 'renderPanels',
             method: this.renderPanels,

package/src/store/three-d-module.js

@@ -32,6 +32,7 @@ const init_state = {
   mountingDataMemo:[],
   moduleTextureVersionId:0,
   wallColor:'#454545',
+  panelOpacity:1,
   selectedMapLayer:null,
   globalProjectProperties: [],
 }