@eturnity/eturnity_3d 6.46.3 → 6.48.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eturnity/eturnity_3d",
   "private": false,
-  "version": "6.46.3",
+  "version": "6.48.0",
   "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": "6.46.0",
+    "@eturnity/eturnity_maths": "6.48.0",
     "axios": "^1.3.2",
     "core-js": "^2.6.12",
     "cors": "^2.8.5",
@@ -74,4 +74,4 @@
     "> 1%",
     "last 2 versions"
   ]
-}
+}

package/src/components/ThreeCanvasViewer.vue

@@ -61,11 +61,13 @@ export default {
       },
       screenshotable: false,
       areModuleFieldsVisible: false,
-      intervalId: null
+      intervalId: null,
+      requestAnimationFrameId: null,
     }
   },
   beforeDestroy() {
     clearInterval(this.intervalId)
+    cancelAnimationFrame(this.requestAnimationFrameId)
   },
   mixins: [renderMixin, threeMixin, materialMixin],
   async mounted() {
@@ -286,7 +288,7 @@ export default {
     },
     animate() {
       this.render()
-      requestAnimationFrame(this.animate)
+      this.requestAnimationFrameId = requestAnimationFrame(this.animate)
     },
     render() {
       this.renderer.clear()

package/src/helper/UpdateRoofModuleFieldRelations.js

@@ -33,9 +33,9 @@ export function UpdateRoofModuleFieldRelations(state) {
     //check if everypoint is in the same roof and if they are not too far from the flat surface.(at least above)
     let roofPolygonCandidates = roofPolygons.filter((roof) => {
       const intersection = intersectOutlines(moduleField.outline, roof.outline)
-      if (intersection.length == 0) return false
+            if (intersection.length == 0) return false
       const intersectionArea = calculateArea(intersection[0])
-      return intersectionArea > 100
+      return intersectionArea > 100 && moduleField.area <= roof.area
     })
     //roofs on roof can lead to multiple roof under a point. moduleField is on the smallest
     let smallestRoof = null
@@ -46,7 +46,6 @@ export function UpdateRoofModuleFieldRelations(state) {
     }
     let roofPolygon = smallestRoof
     if (!roofPolygon) {
-      //no roof found under first node of moduleField => moduleField will be deleted
       continue
     }
     roofPolygon.moduleFields.push(moduleField)

package/src/helper/cameraMixin.js

@@ -76,14 +76,11 @@ export default {
       }
     },
     setTweenTo(position, target) {
+      TWEEN.removeAll()
       if (this.orbitControl) {
         this.tweenOrbit = new TWEEN.Tween(this.orbitControl.target)
           .to({ x: target[0], y: target[1], z: target[2] }, 2000)
           .easing(TWEEN.Easing.Sinusoidal.Out)
-          .onUpdate(() => {
-            if (this.orbitControl && this.orbitControl.update)
-              this.orbitControl.update()
-          })
           .start()
       }
       if (this.camera) {
@@ -97,5 +94,8 @@ export default {
           .start()
       }
     }
+  },
+  beforeDestroy(){
+    TWEEN.removeAll()
   }
 }