@eturnity/eturnity_3d 6.34.0 → 6.34.1

package/src/helper/render/base.js

@@ -1,43 +1,46 @@
 import * as THREE from 'three'
-import { getBufferWallGeometry, updateBufferWallGeometry } from './geometryHandler'
+import {
+  getBufferWallGeometry,
+  updateBufferWallGeometry
+} from './geometryHandler'
 export default {
-    methods:{
-      renderBase() {
-        //rendering of walls
-        //this.clearByType('baseMeshes')
-        this.clearRemovedOnes('baseMeshes')
-        let geometry
-        let mesh
-        this.roofs.forEach((roofPolygon) => {
-          //everythime the essencials data are changed, version goes up. we compare polygon version and mesh version to know if we have to rerender
-          if (
-            this.meshes.baseMeshes[roofPolygon.id] &&
-            this.meshes.baseMeshes[roofPolygon.id].userData.version <
-              roofPolygon.version
-          ) {
-            //this.clearMesh(this.meshes.baseMeshes[roofPolygon.id])
-            mesh = this.meshes.baseMeshes[roofPolygon.id]
-            geometry = mesh.geometry
-            geometry = updateBufferWallGeometry(roofPolygon, geometry)
-            mesh.geometry = geometry
-            mesh.updateMatrix()
-          }
-          if (!this.meshes.baseMeshes[roofPolygon.id]) {
-            //create
-            geometry = getBufferWallGeometry(roofPolygon)
-            mesh = new THREE.Mesh(geometry, this.material.wall)
-            mesh.userData.version = roofPolygon.version
-            mesh.userData.type = 'baseMeshes'
-            mesh.userData.meshId = roofPolygon.id
-            mesh.userData.polygonId = roofPolygon.id
-            mesh.matrixAutoUpdate = false
-            mesh.frustumCulled = false
-            //geometry.dispose()
-            //geometry=null
-            this.scene.add(mesh)
-            this.meshes.baseMeshes[roofPolygon.id] = mesh
-          }
-        })
-      },
+  methods: {
+    renderBase() {
+      //rendering of walls
+      //this.clearByType('baseMeshes')
+      this.clearRemovedOnes('baseMeshes')
+      let geometry
+      let mesh
+      this.roofs.forEach((roofPolygon) => {
+        //everythime the essencials data are changed, version goes up. we compare polygon version and mesh version to know if we have to rerender
+        if (
+          this.meshes.baseMeshes[roofPolygon.id] &&
+          this.meshes.baseMeshes[roofPolygon.id].userData.version <
+            roofPolygon.version
+        ) {
+          //this.clearMesh(this.meshes.baseMeshes[roofPolygon.id])
+          mesh = this.meshes.baseMeshes[roofPolygon.id]
+          geometry = mesh.geometry
+          geometry = updateBufferWallGeometry(roofPolygon, geometry)
+          mesh.geometry = geometry
+          mesh.updateMatrix()
+        }
+        if (!this.meshes.baseMeshes[roofPolygon.id]) {
+          //create
+          geometry = getBufferWallGeometry(roofPolygon)
+          mesh = new THREE.Mesh(geometry, this.material.wall)
+          mesh.userData.version = roofPolygon.version
+          mesh.userData.type = 'baseMeshes'
+          mesh.userData.meshId = roofPolygon.id
+          mesh.userData.polygonId = roofPolygon.id
+          mesh.matrixAutoUpdate = false
+          mesh.frustumCulled = false
+          //geometry.dispose()
+          //geometry=null
+          this.scene.add(mesh)
+          this.meshes.baseMeshes[roofPolygon.id] = mesh
+        }
+      })
     }
-}
+  }
+}

package/src/helper/render/clear.js

