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

package/libs/ItemLabelPlugin/ItemLabelComponent.js

@@ -41,18 +41,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]
@@ -69,7 +69,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);
@@ -89,12 +89,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,
@@ -114,7 +114,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);
 
@@ -161,7 +161,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);
@@ -265,7 +265,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();
 
@@ -286,6 +286,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]);
@@ -320,11 +331,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)
@@ -355,24 +373,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);
 
@@ -420,12 +425,6 @@ function instance($$self, $$props, $$invalidate) {
 			}
 		});
 
-	onDestroy(() => {
-		five.off('cameraUpdate', handleCameraUpdateCallback);
-		five.off('modeChange', onFiveModeChange);
-		resizeObserver.unobserve(wrapper);
-	});
-
 	const getNearObserverPano = (fromPositionVector, observers) => {
 		let candidates = [];
 
@@ -463,6 +462,7 @@ function instance($$self, $$props, $$invalidate) {
 		const observer = getNearObserverPano(fromPositionVector, observers);
 
 		if (observer) {
+			console.log('--has observer--');
 			itemLabel.observerIndex = observer.panoIndex;
 		}
 
@@ -495,6 +495,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;

package/libs/ItemLabelPlugin/ItemLabelItem.js

@@ -38,7 +38,7 @@ function create_if_block(ctx) {
 			div1 = element("div");
 			div0 = element("div");
 			attr(div0, "class", "icon svelte-1gam1w3");
-			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-1gam1w3");
 		},
 		m(target, anchor) {
@@ -51,7 +51,7 @@ function create_if_block(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);
 			}
 		},
@@ -69,7 +69,7 @@ function create_fragment(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;
@@ -142,7 +142,7 @@ function create_fragment(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) {
@@ -180,14 +180,13 @@ function create_fragment(ctx) {
 	};
 }
 
-const defaultIcon = '//vrlab-public.ljcdn.com/common/file/web/c8591aaa-e62b-4e31-8fed-671483ace37f.svg\n';
-
 function instance($$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);
 	}

package/libs/ItemLabelPlugin/utils/isImpacted.js

@@ -8,5 +8,6 @@ export 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
 };

package/package.json

@@ -8,7 +8,7 @@
   "repository": "https://github.com/realsee-developer/dnalogel.git",
   "description": "如视 VR 看房插件合集",
   "private": false,
-  "version": "2.0.0-alpha.30",
+  "version": "2.0.0-alpha.31-beta",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "build": "yarn run tsb && yarn run build:rollup && yarn build:docs",
@@ -28,7 +28,7 @@
   ],
   "devDependencies": {
     "@babel/core": "^7.17.5",
-    "@realsee/five": "^5.0.0-alpha.127",
+    "@realsee/five": "5.0.0-alpha.127",
     "@rollup/plugin-alias": "^3.1.9",
     "@rollup/plugin-commonjs": "^21.1.0",
     "@rollup/plugin-typescript": "^8.3.2",