@eturnity/eturnity_3d 7.10.0 → 7.10.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eturnity/eturnity_3d",
   "private": false,
-  "version": "7.10.0",
+  "version": "7.10.1",
   "main": "dist/main.js",
   "scripts": {
     "dev": "vue-cli-service serve --skip-plugins @vue/cli-plugin-eslint",
@@ -10,7 +10,7 @@
     "prettier": "prettier --write \"**/*.{js,vue}\""
   },
   "dependencies": {
-    "@eturnity/eturnity_maths": "7.10.0",
+    "@eturnity/eturnity_maths": "7.10.2",
     "core-js": "^2.6.12",
     "cors": "^2.8.5",
     "earcut": "^2.2.4",
@@ -73,4 +73,4 @@
     "> 1%",
     "last 2 versions"
   ]
-}
+}

package/src/helper/render/geometryHandler.js

@@ -80,7 +80,6 @@ export function updateBufferRoofGeometry(
     return null
   }
   const vertices = new Float32Array(triangleVertices)
-  // itemSize = 3 because there are 3 values (components) per vertex
   if (
     geometry.attributes.position &&
     geometry.attributes.position.array.length >= vertices.length
@@ -98,6 +97,7 @@ export function updateBufferRoofGeometry(
   geometry.setDrawRange(0, vertices.length / 3)
   geometry.attributes.position.needsUpdate = true
   geometry.computeVertexNormals()
+  geometry.needsUpdate = true
   return geometry
 }
 
@@ -458,7 +458,7 @@ export function getBufferImageOverlayGeometry(corners) {
   geometry.computeVertexNormals()
   return geometry
 }
-export function getBufferPanelGeometry(panelPolygon) {
+export function getPanelOutlineWithHeightOffset(panelPolygon) {
   let panelNormalVector = getNormalVectorFrom3Points(
     panelPolygon.outline[0],
     panelPolygon.outline[1],
@@ -471,15 +471,19 @@ export function getBufferPanelGeometry(panelPolygon) {
   //get lowest verticalProjection
 
   const panelOutlineTop = []
-  const geometry = new THREE.BufferGeometry()
-  //Calcul of triangles using cutear algo
-  const trianglesVertices = []
   panelPolygon.outline.forEach((p) => {
     const vectorFromBottomToTop = multiplyVector(panelHeight, panelNormalVector)
     let p_up_0 = addVector(p, vectorFromBottomToTop)
 
     panelOutlineTop.push(p_up_0)
   })
+  return panelOutlineTop
+}
+export function getBufferPanelGeometry(panelPolygon) {
+  const geometry = new THREE.BufferGeometry()
+  //Calcul of triangles using cutear algo
+  const trianglesVertices = []
+  const panelOutlineTop = getPanelOutlineWithHeightOffset(panelPolygon)
   trianglesVertices.push(...getTriangleVerticesFromOutline(panelOutlineTop))
 
   if (hasNaN(trianglesVertices)) {
@@ -514,41 +518,22 @@ export function getBufferPanelGeometry(panelPolygon) {
   return geometry
 }
 export function updateBufferPanelGeometry(panelPolygon, geometry) {
-  geometry = updateBufferRoofGeometry(panelPolygon.outline, [], geometry)
+  const panelOutlineTop = getPanelOutlineWithHeightOffset(panelPolygon)
+  geometry = updateBufferRoofGeometry(panelOutlineTop, [], geometry)
   return geometry
 }
 
-export function updateBufferPanelSideGeometry(panelPolygon, geometry) {
-  geometry = updateBufferRoofGeometry(panelPolygon.outline, [], geometry)
-  return geometry
-}
-export function getBufferPanelSideGeometry(panelPolygon) {
-  let panelNormalVector = getNormalVectorFrom3Points(
-    panelPolygon.outline[0],
-    panelPolygon.outline[1],
-    panelPolygon.outline[2]
-  )
-  if (panelNormalVector.z < 0) {
-    panelNormalVector = multiplyVector(-1, panelNormalVector)
-  }
-  const roofPolygon = panelPolygon.roof
-  const panelHeight = parseInt(panelPolygon.height || 50)
-  // const normalVector = roofPolygon.normalVector
-  // const passByPoint = roofPolygon.flatOutline[0]
-
-  const geometry = new THREE.BufferGeometry()
-  //Calcul of triangles using cutear algo
-  const panelLength = panelPolygon.outline.length
-  const trianglesVertices = []
-  const panelOutlineTop = []
-  panelPolygon.outline.forEach((p, index) => {
+export function getTriangleVerticesForSidePanels(outlineBottom, outlineUp) {
+  const triangleVertices = []
+  const length = outlineBottom.length
+  for (let index = 0; index < length; index++) {
     //const vectorFromBottomToTop=multiplyVector(obstacleHeight,{normalVector})
-    const p_bottom_0 = p
-    const p_bottom_1 = panelPolygon.outline[(index + 1) % panelLength]
-    const vectorFromBottomToTop = multiplyVector(panelHeight, panelNormalVector)
-    let p_up_0 = addVector(p_bottom_0, vectorFromBottomToTop)
-    let p_up_1 = addVector(p_bottom_1, vectorFromBottomToTop)
-    trianglesVertices.push(
+    const nextIndex = (index + 1) % length
+    const p_bottom_0 = outlineBottom[index]
+    const p_bottom_1 = outlineBottom[nextIndex]
+    let p_up_0 = outlineUp[index]
+    let p_up_1 = outlineUp[nextIndex]
+    triangleVertices.push(
       ...[
         p_up_0.x / 1000,
         p_up_0.y / 1000,
@@ -570,7 +555,49 @@ export function getBufferPanelSideGeometry(panelPolygon) {
         p_bottom_1.z / 1000
       ]
     )
-  })
+  }
+  return triangleVertices
+}
+export function updateBufferPanelSideGeometry(panelPolygon, geometry) {
+  const panelOutlineTop = getPanelOutlineWithHeightOffset(panelPolygon)
+  const triangleVertices = getTriangleVerticesForSidePanels(
+    panelPolygon.outline,
+    panelOutlineTop
+  )
+  
+  if (hasNaN(triangleVertices)) {
+    return null
+  }
+  const vertices = new Float32Array(triangleVertices)
+  if (
+    geometry.attributes.position &&
+    geometry.attributes.position.array.length >= vertices.length
+  ) {
+    let positions = geometry.attributes.position.array
+    for (let k in vertices) {
+      positions[k] = vertices[k]
+    }
+  } else {
+    geometry.dispose()
+    geometry = null
+    geometry = new THREE.BufferGeometry()
+    geometry.setAttribute('position', new THREE.BufferAttribute(vertices, 3))
+  }
+  geometry.setDrawRange(0, vertices.length / 3)
+  geometry.attributes.position.needsUpdate = true
+  geometry.computeVertexNormals()
+  geometry.needsUpdate = true
+ 
+  return geometry
+}
+export function getBufferPanelSideGeometry(panelPolygon) {
+  const panelOutlineTop = getPanelOutlineWithHeightOffset(panelPolygon)
+  const geometry = new THREE.BufferGeometry()
+  //Calcul of triangles using cutear algo
+  const trianglesVertices = getTriangleVerticesForSidePanels(
+    panelPolygon.outline,
+    panelOutlineTop
+  )
   if (hasNaN(trianglesVertices)) {
     return null
   }

package/src/helper/render/mergedGeometry.js

@@ -15,10 +15,9 @@ export default {
 
         if (geometry.attributes.uv) {
           const uvs = geometry.attributes.uv.array
-          mergedUvs.push(...uvs)
+          mergedUvs.push(...uvs.slice(0, 3 * geometry.drawRange.count))
         }
       })
-
       //position
       if (
         mergedGeometry.attributes.position &&

package/src/helper/render/panel.js

@@ -67,7 +67,7 @@ export default {
           return ['panel', 'user_deactivated_panel'].includes(polygon.layer)
         })
       }
-      panels.forEach((panelPolygon) => {
+        panels.forEach((panelPolygon) => {
         //for each visible panels
         //1. define materialId and material
         //2. create or update individual meshes
@@ -95,7 +95,7 @@ export default {
 
           materialId = 'default_' + moduleTextureId
           material = this.material.panel[materialId]
-          
+
           if (panelPolygon.moduleField.data) {
             if (
               this.material.panel[
@@ -115,67 +115,74 @@ export default {
           material.opacity = this.panelOpacity
         }
         //2. create or update individual meshes
-        if (
-          !this.meshes.panelsMeshes[panelPolygon.id + '_top'] ||
-          !this.meshes.panelsMeshes[panelPolygon.id + '_side']
-        ) {
-          //mesh creation
-          const geometry = getBufferPanelGeometry(panelPolygon)
-          const geometrySide = getBufferPanelSideGeometry(panelPolygon)
-          //2a.Fill in panelTopGeometries & panelSideGeometries
+        //update existing geometry
+        if (this.meshes.panelsMeshes[panelPolygon.id + '_top']) {
+          const topMesh = this.meshes.panelsMeshes[panelPolygon.id + '_top']
+          if (panelPolygon.version > topMesh.userData.version) {
+            let topGeometry = updateBufferPanelGeometry(
+              panelPolygon,
+              topMesh.geometry
+            )
+            topMesh.geometry = topGeometry
+          }
+
+          if (!panelTopGeometries[materialId]) {
+            panelTopGeometries[materialId] = []
+          }
+          panelTopGeometries[materialId].push(topMesh.geometry)
+          topMesh.material = material
+        }
+        if (this.meshes.panelsMeshes[panelPolygon.id + '_side']) {
+          const sideMesh = this.meshes.panelsMeshes[panelPolygon.id + '_side']
+          if (panelPolygon.version > sideMesh.userData.version) {
+            let sideGeometry = updateBufferPanelSideGeometry(
+              panelPolygon,
+              sideMesh.geometry
+            )
+            sideMesh.geometry = sideGeometry
+          }
+          if (panelPolygon.layer != 'user_deactivated_panel') {
+            panelSideGeometries.push(sideMesh.geometry)
+          }
+        }
+        //2a.Fill in panelTopGeometries & panelSideGeometries
+        //mesh creation
+        if (!this.meshes.panelsMeshes[panelPolygon.id + '_top']) {
           //gather all geometry with similar material together to merge them for faster rendering
+          const geometry = getBufferPanelGeometry(panelPolygon)
           if (!panelTopGeometries[materialId]) {
             panelTopGeometries[materialId] = []
           }
           panelTopGeometries[materialId].push(geometry)
+          if (geometry) {
+            const mesh = new THREE.Mesh(geometry, this.material.hidden)
+            mesh.userData.version = panelPolygon.version
+            mesh.userData.type = 'panelsMeshes'
+            mesh.userData.meshId = panelPolygon.id + '_top'
+            mesh.userData.polygonId = panelPolygon.id
+            //this.scene.add(mesh)
+            mesh.matrixAutoUpdate = false
+            this.meshes.panelsMeshes[panelPolygon.id + '_top'] = mesh
+          }
+        }
+        if (!this.meshes.panelsMeshes[panelPolygon.id + '_side']) {
+          //sidemesh creation
+          const geometrySide = getBufferPanelSideGeometry(panelPolygon)
           if (panelPolygon.layer != 'user_deactivated_panel') {
             panelSideGeometries.push(geometrySide)
           }
-          if (geometry && geometrySide) {
-            const mesh = new THREE.Mesh(geometry, this.material.hidden)
+          if (geometrySide) {
             const meshSide = new THREE.Mesh(
               geometrySide,
               this.material.panelSide
             )
-            mesh.userData.version = panelPolygon.version
-            mesh.userData.type = 'panelsMeshes'
-            mesh.userData.meshId = panelPolygon.id + '_top'
-            mesh.userData.polygonId = panelPolygon.id
-            this.scene.add(mesh)
             meshSide.userData.version = panelPolygon.version
             meshSide.userData.type = 'panelsMeshes'
             meshSide.userData.meshId = panelPolygon.id + '_side'
             meshSide.userData.polygonId = panelPolygon.id
-            mesh.matrixAutoUpdate = false
             meshSide.matrixAutoUpdate = false
-            this.meshes.panelsMeshes[panelPolygon.id + '_top'] = mesh
             this.meshes.panelsMeshes[panelPolygon.id + '_side'] = meshSide
           }
-        } else {
-          //update existing geometry
-          const topMesh = this.meshes.panelsMeshes[panelPolygon.id + '_top']
-          const sideMesh = this.meshes.panelsMeshes[panelPolygon.id + '_side']
-          if (panelPolygon.version > topMesh.userData.version) {
-            let topGeometry = updateBufferPanelGeometry(
-              panelPolygon,
-              topMesh.geometry
-            )
-            let sideGeometry = updateBufferPanelSideGeometry(
-              panelPolygon,
-              sideMesh.geometry
-            )
-
-            topMesh.geometry = topGeometry
-            sideMesh.geometry = sideGeometry
-          }
-          if (panelPolygon.layer != 'user_deactivated_panel') {
-            panelSideGeometries.push(sideMesh.geometry)
-          }
-          if (!panelTopGeometries[materialId]) {
-            panelTopGeometries[materialId] = []
-          }
-          panelTopGeometries[materialId].push(topMesh.geometry)
-          topMesh.material = material
         }
       })
 
@@ -186,7 +193,10 @@ export default {
       )
       //if no panels, no materialIds,
       for (let materialId of materialIdsToRemove) {
-        this.clearMeshFromScene(this.mergedPanelTopMeshes[materialId], this.scene)
+        this.clearMeshFromScene(
+          this.mergedPanelTopMeshes[materialId],
+          this.scene
+        )
         delete this.mergedPanelTopMeshes[materialId]
       }
       this.mergedPanelSideMesh = this.updateOrCreateMergedMesh(
@@ -202,6 +212,7 @@ export default {
           this.material.panel[key],
           'panelTop_' + key
         )
+        this.mergedPanelTopMeshes[key].renderOrder = 10
       }
       if (this.arePanelVisible) {
         this.showPanels()