@@ -1,93 +1,105 @@
 export default {
-    methods:{
-      clearThreeObjects(obj) {
-        while (obj.children.length > 0) {
-          this.clearThreeObjects(obj.children[0])
-          obj.remove(obj.children[0])
-        }
-        if (obj.geometry) obj.geometry.dispose()
-        if (obj.texture) obj.texture.dispose()
-      
-        if (obj.material) {
-          //in case of map, bumpMap, normalMap, envMap ...
-          Object.keys(obj.material).forEach((prop) => {
-            if (!obj.material[prop]) return
-            if (false &&
-              obj.material[prop] !== null &&
-              typeof obj.material[prop].dispose === 'function'
-            )
-              obj.material[prop].dispose()
-          })
-          if(obj.material.dispose) obj.material.dispose()
-        }
-      },
-      clearPanelsFromChangingRoofs(roofIds){
-        const roofs=this.polygons.filter(polygon=>roofIds.includes(polygon.id))
-        roofs.forEach(roof=>roof.moduleFields.forEach(mf=>mf.panels.forEach(panel=>{
-              let meshTop=this.meshes.panelsMeshes[panel.id+'_top']
-              let meshSide=this.meshes.panelsMeshes[panel.id+'_side']
-              if(meshTop || meshSide){
-                this.clearMesh(meshTop)
-                this.clearMesh(meshSide)
-              }
-            })
+  methods: {
+    clearThreeObjects(obj) {
+      while (obj.children.length > 0) {
+        this.clearThreeObjects(obj.children[0])
+        obj.remove(obj.children[0])
+      }
+      if (obj.geometry) obj.geometry.dispose()
+      if (obj.texture) obj.texture.dispose()
+
+      if (obj.material) {
+        //in case of map, bumpMap, normalMap, envMap ...
+        Object.keys(obj.material).forEach((prop) => {
+          if (!obj.material[prop]) return
+          if (
+            false &&
+            obj.material[prop] !== null &&
+            typeof obj.material[prop].dispose === 'function'
           )
+            obj.material[prop].dispose()
+        })
+        if (obj.material.dispose) obj.material.dispose()
+      }
+    },
+    clearPanelsFromChangingRoofs(roofIds) {
+      const roofs = this.polygons.filter((polygon) =>
+        roofIds.includes(polygon.id)
+      )
+      roofs.forEach((roof) =>
+        roof.moduleFields.forEach((mf) =>
+          mf.panels.forEach((panel) => {
+            let meshTop = this.meshes.panelsMeshes[panel.id + '_top']
+            let meshSide = this.meshes.panelsMeshes[panel.id + '_side']
+            if (meshTop || meshSide) {
+              this.clearMesh(meshTop)
+              this.clearMesh(meshSide)
+            }
+          })
         )
-      },
-      clearMesh(mesh) {
-        if (!mesh) return
+      )
+    },
+    clearMesh(mesh) {
+      if (!mesh) {
+        return
+      }
+      this.scene.remove(mesh)
+      if (mesh.geometry && mesh.geometry.dispose) {
+        mesh.geometry.dispose()
+        mesh.geometry = null
+      }
+      if (mesh.texture && mesh.texture.dispose) {
+        mesh.texture.dispose()
+        mesh.texture = null
+      }
+      if (mesh.material && mesh.material.dispose) {
+        mesh.material.dispose()
+        mesh.material = null
+      }
+      if (
+        mesh.userData.meshId &&
+        this.meshes[mesh.userData.type][mesh.userData.meshId]
+      ) {
         this.scene.remove(mesh)
-        if (mesh.geometry && mesh.geometry.dispose) {
-          mesh.geometry.dispose()
-          mesh.geometry = null
+        delete this.meshes[mesh.userData.type][mesh.userData.meshId]
+      } else {
+        this.meshes[mesh.userData.type] = null
+      }
+      mesh = null
+    },
+    clearEdgesRemovedOnes() {
+      Object.values(this.meshes['edgeMeshes']).forEach((mesh) => {
+        if (!this.edgeIds.includes(mesh.userData.edgeId)) {
+          this.clearMesh(mesh)
+        }
+      })
+    },
+    clearNodesRemovedOnes() {
+      Object.values(this.meshes['nodeMeshes']).forEach((mesh) => {
+        if (!this.nodeIds.includes(mesh.userData.nodeId)) {
+          this.clearMesh(mesh)
+        }
+      })
+    },
+    clearRemovedOnes(type) {
+      Object.values(this.meshes[type]).forEach((mesh) => {
+        if (!this.polygonIds.includes(mesh.userData.polygonId)) {
+          this.clearMesh(mesh)
         }
+      })
+    },
+    clearByType(type) {
+      Object.values(this.meshes[type]).forEach((mesh) => {
+        mesh.geometry.dispose()
+        mesh.geometry = null
         if (mesh.material && mesh.material.dispose) {
           mesh.material.dispose()
-          mesh.material = null
         }
-        if (
-          mesh.userData.meshId &&
-          this.meshes[mesh.userData.type][mesh.userData.meshId]
-        ) {
-          delete this.meshes[mesh.userData.type][mesh.userData.meshId]
-        } else {
-          this.meshes[mesh.userData.type] = null
-        }
-        mesh = null
-      },
-      clearEdgesRemovedOnes() {
-        Object.values(this.meshes['edgeMeshes']).forEach((mesh) => {
-          if (!this.edgeIds.includes(mesh.userData.edgeId)) {
-            this.clearMesh(mesh)
-          }
-        })
-      },
-      clearNodesRemovedOnes() {
-        Object.values(this.meshes['nodeMeshes']).forEach((mesh) => {
-          if (!this.nodeIds.includes(mesh.userData.nodeId)) {
-            this.clearMesh(mesh)
-          }
-        })
-      },
-      clearRemovedOnes(type) {
-        Object.values(this.meshes[type]).forEach((mesh) => {
-          if (!this.polygonIds.includes(mesh.userData.polygonId)) {
-            this.clearMesh(mesh)
-          }
-        })
-      },
-      clearByType(type) {
-        Object.values(this.meshes[type]).forEach((mesh) => {
-          mesh.geometry.dispose()
-          mesh.geometry = null
-          if (mesh.material && mesh.material.dispose) {
-            mesh.material.dispose()
-          }
-          mesh.material = null
-          this.scene.remove(mesh)
-        })
-        this.meshes[type] = {}
-        this.renderer.renderLists.dispose()
-      },
+        mesh.material = null
+        this.scene.remove(mesh)
+      })
+      this.meshes[type] = {}
+      this.renderer.renderLists.dispose()
     }
-}
+  }
+}

package/src/helper/render/edge.js

@@ -1,71 +1,65 @@
 import * as THREE from 'three'
 export default {
-    methods:{
-      setCylinderPosition(cylinder,edge){
-        const point_0 = new THREE.Vector3(
-          edge.outline[0].x / 1000,
-          edge.outline[0].y / 1000,
-          edge.outline[0].z / 1000
-        )
-        const point_1 = new THREE.Vector3(
-          edge.outline[1].x / 1000,
-          edge.outline[1].y / 1000,
-          edge.outline[1].z / 1000
-        )
-        
-        const midPoint = point_0.clone().add(point_1).multiplyScalar(0.5)
-        var direction = new THREE.Vector3().subVectors(point_1, point_0)
-        let length = direction.length()
+  methods: {
+    setCylinderPosition(cylinder, edge) {
+      const point_0 = new THREE.Vector3(
+        edge.outline[0].x / 1000,
+        edge.outline[0].y / 1000,
+        edge.outline[0].z / 1000
+      )
+      const point_1 = new THREE.Vector3(
+        edge.outline[1].x / 1000,
+        edge.outline[1].y / 1000,
+        edge.outline[1].z / 1000
+      )
 
-        
-        
+      const midPoint = point_0.clone().add(point_1).multiplyScalar(0.5)
+      var direction = new THREE.Vector3().subVectors(point_1, point_0)
+      let length = direction.length()
 
+      //cylinder.rotation.set(arrow.rotation)
+      var axis = new THREE.Vector3(0, 1, 0)
+      cylinder.quaternion.setFromUnitVectors(
+        axis,
+        direction.clone().normalize()
+      )
+      //cylinder.position.set(new THREE.Vector3().addVectors( pointX, direction.multiplyScalar(0.5) ))
+      cylinder.position.copy(midPoint.clone())
+      let oldLength = cylinder.userData.cylinderLength
+      let newLength = length
+      if (!oldLength || oldLength != 0) {
+        cylinder.scale.set(1, newLength, 1)
+        cylinder.userData.cylinderLength = newLength
+      }
+      cylinder.updateMatrix()
+      return cylinder
+    },
+    renderEdges() {
+      this.clearEdgesRemovedOnes('edgeMeshes')
+      let cylinder
+      //this.clearByType('edgeMeshes')
+      // const material = new THREE.LineBasicMaterial( { color: beamColor,transparent:true,opacity:beamOpacity ,sizeAttenuation: true} );
+      // material.linewidth=5
+      const material = this.material.edge
+      this.edges
+        .filter((edge) => edge.layer == 'roof')
+        .forEach((edge) => {
+          cylinder = this.meshes.edgeMeshes[edge.id]
+          if (cylinder) {
+            //update
+            this.setCylinderPosition(cylinder, edge)
+            //change cylinder length
+          } else {
+            const geometry = new THREE.CylinderGeometry(0.1, 0.1, 1, 6)
+            cylinder = new THREE.Mesh(geometry, material)
+            cylinder = this.setCylinderPosition(cylinder, edge)
 
-        //cylinder.rotation.set(arrow.rotation)
-        var axis = new THREE.Vector3(0, 1, 0)
-        cylinder.quaternion.setFromUnitVectors(
-          axis,
-          direction.clone().normalize()
-        )
-        //cylinder.position.set(new THREE.Vector3().addVectors( pointX, direction.multiplyScalar(0.5) ))
-        cylinder.position.copy(midPoint.clone())
-        let oldLength = cylinder.userData.cylinderLength
-        let newLength = length
-        if (!oldLength || oldLength != 0) {
-          cylinder.scale.set(1, newLength, 1)
-          cylinder.userData.cylinderLength = newLength
-        }
-        cylinder.updateMatrix()
-        return cylinder
-      },
-      renderEdges() {
-        this.clearEdgesRemovedOnes('edgeMeshes')
-        let cylinder
-        //this.clearByType('edgeMeshes')
-        // const material = new THREE.LineBasicMaterial( { color: beamColor,transparent:true,opacity:beamOpacity ,sizeAttenuation: true} );
-        // material.linewidth=5
-        const material = this.material.edge
-        this.edges
-          .filter((edge) => edge.layer == 'roof')
-          .forEach((edge) => {
-            cylinder = this.meshes.edgeMeshes[edge.id]
-            if (cylinder) {
-              //update
-              this.setCylinderPosition(cylinder,edge)
-              //change cylinder length
-            } else {
-         
-              const geometry = new THREE.CylinderGeometry(0.1, 0.1, 1, 6)
-              cylinder = new THREE.Mesh(geometry, material)
-              cylinder=this.setCylinderPosition(cylinder,edge)
-              
-              cylinder.userData.edgeId = edge.id
-              
-              this.meshes.edgeMeshes[edge.id] = cylinder
-              this.scene.add(cylinder)
-  
-            }
-          })
-      },
+            cylinder.userData.edgeId = edge.id
+
+            this.meshes.edgeMeshes[edge.id] = cylinder
+            this.scene.add(cylinder)
+          }
+        })
     }
-}
+  }
+}