rm-graphical-computing 1.0.54 → 1.0.56

package/dist/index.js

@@ -1566,7 +1566,7 @@ var De = async (t, n, r, i) => {
 	let l = 0, u = [], d = [], f = [], p = [], m = .2;
 	for (let i = 0; i < t.length; i++) {
 		let a = t[i];
-		if (a.doorAndBeamData = [], !a.mergeCheckRegion || a.mergeCheckRegion.length == 0) continue;
+		if (a.noDetection || (a.doorAndBeamData = [], !a.mergeCheckRegion || a.mergeCheckRegion.length == 0)) continue;
 		a.completePointAreaPercentage = -1;
 		let o = new e.Box3();
 		o.setFromPoints(a.originalPoints);
@@ -1646,7 +1646,7 @@ var De = async (t, n, r, i) => {
 										}
 									}
 								}
-								if (i == 33 && console.log("1", u, f, a.length - b), u != Infinity && u < 2 && a.length - b > .2 && u < b * 3) t[d].length > .25 && b + u > .5 && (F = !0, n < c ? (A = A.addScaledVector(s, u), M = M.addScaledVector(s, u)) : (k = k.addScaledVector(s, u), P = P.addScaledVector(s, u)));
+								if (u != Infinity && u < 2 && a.length - b > .2 && u < b * 3) t[d].length > .25 && b + u > .5 && (F = !0, n < c ? (A = A.addScaledVector(s, u), M = M.addScaledVector(s, u)) : (k = k.addScaledVector(s, u), P = P.addScaledVector(s, u)));
 								else if (!f && !p && a.length - b > .1) continue;
 							} else continue;
 						}
@@ -1681,7 +1681,7 @@ var De = async (t, n, r, i) => {
 										}
 									}
 								}
-								if (i == 33 && console.log("2", u, f), u != Infinity && u < 2 && a.length - b > .2 && u < b * 3) t[d].length > .25 && b + u > .5 && (F = !0, o < c ? (A = A.addScaledVector(s, u), M = M.addScaledVector(s, u)) : (k = k.addScaledVector(s, u), P = P.addScaledVector(s, u)));
+								if (u != Infinity && u < 2 && a.length - b > .2 && u < b * 3) t[d].length > .25 && b + u > .5 && (F = !0, o < c ? (A = A.addScaledVector(s, u), M = M.addScaledVector(s, u)) : (k = k.addScaledVector(s, u), P = P.addScaledVector(s, u)));
 								else if (!f && !p && a.length - b > .1) continue;
 							} else continue;
 						}
@@ -4110,11 +4110,12 @@ var Kn = (t) => {
 			datas: [p]
 		});
 	}
+	let i = -Infinity;
 	if (r.size > 0) {
 		let e = [];
 		for (let [t, n] of r.entries()) {
-			let { num: t, datas: r } = n;
-			t > 3e3 && e.push(...r);
+			let { num: r, datas: a } = n;
+			r > 3e3 && (t > i && (i = t), e.push(...a));
 		}
 		for (let t = 0; t < n.length; t++) if (n[t].type == "floor") {
 			n[t].array = e;
@@ -4122,27 +4123,29 @@ var Kn = (t) => {
 		}
 	}
 	for (let e = 0; e < n.length; e++) {
-		let t = n[e].array, r = [], i = [];
+		let t = n[e].array, r = [], a = [];
 		for (let e = 0; e < t.length; e++) {
 			if (t[e].obb == null || r.includes(e)) continue;
 			let n = {
 				...t[e],
 				obb: t[e].obb.clone()
 			};
-			for (let i = e + 1; i < t.length; i++) if (!(t[i].obb == null || r.includes(i)) && n.obb.intersectsOBB(t[i].obb)) {
-				r.push(i), n.points.push(...t[i].points), n.path = gt(n.points.map((e) => [e.x, e.y]));
-				let a = Wn(n.points);
-				n.h = a.h, n.minz = a.minz, n.maxz = a.maxz, n.center = {
-					x: a.x,
-					y: a.y,
-					z: a.z
-				}, n.obb = Gn(n.path, n.center, n.h, (n.maxz + n.minz) / 2), n.positionArr.push(...t[i].positionArr), i = e;
+			for (let a = e + 1; a < t.length; a++) if (!(t[a].obb == null || r.includes(a)) && n.obb.intersectsOBB(t[a].obb)) {
+				r.push(a);
+				for (let e = 0; e < t[a].points.length; e++) (t[a].points[e].z > i && t[a].points[e].z - i > .1 || n.type == "floor") && n.points.push(t[a].points[e]);
+				n.path = gt(n.points.map((e) => [e.x, e.y]));
+				let o = Wn(n.points);
+				n.h = o.h, n.minz = o.minz, n.maxz = o.maxz, n.center = {
+					x: o.x,
+					y: o.y,
+					z: o.z
+				}, n.obb = Gn(n.path, n.center, n.h, (n.maxz + n.minz) / 2), n.positionArr.push(...t[a].positionArr), a = e;
 			}
-			n.path.length > t[e].path.length && (r.push(e), i.push(n));
+			n.path.length > t[e].path.length && (r.push(e), a.push(n));
 		}
-		let a = [];
-		for (let e = 0; e < t.length; e++) r.includes(e) || a.push(t[e]);
-		a.push(...i), n[e].array = a;
+		let o = [];
+		for (let e = 0; e < t.length; e++) r.includes(e) || o.push(t[e]);
+		o.push(...a), n[e].array = o;
 	}
 	for (let t = 0; t < n.length; t++) {
 		let r = n[t].type;
@@ -4258,25 +4261,7 @@ var Kn = (t) => {
 		}
 	}
 	for (let e = 0; e < n.length; e++) n[e].array = n[e].array.filter((e) => !e.isDel);
-	let i = [];
-	for (let t = 0; t < n.length; t++) {
-		let r = n[t].array;
-		for (let t = 0; t < r.length; t++) i.push({
-			obbBox: r[t].obb,
-			box: new e.Box3().setFromPoints(r[t].points),
-			category: r[t].type,
-			center: {
-				x: r[t].center.x,
-				y: r[t].center.y,
-				z: (r[t].minz + r[t].maxz) / 2
-			},
-			name: r[t].obj_id,
-			obj_id: r[t].obj_id,
-			pcdPoints: r[t].points,
-			positionArr: r[t].positionArr
-		});
-	}
-	return i;
+	return n;
 };
 //#endregion
 //#region src/wall-window-matcher/utils.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rm-graphical-computing",
-  "version": "1.0.54",
+  "version": "1.0.56",
   "description": "Three.js wall segment processing utilities.",
   "main": "dist/index.cjs",
   "module": "dist/index.js",