@realsee/dnalogel 2.0.0-alpha.30 → 2.0.0-alpha.31-beta

package/dist/ItemLabelPlugin/index.js

@@ -58,7 +58,7 @@ function create_if_block$1(ctx) {
 			div1 = internal.element("div");
 			div0 = internal.element("div");
 			internal.attr(div0, "class", "icon svelte-4rvov0");
-			internal.attr(div0, "style", div0_style_value = `background-image: url(${/*itemLabel*/ ctx[0].icon ?? defaultIcon})`);
+			internal.attr(div0, "style", div0_style_value = `background-image: url(${/*itemLabel*/ ctx[0].icon})`);
 			internal.attr(div1, "class", "icon-wrap svelte-4rvov0");
 		},
 		m(target, anchor) {
@@ -71,7 +71,7 @@ function create_if_block$1(ctx) {
 			}
 		},
 		p(ctx, dirty) {
-			if (dirty & /*itemLabel*/ 1 && div0_style_value !== (div0_style_value = `background-image: url(${/*itemLabel*/ ctx[0].icon ?? defaultIcon})`)) {
+			if (dirty & /*itemLabel*/ 1 && div0_style_value !== (div0_style_value = `background-image: url(${/*itemLabel*/ ctx[0].icon})`)) {
 				internal.attr(div0, "style", div0_style_value);
 			}
 		},
@@ -89,7 +89,7 @@ function create_fragment$1(ctx) {
 	let t0;
 	let div0;
 	let span0;
-	let t1_value = (/*itemLabel*/ ctx[0].code ?? /*itemLabel*/ ctx[0].id) + "";
+	let t1_value = (/*itemLabel*/ ctx[0].code || /*itemLabel*/ ctx[0].id) + "";
 	let t1;
 	let t2;
 	let span1;
@@ -161,7 +161,7 @@ function create_fragment$1(ctx) {
 				if_block = null;
 			}
 
-			if (dirty & /*itemLabel*/ 1 && t1_value !== (t1_value = (/*itemLabel*/ ctx[0].code ?? /*itemLabel*/ ctx[0].id) + "")) internal.set_data(t1, t1_value);
+			if (dirty & /*itemLabel*/ 1 && t1_value !== (t1_value = (/*itemLabel*/ ctx[0].code || /*itemLabel*/ ctx[0].id) + "")) internal.set_data(t1, t1_value);
 			if (dirty & /*itemLabel*/ 1 && t3_value !== (t3_value = /*itemLabel*/ ctx[0].name + "")) internal.set_data(t3, t3_value);
 
 			if (dirty & /*itemLabel*/ 1) {
@@ -199,14 +199,13 @@ function create_fragment$1(ctx) {
 	};
 }
 
-const defaultIcon = '//vrlab-public.ljcdn.com/common/file/web/c8591aaa-e62b-4e31-8fed-671483ace37f.svg\n';
-
 function instance$1($$self, $$props, $$invalidate) {
 	let { itemLabel } = $$props;
 	let { hooks } = $$props;
 	let { anchorEnabled } = $$props;
 	let { onIconClick } = $$props;
 
+	// const defaultIcon = '//vrlab-public.ljcdn.com/common/file/web/c8591aaa-e62b-4e31-8fed-671483ace37f.svg\n'
 	function onClick() {
 		hooks.emit('onLabelClick', itemLabel);
 	}
@@ -268,7 +267,8 @@ const isImpacted = (five, sourceVector, targetVector, distance) => {
     const raycaster = new Raycaster();
     raycaster.set(targetVector, direction);
     const [intersection] = five.model.intersectRaycaster(raycaster);
-    return intersection && distance <= intersection.distance + 0.1;
+    return intersection && intersection.distance + 0.01 < distance;
+    // return intersection && distance <= intersection.distance + 0.1
 };
 
 /**
@@ -304,18 +304,18 @@ function add_css(target) {
 
 function get_each_context(ctx, list, i) {
 	const child_ctx = ctx.slice();
-	child_ctx[31] = list[i];
+	child_ctx[32] = list[i];
 	return child_ctx;
 }
 
-// (229:2) {#if itemLabelItem.visible}
+// (248:2) {#if itemLabelItem.visible}
 function create_if_block(ctx) {
 	let itemlabelitem;
 	let current;
 
 	itemlabelitem = new ItemLabelItem({
 			props: {
-				itemLabel: /*itemLabelItem*/ ctx[31],
+				itemLabel: /*itemLabelItem*/ ctx[32],
 				hooks: /*hooks*/ ctx[0],
 				anchorEnabled: /*anchorEnabled*/ ctx[2],
 				onIconClick: /*onIconClick*/ ctx[6]
@@ -332,7 +332,7 @@ function create_if_block(ctx) {
 		},
 		p(ctx, dirty) {
 			const itemlabelitem_changes = {};
-			if (dirty[0] & /*renderItemLabels*/ 2) itemlabelitem_changes.itemLabel = /*itemLabelItem*/ ctx[31];
+			if (dirty[0] & /*renderItemLabels*/ 2) itemlabelitem_changes.itemLabel = /*itemLabelItem*/ ctx[32];
 			if (dirty[0] & /*hooks*/ 1) itemlabelitem_changes.hooks = /*hooks*/ ctx[0];
 			if (dirty[0] & /*anchorEnabled*/ 4) itemlabelitem_changes.anchorEnabled = /*anchorEnabled*/ ctx[2];
 			itemlabelitem.$set(itemlabelitem_changes);
@@ -352,12 +352,12 @@ function create_if_block(ctx) {
 	};
 }
 
-// (228:1) {#each renderItemLabels as itemLabelItem (itemLabelItem.id)}
+// (247:1) {#each renderItemLabels as itemLabelItem (itemLabelItem.id)}
 function create_each_block(key_1, ctx) {
 	let first;
 	let if_block_anchor;
 	let current;
-	let if_block = /*itemLabelItem*/ ctx[31].visible && create_if_block(ctx);
+	let if_block = /*itemLabelItem*/ ctx[32].visible && create_if_block(ctx);
 
 	return {
 		key: key_1,
@@ -377,7 +377,7 @@ function create_each_block(key_1, ctx) {
 		p(new_ctx, dirty) {
 			ctx = new_ctx;
 
-			if (/*itemLabelItem*/ ctx[31].visible) {
+			if (/*itemLabelItem*/ ctx[32].visible) {
 				if (if_block) {
 					if_block.p(ctx, dirty);
 
@@ -424,7 +424,7 @@ function create_fragment(ctx) {
 	let div_resize_listener;
 	let current;
 	let each_value = /*renderItemLabels*/ ctx[1];
-	const get_key = ctx => /*itemLabelItem*/ ctx[31].id;
+	const get_key = ctx => /*itemLabelItem*/ ctx[32].id;
 
 	for (let i = 0; i < each_value.length; i += 1) {
 		let child_ctx = get_each_context(ctx, each_value, i);
@@ -526,7 +526,7 @@ function instance($$self, $$props, $$invalidate) {
  * 1、当前楼层(假设先不考虑多楼层)
  * 2、模型未被遮挡（一个 box 有没有被遮挡的计算？ TODO）
  * */
-	const getLabelVisible = (five$1, itemLabel) => {
+	const judgeImpacted = (five$1, itemLabel) => {
 		// 虚拟 VR 仅有一层，不考虑楼层信息
 		const cameraPosition = five$1.camera.position.clone();
 
@@ -547,6 +547,17 @@ function instance($$self, $$props, $$invalidate) {
 	// const [intersection] = five.model.intersectRaycaster(raycaster)
 	// return !(intersection && intersection.distance + 1 < vectorDistance);
 
+	const judgeInViewport = modelPoint => {
+		const { camera, model } = five$1;
+		const { x: offsetXFromCenter, y: offsetYFromCenter, z: offsetZFromCenter } = modelPoint.clone().project(camera);
+		const ratioFromLeft = (offsetXFromCenter + 1) / 2;
+		const ratioFromTop = (2 - (offsetYFromCenter + 1)) / 2;
+		const isFront = Math.abs(offsetZFromCenter) < 1;
+		const cssOffset = [ratioFromLeft, ratioFromTop];
+		const isInViewport = isFront && cssOffset.every(ratio => ratio < 1 && ratio >= 0);
+		return Boolean(isInViewport);
+	};
+
 	// cssOffset 获取
 	const getLabelCssOffset = (five, itemLabel) => {
 		const modelPosition = new Vector3(itemLabel.modelPosition[0], itemLabel.modelPosition[1], itemLabel.modelPosition[2]);
@@ -563,19 +574,26 @@ function instance($$self, $$props, $$invalidate) {
 		return [xOffset, yOffset];
 	};
 
-	const getFormatedItemLabels = (five, labels) => {
+	const getFormatedItemLabels = (five$1, labels) => {
 		// 计算位置 & 可见性
 		const newLabels = labels.map(label => {
-			const cssOffset = getLabelCssOffset(five, label);
+			const cssOffset = getLabelCssOffset(five$1, label);
 			label.name.length * basicWidth;
 			const strokeLength = getStrokeLength(label.modelPosition[1], displayStrategyType);
 
 			// 是否加入碰撞检测
-			const naturalVisible = modelOcclusionEnable
-			? getLabelVisible(five, label)
-			: label.visible;
+			// 配置加入碰撞检测，则判断碰撞检测
+			// 在可见范围内， 仅在 Panorama 模态计算
+			const isInViewport = five$1.currentMode === five.Five.Mode.Panorama
+			? judgeInViewport(new Vector3(label.position[0], label.position[1], label.position[2]))
+			: true;
 
-			const visible = naturalVisible;
+			// 碰撞
+			const isBlocked = modelOcclusionEnable
+			? judgeImpacted(five$1, label)
+			: false;
+
+			const visible = isInViewport && !isBlocked;
 
 			// 关掉重叠计算
 			// const visible = naturalVisible && !isOverlap([cssOffset[0], cssOffset[1] + strokeLength], curLabelWidth)
@@ -591,7 +609,7 @@ function instance($$self, $$props, $$invalidate) {
 
 		const sortedItemLabelItems = newLabels.filter(({ visible }) => visible).map(label => ({
 			itemLabelItem: label,
-			distance: new Vector3(label.modelPosition[0], label.modelPosition[1], label.modelPosition[2]).clone().distanceTo(five.camera.position)
+			distance: new Vector3(label.modelPosition[0], label.modelPosition[1], label.modelPosition[2]).clone().distanceTo(five$1.camera.position)
 		})).sort((a, b) => a.distance - b.distance);
 
 		return newLabels.map(label => {
@@ -606,24 +624,11 @@ function instance($$self, $$props, $$invalidate) {
 		$$invalidate(1, renderItemLabels = getFormatedItemLabels(five$1, renderItemLabels));
 	};
 
-	svelte.beforeUpdate(() => {
-		addDataUpdateListener();
-	});
-
 	const handleCameraUpdateCallback = () => {
 		$$invalidate(5, itemsVisible = false);
 		handleCameraUpdate();
 	};
 
-	svelte.onMount(() => {
-		$$invalidate(1, renderItemLabels = transform2RenderData(itemLabels));
-		curItemLabels = itemLabels;
-		onItemLabelUpdate();
-		addResizeListener();
-		five$1.on('cameraUpdate', handleCameraUpdateCallback);
-		five$1.on('modeChange', onFiveModeChange);
-	});
-
 	const onFiveModeChange = mode => {
 		$$invalidate(5, itemsVisible = false);
 
@@ -671,12 +676,6 @@ function instance($$self, $$props, $$invalidate) {
 			}
 		});
 
-	svelte.onDestroy(() => {
-		five$1.off('cameraUpdate', handleCameraUpdateCallback);
-		five$1.off('modeChange', onFiveModeChange);
-		resizeObserver.unobserve(wrapper);
-	});
-
 	const getNearObserverPano = (fromPositionVector, observers) => {
 		let candidates = [];
 
@@ -714,6 +713,7 @@ function instance($$self, $$props, $$invalidate) {
 		const observer = getNearObserverPano(fromPositionVector, observers);
 
 		if (observer) {
+			console.log('--has observer--');
 			itemLabel.observerIndex = observer.panoIndex;
 		}
 
@@ -746,6 +746,25 @@ function instance($$self, $$props, $$invalidate) {
 		}
 	};
 
+	svelte.beforeUpdate(() => {
+		addDataUpdateListener();
+	});
+
+	svelte.onMount(() => {
+		$$invalidate(1, renderItemLabels = transform2RenderData(itemLabels));
+		curItemLabels = itemLabels;
+		onItemLabelUpdate();
+		addResizeListener();
+		five$1.on('cameraUpdate', handleCameraUpdateCallback);
+		five$1.on('modeChange', onFiveModeChange);
+	});
+
+	svelte.onDestroy(() => {
+		five$1.off('cameraUpdate', handleCameraUpdateCallback);
+		five$1.off('modeChange', onFiveModeChange);
+		resizeObserver.unobserve(wrapper);
+	});
+
 	function div_elementresize_handler() {
 		containerWidth = this.clientWidth;
 		containerHeight = this.clientHeight;

package/dist/index.es.js

@@ -13765,7 +13765,7 @@ function create_if_block$1(ctx) {
 			div1 = element("div");
 			div0 = element("div");
 			attr(div0, "class", "icon svelte-4rvov0");
-			attr(div0, "style", div0_style_value = `background-image: url(${/*itemLabel*/ ctx[0].icon ?? defaultIcon})`);
+			attr(div0, "style", div0_style_value = `background-image: url(${/*itemLabel*/ ctx[0].icon})`);
 			attr(div1, "class", "icon-wrap svelte-4rvov0");
 		},
 		m(target, anchor) {
@@ -13778,7 +13778,7 @@ function create_if_block$1(ctx) {
 			}
 		},
 		p(ctx, dirty) {
-			if (dirty & /*itemLabel*/ 1 && div0_style_value !== (div0_style_value = `background-image: url(${/*itemLabel*/ ctx[0].icon ?? defaultIcon})`)) {
+			if (dirty & /*itemLabel*/ 1 && div0_style_value !== (div0_style_value = `background-image: url(${/*itemLabel*/ ctx[0].icon})`)) {
 				attr(div0, "style", div0_style_value);
 			}
 		},
@@ -13796,7 +13796,7 @@ function create_fragment$1(ctx) {
 	let t0;
 	let div0;
 	let span0;
-	let t1_value = (/*itemLabel*/ ctx[0].code ?? /*itemLabel*/ ctx[0].id) + "";
+	let t1_value = (/*itemLabel*/ ctx[0].code || /*itemLabel*/ ctx[0].id) + "";
 	let t1;
 	let t2;
 	let span1;
@@ -13868,7 +13868,7 @@ function create_fragment$1(ctx) {
 				if_block = null;
 			}
 
-			if (dirty & /*itemLabel*/ 1 && t1_value !== (t1_value = (/*itemLabel*/ ctx[0].code ?? /*itemLabel*/ ctx[0].id) + "")) set_data(t1, t1_value);
+			if (dirty & /*itemLabel*/ 1 && t1_value !== (t1_value = (/*itemLabel*/ ctx[0].code || /*itemLabel*/ ctx[0].id) + "")) set_data(t1, t1_value);
 			if (dirty & /*itemLabel*/ 1 && t3_value !== (t3_value = /*itemLabel*/ ctx[0].name + "")) set_data(t3, t3_value);
 
 			if (dirty & /*itemLabel*/ 1) {
@@ -13906,14 +13906,13 @@ function create_fragment$1(ctx) {
 	};
 }
 
-const defaultIcon = '//vrlab-public.ljcdn.com/common/file/web/c8591aaa-e62b-4e31-8fed-671483ace37f.svg\n';
-
 function instance$1($$self, $$props, $$invalidate) {
 	let { itemLabel } = $$props;
 	let { hooks } = $$props;
 	let { anchorEnabled } = $$props;
 	let { onIconClick } = $$props;
 
+	// const defaultIcon = '//vrlab-public.ljcdn.com/common/file/web/c8591aaa-e62b-4e31-8fed-671483ace37f.svg\n'
 	function onClick() {
 		hooks.emit('onLabelClick', itemLabel);
 	}
@@ -13960,7 +13959,8 @@ const isImpacted = (five, sourceVector, targetVector, distance) => {
     const raycaster = new Raycaster();
     raycaster.set(targetVector, direction);
     const [intersection] = five.model.intersectRaycaster(raycaster);
-    return intersection && distance <= intersection.distance + 0.1;
+    return intersection && intersection.distance + 0.01 < distance;
+    // return intersection && distance <= intersection.distance + 0.1
 };
 
 /**
@@ -13996,18 +13996,18 @@ function add_css(target) {
 
 function get_each_context(ctx, list, i) {
 	const child_ctx = ctx.slice();
-	child_ctx[31] = list[i];
+	child_ctx[32] = list[i];
 	return child_ctx;
 }
 
-// (229:2) {#if itemLabelItem.visible}
+// (248:2) {#if itemLabelItem.visible}
 function create_if_block(ctx) {
 	let itemlabelitem;
 	let current;
 
 	itemlabelitem = new ItemLabelItem({
 			props: {
-				itemLabel: /*itemLabelItem*/ ctx[31],
+				itemLabel: /*itemLabelItem*/ ctx[32],
 				hooks: /*hooks*/ ctx[0],
 				anchorEnabled: /*anchorEnabled*/ ctx[2],
 				onIconClick: /*onIconClick*/ ctx[6]
@@ -14024,7 +14024,7 @@ function create_if_block(ctx) {
 		},
 		p(ctx, dirty) {
 			const itemlabelitem_changes = {};
-			if (dirty[0] & /*renderItemLabels*/ 2) itemlabelitem_changes.itemLabel = /*itemLabelItem*/ ctx[31];
+			if (dirty[0] & /*renderItemLabels*/ 2) itemlabelitem_changes.itemLabel = /*itemLabelItem*/ ctx[32];
 			if (dirty[0] & /*hooks*/ 1) itemlabelitem_changes.hooks = /*hooks*/ ctx[0];
 			if (dirty[0] & /*anchorEnabled*/ 4) itemlabelitem_changes.anchorEnabled = /*anchorEnabled*/ ctx[2];
 			itemlabelitem.$set(itemlabelitem_changes);
@@ -14044,12 +14044,12 @@ function create_if_block(ctx) {
 	};
 }
 
-// (228:1) {#each renderItemLabels as itemLabelItem (itemLabelItem.id)}
+// (247:1) {#each renderItemLabels as itemLabelItem (itemLabelItem.id)}
 function create_each_block(key_1, ctx) {
 	let first;
 	let if_block_anchor;
 	let current;
-	let if_block = /*itemLabelItem*/ ctx[31].visible && create_if_block(ctx);
+	let if_block = /*itemLabelItem*/ ctx[32].visible && create_if_block(ctx);
 
 	return {
 		key: key_1,
@@ -14069,7 +14069,7 @@ function create_each_block(key_1, ctx) {
 		p(new_ctx, dirty) {
 			ctx = new_ctx;
 
-			if (/*itemLabelItem*/ ctx[31].visible) {
+			if (/*itemLabelItem*/ ctx[32].visible) {
 				if (if_block) {
 					if_block.p(ctx, dirty);
 
@@ -14116,7 +14116,7 @@ function create_fragment(ctx) {
 	let div_resize_listener;
 	let current;
 	let each_value = /*renderItemLabels*/ ctx[1];
-	const get_key = ctx => /*itemLabelItem*/ ctx[31].id;
+	const get_key = ctx => /*itemLabelItem*/ ctx[32].id;
 
 	for (let i = 0; i < each_value.length; i += 1) {
 		let child_ctx = get_each_context(ctx, each_value, i);
@@ -14218,7 +14218,7 @@ function instance($$self, $$props, $$invalidate) {
  * 1、当前楼层(假设先不考虑多楼层)
  * 2、模型未被遮挡（一个 box 有没有被遮挡的计算？ TODO）
  * */
-	const getLabelVisible = (five, itemLabel) => {
+	const judgeImpacted = (five, itemLabel) => {
 		// 虚拟 VR 仅有一层，不考虑楼层信息
 		const cameraPosition = five.camera.position.clone();
 
@@ -14239,6 +14239,17 @@ function instance($$self, $$props, $$invalidate) {
 	// const [intersection] = five.model.intersectRaycaster(raycaster)
 	// return !(intersection && intersection.distance + 1 < vectorDistance);
 
+	const judgeInViewport = modelPoint => {
+		const { camera, model } = five;
+		const { x: offsetXFromCenter, y: offsetYFromCenter, z: offsetZFromCenter } = modelPoint.clone().project(camera);
+		const ratioFromLeft = (offsetXFromCenter + 1) / 2;
+		const ratioFromTop = (2 - (offsetYFromCenter + 1)) / 2;
+		const isFront = Math.abs(offsetZFromCenter) < 1;
+		const cssOffset = [ratioFromLeft, ratioFromTop];
+		const isInViewport = isFront && cssOffset.every(ratio => ratio < 1 && ratio >= 0);
+		return Boolean(isInViewport);
+	};
+
 	// cssOffset 获取
 	const getLabelCssOffset = (five, itemLabel) => {
 		const modelPosition = new Vector3(itemLabel.modelPosition[0], itemLabel.modelPosition[1], itemLabel.modelPosition[2]);
@@ -14263,11 +14274,18 @@ function instance($$self, $$props, $$invalidate) {
 			const strokeLength = getStrokeLength(label.modelPosition[1], displayStrategyType);
 
 			// 是否加入碰撞检测
-			const naturalVisible = modelOcclusionEnable
-			? getLabelVisible(five, label)
-			: label.visible;
+			// 配置加入碰撞检测，则判断碰撞检测
+			// 在可见范围内， 仅在 Panorama 模态计算
+			const isInViewport = five.currentMode === Five.Mode.Panorama
+			? judgeInViewport(new Vector3(label.position[0], label.position[1], label.position[2]))
+			: true;
+
+			// 碰撞
+			const isBlocked = modelOcclusionEnable
+			? judgeImpacted(five, label)
+			: false;
 
-			const visible = naturalVisible;
+			const visible = isInViewport && !isBlocked;
 
 			// 关掉重叠计算
 			// const visible = naturalVisible && !isOverlap([cssOffset[0], cssOffset[1] + strokeLength], curLabelWidth)
@@ -14298,24 +14316,11 @@ function instance($$self, $$props, $$invalidate) {
 		$$invalidate(1, renderItemLabels = getFormatedItemLabels(five, renderItemLabels));
 	};
 
-	beforeUpdate(() => {
-		addDataUpdateListener();
-	});
-
 	const handleCameraUpdateCallback = () => {
 		$$invalidate(5, itemsVisible = false);
 		handleCameraUpdate();
 	};
 
-	onMount(() => {
-		$$invalidate(1, renderItemLabels = transform2RenderData(itemLabels));
-		curItemLabels = itemLabels;
-		onItemLabelUpdate();
-		addResizeListener();
-		five.on('cameraUpdate', handleCameraUpdateCallback);
-		five.on('modeChange', onFiveModeChange);
-	});
-
 	const onFiveModeChange = mode => {
 		$$invalidate(5, itemsVisible = false);
 
@@ -14363,12 +14368,6 @@ function instance($$self, $$props, $$invalidate) {
 			}
 		});
 
-	onDestroy(() => {
-		five.off('cameraUpdate', handleCameraUpdateCallback);
-		five.off('modeChange', onFiveModeChange);
-		resizeObserver.unobserve(wrapper);
-	});
-
 	const getNearObserverPano = (fromPositionVector, observers) => {
 		let candidates = [];
 
@@ -14406,6 +14405,7 @@ function instance($$self, $$props, $$invalidate) {
 		const observer = getNearObserverPano(fromPositionVector, observers);
 
 		if (observer) {
+			console.log('--has observer--');
 			itemLabel.observerIndex = observer.panoIndex;
 		}
 
@@ -14438,6 +14438,25 @@ function instance($$self, $$props, $$invalidate) {
 		}
 	};
 
+	beforeUpdate(() => {
+		addDataUpdateListener();
+	});
+
+	onMount(() => {
+		$$invalidate(1, renderItemLabels = transform2RenderData(itemLabels));
+		curItemLabels = itemLabels;
+		onItemLabelUpdate();
+		addResizeListener();
+		five.on('cameraUpdate', handleCameraUpdateCallback);
+		five.on('modeChange', onFiveModeChange);
+	});
+
+	onDestroy(() => {
+		five.off('cameraUpdate', handleCameraUpdateCallback);
+		five.off('modeChange', onFiveModeChange);
+		resizeObserver.unobserve(wrapper);
+	});
+
 	function div_elementresize_handler() {
 		containerWidth = this.clientWidth;
 		containerHeight = this.clientHeight;