@eturnity/eturnity_maths 6.32.0 → 6.33.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eturnity/eturnity_maths",
-  "version": "6.32.0",
+  "version": "6.33.0",
   "author": "Eturnity Team",
   "main": "src/index.js",
   "private": false,

package/src/objects/derivedState/updateComputedGeometryPolygon.js

@@ -21,7 +21,7 @@ export function updateComputedGeometryState(state) {
   })
   return state
 }
-export function updateOutlineFromInclineDirection(incline, direction, outline,initialAverageHeight) {
+export function updateOutlineFromInclineDirection(incline, direction, outline,initialAverageHeight,isRoofOnRoof = false) {
   const newNormalVector = {}
   newNormalVector.x =
     Math.sin((incline * Math.PI) / 180) * Math.sin((direction * Math.PI) / 180)
@@ -29,14 +29,21 @@ export function updateOutlineFromInclineDirection(incline, direction, outline,in
     Math.sin((incline * Math.PI) / 180) * Math.cos((direction * Math.PI) / 180)
   newNormalVector.z = Math.cos((incline * Math.PI) / 180)
   let meanPoint = meanVector(outline)
-  let minAltitude=Math.min(...outline.map(p=>p.z))
   meanPoint.z=initialAverageHeight
   let newOutline = outline.map((p) => {
     return verticalProjectionOnPlane(p, newNormalVector, meanPoint)
   })
   //if some points are with negative altitude, we offset the whole roof
-  const newMinAltitude = Math.min(...newOutline.map((p) => p.z))
-  let altitudeOffset=newMinAltitude-minAltitude
+  let altitudeOffset
+  let minAltitude=Math.min(...outline.map(p=>p.z))
+  let maxAltitude=Math.max(...outline.map(p=>p.z))
+  let newMinAltitude = Math.min(...newOutline.map((p) => p.z))
+  let newMaxAltitude = Math.max(...newOutline.map((p) => p.z))
+  if(isRoofOnRoof && maxAltitude!=0){
+    altitudeOffset=newMaxAltitude-maxAltitude
+  }else{
+    altitudeOffset=newMinAltitude-minAltitude
+  }
   newOutline.forEach((p) => (p.z -= altitudeOffset))
   
   //if some points are with altitude>50000, we limit those points