bimatter-viewer-react 0.11.3 → 0.11.5

package/lib/{IFCLoader-N1C1bJ4O.js → IFCLoader-CQYQx4TL.js}

@@ -191275,21 +191275,21 @@ var m_ = class {
 	ResetCache(e) {
 		return this.wasmModule.ResetCache(e);
 	}
-}, h_ = 1e4;
-function g_(e) {
+}, h_ = 1e4, g_ = "IfcPhysicalComplexQuantity";
+function __(e) {
 	return !!e && typeof e == "object" && "value" in e;
 }
-function __(e) {
-	let t = g_(e) ? e.value : e;
+function v_(e) {
+	let t = __(e) ? e.value : e;
 	return typeof t == "number" && Number.isFinite(t) ? t : null;
 }
-function v_(e) {
+function y_(e) {
 	return (Array.isArray(e) ? e : [e]).flatMap((e) => {
-		let t = __(e);
+		let t = v_(e);
 		return t === null ? [] : [t];
 	});
 }
-var y_ = class {
+var b_ = class {
 	PropsNames = {
 		aggregates: {
 			name: w,
@@ -191342,14 +191342,14 @@ var y_ = class {
 		let l = await this.getItemPropertiesBatch(e, i), u = /* @__PURE__ */ new Set(), d = /* @__PURE__ */ new Set();
 		for (let e of l.values()) {
 			if (!e) continue;
-			let t = __(e.RelatingPropertyDefinition);
+			let t = v_(e.RelatingPropertyDefinition);
 			t !== null && u.add(t);
-			for (let t of v_(e.RelatedObjects)) d.add(t);
+			for (let t of y_(e.RelatedObjects)) d.add(t);
 		}
 		let f = await this.getItemPropertiesBatch(e, u), p = /* @__PURE__ */ new Set();
 		for (let e of f.values()) if (e) {
-			for (let t of v_(e.HasProperties)) p.add(t);
-			for (let t of v_(e.Quantities)) p.add(t);
+			for (let t of y_(e.HasProperties)) p.add(t);
+			for (let t of y_(e.Quantities)) p.add(t);
 		}
 		await this.getItemPropertiesBatch(e, p);
 		let m = new Set(t);
@@ -191365,7 +191365,7 @@ var y_ = class {
 		for (let t of i) {
 			let r = await this.getItemProperty(e, t);
 			if (r) {
-				let t = __(r.RelatingPropertyDefinition);
+				let t = v_(r.RelatingPropertyDefinition);
 				if (t === null) continue;
 				let n = await this.getPropertySetData(e, t), i = {
 					id: t,
@@ -191381,7 +191381,7 @@ var y_ = class {
 					props: n.HasProperties ? n.HasProperties : n.Quantities ? n.Quantities : [],
 					isQuantities: !!n.Quantities
 				});
-				let a = v_(r.RelatedObjects);
+				let a = y_(r.RelatedObjects);
 				for (let t of a) if (s[t]) s[t].sets ??= [], s[t].sets.push(i);
 				else {
 					let n = await this.getItemProperty(e, t);
@@ -191552,15 +191552,38 @@ var y_ = class {
 	}
 	async readPropertySetItems(e, t) {
 		if (!t) return;
-		let n = v_(t);
+		let n = y_(t);
 		if (n.length === 0) return;
 		let r = await this.getItemPropertiesBatch(e, n), i = [];
-		for (let e of n) {
-			let t = r.get(e);
-			t && i.push(t);
+		for (let t of n) {
+			let n = r.get(t);
+			n && i.push(await this.preparePropertySetItem(e, n));
 		}
 		return i;
 	}
+	async preparePropertySetItem(e, t, n = /* @__PURE__ */ new Set()) {
+		if (!this.isPhysicalComplexQuantity(t)) return t;
+		let r = y_(t.HasQuantities), i = typeof t.expressID == "number" ? t.expressID : void 0;
+		if (i !== void 0) {
+			if (n.has(i)) return {
+				...t,
+				value: []
+			};
+			n.add(i);
+		}
+		let a = await this.getItemPropertiesBatch(e, r), o = [];
+		for (let t of r) {
+			let r = a.get(t);
+			r && o.push(await this.preparePropertySetItem(e, r, n));
+		}
+		return i !== void 0 && n.delete(i), {
+			...t,
+			value: o
+		};
+	}
+	isPhysicalComplexQuantity(e) {
+		return e.type === g_;
+	}
 	async getElementsAssembly(e) {
 		let t = await this.getSpatialTreeChunks(e), n = await this.getSpatialLineMap(e, t), r = await this.parser.GetLineIDsWithType(e, Xl), i = {}, a = [];
 		for (let o = 0; o < r.size(); o++) {
@@ -191586,7 +191609,7 @@ var y_ = class {
 	formatItemProperties(e) {
 		return e && (Object.keys(e).forEach((t) => {
 			let n = e[t];
-			g_(n) ? e[t] = n.value : Array.isArray(n) && (e[t] = n.map((e) => g_(e) ? e.value : e));
+			__(n) ? e[t] = n.value : Array.isArray(n) && (e[t] = n.map((e) => __(e) ? e.value : e));
 		}), e);
 	}
 	async getAllRelDefinesByProps(e) {
@@ -191617,13 +191640,13 @@ var y_ = class {
 		if (a == null) return i;
 		Array.isArray(a) || (a = [a]);
 		for (let t = 0; t < a.length; t++) {
-			let o = __(a[t]);
+			let o = v_(a[t]);
 			if (o === null) continue;
 			let s = (await this.parser.GetLine(e, o, !1, !1))[n.relating];
 			if (s != null) {
 				Array.isArray(s) || (s = [s]);
 				for (let t = 0; t < s.length; t++) {
-					let n = __(s[t]);
+					let n = v_(s[t]);
 					n !== null && i.push(await this.parser.GetLine(e, n, r));
 				}
 			}
@@ -191640,7 +191663,7 @@ var y_ = class {
 		}
 	}
 	getValue(e) {
-		if (g_(e)) return this.getValue(e.value);
+		if (__(e)) return this.getValue(e.value);
 		if (Array.isArray(e)) return e.map((e) => this.getValue(e));
 		if (e && typeof e == "object") {
 			let t = {};
@@ -191743,9 +191766,9 @@ var y_ = class {
 		return this.parser.GetLineIDsWithType(e, Sd).get(0);
 	}
 	saveChunk(e, t, n) {
-		let r = __(n[t.relating]);
+		let r = v_(n[t.relating]);
 		if (r === null) return;
-		let i = v_(n[t.related]);
+		let i = y_(n[t.related]);
 		e[r] == null ? e[r] = i : e[r] = e[r].concat(i);
 	}
 	shouldEmitProgress(e, t) {
@@ -191754,7 +191777,7 @@ var y_ = class {
 };
 //#endregion
 //#region node_modules/three/examples/jsm/utils/BufferGeometryUtils.js
-function b_(e, t = 1e-4) {
+function x_(e, t = 1e-4) {
 	t = Math.max(t, 2 ** -52);
 	let n = {}, r = e.getIndex(), i = e.getAttribute("position"), a = r ? r.count : i.count, o = 0, s = Object.keys(e.attributes), c = {}, l = {}, u = [], d = [
 		"getX",
@@ -191807,10 +191830,10 @@ function b_(e, t = 1e-4) {
 }
 //#endregion
 //#region src/viewer/Loaders/IFCLoader/IfcGrid.ts
-function x_(e) {
+function S_(e) {
 	return !!e && typeof e == "object" && "value" in e;
 }
-var S_ = class {
+var C_ = class {
 	parser;
 	grid;
 	modelID;
@@ -191818,7 +191841,7 @@ var S_ = class {
 		this.parser = e, this.grid = n, this.modelID = t;
 	}
 	getCurValue(e) {
-		return x_(e) ? e.value : e;
+		return S_(e) ? e.value : e;
 	}
 	getNumberValue(e) {
 		let t = Number(this.getCurValue(e));
@@ -191851,7 +191874,7 @@ var S_ = class {
 			let c = this.getNumberValue(i.AxisCurve);
 			if (c === null) continue;
 			let l = await this.parser.GetLine(this.modelID, c), u = l.Points;
-			if (!u || (x_(u) && (u = [l.Points]), !Array.isArray(u))) continue;
+			if (!u || (S_(u) && (u = [l.Points]), !Array.isArray(u))) continue;
 			let d = [];
 			for (let e of u) {
 				let t = this.getNumberValue(e);
@@ -191876,7 +191899,7 @@ var S_ = class {
 			let c = this.getNumberValue(i.AxisCurve);
 			if (c === null) continue;
 			let l = await this.parser.GetLine(this.modelID, c), u = l.Points;
-			if (!u || (x_(u) && (u = [l.Points]), !Array.isArray(u))) continue;
+			if (!u || (S_(u) && (u = [l.Points]), !Array.isArray(u))) continue;
 			let d = [];
 			for (let e of u) {
 				let t = this.getNumberValue(e);
@@ -191909,13 +191932,13 @@ var S_ = class {
 			z: -(this.getScaledCoordinate(c, 1) ?? 0)
 		}, d.points = e, d;
 	}
-}, C_ = 1e-5, w_ = {
+}, w_ = 1e-5, T_ = {
 	b: .55,
 	g: .55,
 	name: -1,
 	opacity: .18,
 	r: .55
-}, T_ = class {
+}, E_ = class {
 	useIfcElemetAssembly = !1;
 	useIfcColors = !1;
 	useIfcSpace = !0;
@@ -191929,7 +191952,7 @@ var S_ = class {
 	chunk = 1e3;
 	maxMeshBytes = 128 * 1024 * 1024;
 	constructor() {
-		this.parser = new m_(), this.parser.SetWasmPath(this._wasmPath, !1), this.propertySerializer = new y_(this.parser);
+		this.parser = new m_(), this.parser.SetWasmPath(this._wasmPath, !1), this.propertySerializer = new b_(this.parser);
 	}
 	getPath = () => {
 		if (/\.wasm$/i.test(this._wasmPath)) return this._wasmPath;
@@ -191948,7 +191971,7 @@ var S_ = class {
 		return this.parser;
 	}
 	set _parser(e) {
-		this.parser = e, this.propertySerializer = new y_(this.parser), this.parserReady = null;
+		this.parser = e, this.propertySerializer = new b_(this.parser), this.parserReady = null;
 	}
 	async loadModel(e, t, n) {
 		await this.initParser(this.getPath), this.setCoordinationMatrix(t);
@@ -192013,7 +192036,7 @@ var S_ = class {
 		}
 		if (console.log("spend to read ifc file: ", Date.now() - r, "ms"), a === -1) return console.error("Model loading error"), !1;
 		try {
-			let e = this.coordinationMatrix?.toArray(), t = new E_(this.parser, a, {
+			let e = this.coordinationMatrix?.toArray(), t = new D_(this.parser, a, {
 				geometryTransformation: e,
 				maxGeometriesPerMesh: this.chunk,
 				maxMeshBytes: this.maxMeshBytes,
@@ -192037,7 +192060,7 @@ var S_ = class {
 			if (!d) throw Error("IFC coordination matrix is not initialized");
 			let f = this.parser.GetLineIDsWithType(a, Cl), p = {};
 			if (f && f.size()) for (let e = 0; e < f.size(); e++) {
-				let t = f.get(e), n = await new S_(this.parser, a, t).init();
+				let t = f.get(e), n = await new C_(this.parser, a, t).init();
 				n && (p[t] = this.transformGridData(n, d));
 			}
 			n?.onPhase?.("properties");
@@ -192145,7 +192168,7 @@ var S_ = class {
 			}
 		};
 	}
-}, E_ = class {
+}, D_ = class {
 	materials = {};
 	elementsAssembly = null;
 	parser;
@@ -192164,7 +192187,7 @@ var S_ = class {
 		let i = this.planGeometryChunks();
 		n && this.planGeometryChunks(i, {
 			isIfcSpace: !0,
-			material: w_,
+			material: T_,
 			types: [Ic]
 		}), this.applyGeometryTransformation();
 		let a = this.createChunkBuilders(i), o = /* @__PURE__ */ new Map(), s = {
@@ -192174,7 +192197,7 @@ var S_ = class {
 		};
 		return this.streamGeometryChunks(a, o, e, {}, s), n && this.streamGeometryChunks(a, o, e, {
 			isIfcSpace: !0,
-			material: w_,
+			material: T_,
 			types: [Ic]
 		}, s), this.createModelDataFromChunks(a, r);
 	}
@@ -192190,7 +192213,7 @@ var S_ = class {
 		};
 		return this.streamDynamicGeometryChunks(r, e, {}, i), t && this.streamDynamicGeometryChunks(r, e, {
 			isIfcSpace: !0,
-			material: w_,
+			material: T_,
 			types: [Ic]
 		}, i), this.flushDynamicGeometryChunks(r, i), {
 			data: {},
@@ -192484,7 +192507,7 @@ var S_ = class {
 		if (!o || c < 3 || !Number.isInteger(c) || o.length !== s.length || r.length !== c || i.length < 3) return null;
 		let l = new e(), u = null;
 		try {
-			l.setAttribute("position", new n(s, 3)), l.setAttribute("normal", new n(o, 3)), l.setAttribute("ids", new a(r, 1)), l.setIndex(new a(this.toUint32Array(i), 1)), u = b_(l, C_);
+			l.setAttribute("position", new n(s, 3)), l.setAttribute("normal", new n(o, 3)), l.setAttribute("ids", new a(r, 1)), l.setIndex(new a(this.toUint32Array(i), 1)), u = x_(l, w_);
 			let e = u.getAttribute("position")?.array, t = u.getAttribute("normal")?.array, c = u.getAttribute("ids")?.array, d = u.getIndex()?.array;
 			return !(e instanceof Float32Array) || !(t instanceof Float32Array) || !c || !d ? null : {
 				ids: this.toUint32Array(c),
@@ -192534,4 +192557,4 @@ var S_ = class {
 	}
 };
 //#endregion
-export { T_ as IFCLoader };
+export { E_ as IFCLoader };

package/lib/Loaders/IFCLoader/PropertySerializer.d.ts

@@ -11,6 +11,7 @@ type IfcLineData = Record<string, IfcRawValue> & {
     Elevation?: BmtPropertyValue;
     GlobalId?: BmtPropertyValue;
     HasProperties?: BmtPropertyRecord[];
+    HasQuantities?: IfcRawValue[];
     LongName?: BmtPropertyValue;
     Name?: BmtPropertyValue;
     ObjectType?: BmtPropertyValue;
@@ -62,6 +63,8 @@ export declare class PropertySerializer {
     private clearPropertyCaches;
     private getPropertySetData;
     private readPropertySetItems;
+    private preparePropertySetItem;
+    private isPhysicalComplexQuantity;
     getElementsAssembly(modelID: number): Promise<IfcElementsAssembly>;
     private formatItemProperties;
     private getAllRelDefinesByProps;