gltf-parser-plugin 1.1.9 → 1.1.10

package/build/gltf-parser-plugin.module.js

@@ -393,44 +393,48 @@ var MeshCollector = class extends EventDispatcher {
 //#endregion
 //#region src/plugin/style-condition-eval.ts
 /**
-* 与 StyleHelper 中 `show`、`conditions` 条件项的表达式求值一致
-* 在 propertyData 的键作为变量名的上下文中执行 `Boolean(expr)`
-*
-* 实现：对每个表达式字符串只编译一次 `new Function('data', 'with(d){...}')`，
-* 避免按「表达式 × 属性键集合」重复编译，也避免每次求值排序/拼接 cacheKey。
+* 编译单个表达式；失败返回 null（无模块级缓存）
 */
-var compiledCache = /* @__PURE__ */ new Map();
-var MAX_CACHE_ENTRIES = 512;
-function getCompiled(expr) {
-	let fn = compiledCache.get(expr);
-	if (fn) return fn;
+function compileStyleCondition(expr) {
+	const trimmed = expr.trim();
+	if (!trimmed) return null;
 	try {
-		fn = new Function("data", `var d = data != null && typeof data === "object" ? data : {};
-with (d) { return Boolean(${expr}); }`);
+		return new Function("data", `var d = data != null && typeof data === "object" ? data : {};
+with (d) { return Boolean(${trimmed}); }`);
 	} catch {
 		return null;
 	}
-	if (compiledCache.size >= MAX_CACHE_ENTRIES) {
-		const first = compiledCache.keys().next().value;
-		if (first !== void 0) compiledCache.delete(first);
-	}
-	compiledCache.set(expr, fn);
-	return fn;
 }
 /**
-* 清空表达式编译缓存（热更新或单测可调用）
+* 遍历 style 的 show 与 conditions，对每个出现过的字符串表达式只编译一次
 */
-function clearStyleConditionCache() {
-	compiledCache.clear();
+function buildStyleConditionEvaluatorMap(config) {
+	const strings = /* @__PURE__ */ new Set();
+	if (config.show?.trim()) strings.add(config.show.trim());
+	for (const [cond] of config.conditions ?? []) if (typeof cond === "string" && cond.trim()) strings.add(cond.trim());
+	const map = /* @__PURE__ */ new Map();
+	for (const s of strings) {
+		const fn = compileStyleCondition(s);
+		if (fn) map.set(s, fn);
+	}
+	return map;
 }
-function evaluateStyleCondition(expr, propertyData) {
+function evaluateStyleCondition(expr, propertyData, evaluators) {
 	if (expr === true) return true;
 	if (expr === false) return false;
 	if (typeof expr !== "string" || !expr.trim()) return true;
-	const fn = getCompiled(expr.trim());
+	const trimmed = expr.trim();
+	const data = propertyData ?? {};
+	const fromMap = evaluators?.get(trimmed);
+	if (fromMap) try {
+		return fromMap(data);
+	} catch {
+		return false;
+	}
+	const fn = compileStyleCondition(trimmed);
 	if (!fn) return false;
 	try {
-		return fn(propertyData ?? {});
+		return fn(data);
 	} catch {
 		return false;
 	}
@@ -2625,6 +2629,36 @@ var PartFrameHelper = class {
 };
 //#endregion
 //#region src/plugin/style-appearance-shared.ts
+var fnIdentitySeq = /* @__PURE__ */ new WeakMap();
+var fnIdentityNext = 1;
+function styleFnIdentity(fn) {
+	let id = fnIdentitySeq.get(fn);
+	if (id === void 0) {
+		id = fnIdentityNext++;
+		fnIdentitySeq.set(fn, id);
+	}
+	return id;
+}
+/** 从构件材质提取贴图，供 material 回调使用 */
+function extractStyleMaterialMaps(material) {
+	const m = material;
+	const tex = (key) => {
+		const v = m[key];
+		return v && typeof v === "object" && "isTexture" in v && v.isTexture ? v : null;
+	};
+	return {
+		map: tex("map"),
+		normalMap: tex("normalMap"),
+		metalnessMap: tex("metalnessMap"),
+		roughnessMap: tex("roughnessMap"),
+		aoMap: tex("aoMap"),
+		emissiveMap: tex("emissiveMap")
+	};
+}
+function resolveStyleMaterial(appearance, originalMaterial) {
+	if (typeof appearance.material === "function") return appearance.material(extractStyleMaterialMaps(originalMaterial));
+	return appearance.material;
+}
 function vec3Key(v) {
 	if (v === void 0) return "";
 	if (Array.isArray(v)) return `${v[0] ?? 0},${v[1] ?? 0},${v[2] ?? 0}`;
@@ -2647,7 +2681,7 @@ function applyEuler(target, input) {
 	else target.copy(input);
 }
 function appearanceGroupKey(a) {
-	return `${a.material.uuid}|${vec3Key(a.translation)}|${vec3Key(a.scale)}|${eulerKey(a.rotation)}|${vec3Key(a.origin)}`;
+	return `${typeof a.material === "function" ? `matFn#${styleFnIdentity(a.material)}` : a.material.uuid}${a.mesh ? `|meshFn#${styleFnIdentity(a.mesh)}` : ""}|${vec3Key(a.translation)}|${vec3Key(a.scale)}|${eulerKey(a.rotation)}|${vec3Key(a.origin)}`;
 }
 function buildPivotStyleMatrix(pivot, sx, sy, sz, euler) {
 	const m = new Matrix4().makeTranslation(-pivot.x, -pivot.y, -pivot.z);
@@ -2656,28 +2690,25 @@ function buildPivotStyleMatrix(pivot, sx, sy, sz, euler) {
 	m.premultiply(new Matrix4().makeTranslation(pivot.x, pivot.y, pivot.z));
 	return m;
 }
-function resolveConditionsAppearance(conditions, propertyData) {
+function resolveConditionsAppearance(conditions, propertyData, evaluators) {
 	if (!conditions?.length) return null;
-	for (const [cond, value] of conditions) if (evaluateStyleCondition(cond, propertyData)) return value;
+	for (const [cond, value] of conditions) if (evaluateStyleCondition(cond, propertyData, evaluators)) return value;
 	return null;
 }
-function resolveStyleAppearance(conditions, propertyData) {
-	return resolveConditionsAppearance(conditions, propertyData);
-}
 /** 与 setStyle 相同的 OID 分组逻辑（show + conditions → 外观分组 + 被 show 隐藏的 OID） */
-function buildAppearanceGroupsFromPropertyMap(propertyByOid, config) {
+function buildAppearanceGroupsFromPropertyMap(propertyByOid, config, evaluators) {
 	const hiddenOidsList = [];
 	const groups = /* @__PURE__ */ new Map();
 	const conditions = config.conditions ?? [];
 	for (const [oid, propertyData] of propertyByOid) {
 		if (propertyData == null) continue;
 		if (config.show) {
-			if (!evaluateStyleCondition(config.show, propertyData)) {
+			if (!evaluateStyleCondition(config.show, propertyData, evaluators)) {
 				hiddenOidsList.push(oid);
 				continue;
 			}
 		}
-		const appearance = resolveStyleAppearance(conditions, propertyData);
+		const appearance = resolveConditionsAppearance(conditions, propertyData, evaluators);
 		if (!appearance) continue;
 		const gkey = appearanceGroupKey(appearance);
 		let g = groups.get(gkey);
@@ -2714,7 +2745,9 @@ function restoreMeshAppearanceMaps(mesh, maps) {
 */
 function applyStyleAppearanceToMesh(mesh, appearance, scene, maps) {
 	if (!maps.originalMaterialByMesh.has(mesh.uuid)) maps.originalMaterialByMesh.set(mesh.uuid, mesh.material);
-	mesh.material = appearance.material;
+	const resolvedMaterial = resolveStyleMaterial(appearance, maps.originalMaterialByMesh.get(mesh.uuid));
+	if (appearance.mesh) mesh = appearance.mesh(mesh.geometry, resolvedMaterial);
+	else mesh.material = resolvedMaterial;
 	if (appearance.translation !== void 0 || appearance.scale !== void 0 || appearance.rotation !== void 0) {
 		if (!maps.originalTransformByMesh.has(mesh.uuid)) maps.originalTransformByMesh.set(mesh.uuid, {
 			position: mesh.position.clone(),
@@ -2830,10 +2863,14 @@ var StyleHelper = class {
 		}
 		this.styleCollectors = [];
 		this.meshChangeHandlers.clear();
-		const { hiddenOidsList, groups } = buildAppearanceGroupsFromPropertyMap(propertyByOid, {
+		const evaluators = buildStyleConditionEvaluatorMap({
 			show: style.show,
 			conditions: style.conditions ?? []
 		});
+		const { hiddenOidsList, groups } = buildAppearanceGroupsFromPropertyMap(propertyByOid, {
+			show: style.show,
+			conditions: style.conditions ?? []
+		}, evaluators);
 		for (const { oids } of groups.values()) for (const oid of oids) this.styledOids.add(oid);
 		this.hiddenOids = new Set(hiddenOidsList);
 		const oidsToHide = [...hiddenOidsList];
@@ -2894,8 +2931,10 @@ function toMaterial(value) {
 	return getMaterialForHighlight(value);
 }
 function toStyleAppearance(ha) {
+	const mat = ha.material;
 	return {
-		material: toMaterial(ha.material),
+		material: typeof mat === "function" ? mat : mat instanceof Material ? mat : toMaterial(mat),
+		mesh: ha.mesh,
 		translation: ha.translation,
 		scale: ha.scale,
 		rotation: ha.rotation,
@@ -2929,12 +2968,16 @@ var PartHighlightHelper = class {
 	mergeAppearanceByOid(propertyByOid) {
 		const appearanceByOid = /* @__PURE__ */ new Map();
 		for (const [, hl] of this.highlightGroups) {
+			const evaluators = buildStyleConditionEvaluatorMap({
+				show: hl.show,
+				conditions: hl.conditions ?? []
+			});
 			const conditions = (hl.conditions ?? []).map(([c, h]) => [c, toStyleAppearance(h)]);
 			for (const [oid, propertyData] of propertyByOid) {
 				if (propertyData == null) continue;
 				if (hl.oids && !hl.oids.includes(oid)) continue;
-				if (hl.show && !evaluateStyleCondition(hl.show, propertyData)) continue;
-				const app = resolveConditionsAppearance(conditions, propertyData);
+				if (hl.show && !evaluateStyleCondition(hl.show, propertyData, evaluators)) continue;
+				const app = resolveConditionsAppearance(conditions, propertyData, evaluators);
 				if (!app) continue;
 				appearanceByOid.set(oid, app);
 			}
@@ -2944,10 +2987,16 @@ var PartHighlightHelper = class {
 	/** 各组 show 失败需隐藏的 OID（与 setStyle 一致：show 不满足则隐藏原片） */
 	collectUnionShowHide(propertyByOid) {
 		const unionHide = /* @__PURE__ */ new Set();
-		for (const [, hl] of this.highlightGroups) for (const [oid, propertyData] of propertyByOid) {
-			if (propertyData == null) continue;
-			if (hl.oids && !hl.oids.includes(oid)) continue;
-			if (hl.show && !evaluateStyleCondition(hl.show, propertyData)) unionHide.add(oid);
+		for (const [, hl] of this.highlightGroups) {
+			const evaluators = buildStyleConditionEvaluatorMap({
+				show: hl.show,
+				conditions: hl.conditions ?? []
+			});
+			for (const [oid, propertyData] of propertyByOid) {
+				if (propertyData == null) continue;
+				if (hl.oids && !hl.oids.includes(oid)) continue;
+				if (hl.show && !evaluateStyleCondition(hl.show, propertyData, evaluators)) unionHide.add(oid);
+			}
 		}
 		return unionHide;
 	}
@@ -3368,6 +3417,8 @@ var GLTFParserPlugin = class {
 			if (tileWithCache.engineData?.scene) this._onLoadModel(tileWithCache.engineData.scene);
 			return true;
 		}, null);
+		this._notifyCollectors();
+		if (this._options.style !== void 0) this._styleHelper?.setStyle(this._options.style ?? null);
 	}
 	_createPartEffectHost() {
 		return {
@@ -3488,8 +3539,9 @@ var GLTFParserPlugin = class {
 		if (!this.tiles) return null;
 		const cond = condition.trim();
 		if (!cond) return null;
+		const evaluators = buildStyleConditionEvaluatorMap({ show: cond });
 		const targetOids = [];
-		for (const oid of getAllOidsFromTiles(this.tiles)) if (evaluateStyleCondition(cond, getPropertyDataByOid(this.tiles, oid))) targetOids.push(oid);
+		for (const oid of getAllOidsFromTiles(this.tiles)) if (evaluateStyleCondition(cond, getPropertyDataByOid(this.tiles, oid), evaluators)) targetOids.push(oid);
 		if (targetOids.length === 0) return null;
 		return this._getCenterFromOidList(targetOids);
 	}
@@ -3551,6 +3603,7 @@ var GLTFParserPlugin = class {
 	*/
 	_onLoadModelCB = ({ scene }) => {
 		this._onLoadModel(scene);
+		this._notifyCollectors();
 	};
 	/**
 	* Tiles load end callback
@@ -3569,6 +3622,7 @@ var GLTFParserPlugin = class {
 	_notifyCollectors() {
 		for (const collector of this.collectors) collector._updateMeshes();
 		this._styleHelper?.onTilesLoadEnd();
+		this._partHighlightHelper?.onTilesLoadEnd();
 	}
 	_registerCollector(collector) {
 		this.collectors.add(collector);
@@ -3721,8 +3775,9 @@ var GLTFParserPlugin = class {
 			targetOids = [...new Set(params.oids)].sort((a, b) => a - b);
 		} else {
 			const candidate = params.oids.length === 0 ? getAllOidsFromTiles(this.tiles) : [...new Set(params.oids)];
+			const evaluators = buildStyleConditionEvaluatorMap({ show: cond });
 			targetOids = [];
-			for (const oid of candidate) if (evaluateStyleCondition(cond, getPropertyDataByOid(this.tiles, oid))) targetOids.push(oid);
+			for (const oid of candidate) if (evaluateStyleCondition(cond, getPropertyDataByOid(this.tiles, oid), evaluators)) targetOids.push(oid);
 			targetOids.sort((a, b) => a - b);
 		}
 		return this._getMeshesByOidsInternal(targetOids);
@@ -3944,6 +3999,6 @@ var GLTFParserPlugin = class {
 	}
 };
 //#endregion
-export { GLTFParserPlugin, MeshCollector, clearStyleConditionCache, decodeGzipBase64DataUriSync, evaluateStyleCondition, getStructureDataUriFromTileset, meshCollectorGroupKey, meshCollectorQueryCacheKey, normalizeMeshCollectorOids, parseEmbeddedStructureDataFromTilesSync };
+export { GLTFParserPlugin, MeshCollector, buildStyleConditionEvaluatorMap, compileStyleCondition, decodeGzipBase64DataUriSync, evaluateStyleCondition, extractStyleMaterialMaps, getStructureDataUriFromTileset, meshCollectorGroupKey, meshCollectorQueryCacheKey, normalizeMeshCollectorOids, parseEmbeddedStructureDataFromTilesSync };
 
 //# sourceMappingURL=gltf-parser-plugin.module.js.map