@eturnity/eturnity_3d 6.31.1 → 6.32.0

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@eturnity/eturnity_3d",
   "private": false,
-  "version": "6.31.1",
+  "version": "6.32.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.31.1",
+    "@eturnity/eturnity_maths": "6.32.0",
     "axios": "^1.3.2",
     "core-js": "^2.6.12",
     "cors": "^2.8.5",

package/src/config.js

@@ -65,7 +65,7 @@ export const maxMargin=2500
 export const node3DRadius=0.05
 export const beamColor="#ffffff"
 export const node3DColor="white"
-export const beamOpacity=0.3
+export const beamOpacity=0.4
 export const node3dOpacity=0.3
 export const dimMarginColor='#ff000020'
 export const defaultTextureUrl=require('./assets/images/panels/reneSola_Virtus_2_JC320S_24_Bbw.png')

package/src/helper/render/edge.js

@@ -1,6 +1,43 @@
 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()
+
+        
+        
+
+
+        //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
@@ -14,67 +51,16 @@ export default {
             cylinder = this.meshes.edgeMeshes[edge.id]
             if (cylinder) {
               //update
-              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 != 0) {
-                let scaleRatio = newLength / oldLength
-                //let scaleVector=direction.multiplyScalar(scaleRatio-1)
-                cylinder.scale.set(1, newLength, 1)
-                cylinder.userData.cylinderLength = newLength
-              }
-              cylinder.updateMatrix()
+              this.setCylinderPosition(cylinder,edge)
               //change cylinder length
             } else {
-              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()
+         
               const geometry = new THREE.CylinderGeometry(0.1, 0.1, 1, 6)
               cylinder = new THREE.Mesh(geometry, material)
-              cylinder.scale.set(1, length, 1)
-              cylinder.userData.cylinderLength = 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())
-              //cylinder.position.set(edge.outline[0].x/1000, edge.outline[0].y/1000, edge.outline[0].z/1000);
+              cylinder=this.setCylinderPosition(cylinder,edge)
+              
               cylinder.userData.edgeId = edge.id
-              cylinder.matrixAutoUpdate = false
+              
               this.meshes.edgeMeshes[edge.id] = cylinder
               this.scene.add(cylinder)
   

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>

package/dist/css/main.d97599b7.css

@@ -1 +0,0 @@
-#canvas3DContainer,#canvas3DContainer>canvas,.frame[data-v-49199ef8]{width:100%;height:100%}

package/dist/index.html

@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <link href="/css/main.d97599b7.css" rel="stylesheet"><script type="text/javascript" src="/main.js"></script></head>
-  <body>
-    <div id="app"></div>
-    <div id="app2"></div>
-    <div id="app3"></div>
-    
-    <script>
-        console.log(ThreeDLayoutView)
-        const base_url='http://localhost:8080'
-        const geometry={roofs:[],obstacles:[],moduleFields:[],layoutSettings:{}}
-        const specificData={uuid:"d5774a28-d71c-4b1d-81bd-5bb4b57d82b6",view_mode:"top",base_url}
-        new ThreeDLayoutView().mount("#app",geometry,specificData)
-        
-        const specificData2={uuid:"9cc4d524-a5d3-45f5-9247-8995363cecee",view_mode:"street",base_url}
-        new ThreeDLayoutView().mount("#app2",geometry,specificData2)
-
-        const specificData3={uuid:"5b043153-3b34-4fd2-a247-d2816f3d5e6e",view_mode:"ortho",base_url}
-        new ThreeDLayoutView().mount("#app3",geometry,specificData3)
-      </script>
-  </body>
-</html>