@realsee/dnalogel 2.0.0-alpha.26-beta → 2.0.0-alpha.28-beta

package/dist/index.js

@@ -589,17 +589,19 @@ class RoomLabelItem extends internal.SvelteComponent {
 
 /* src/ModelRoomLabelPlugin/RoomLabelItems.svelte generated by Svelte v3.47.0 */
 
+const { Map: Map_1 } = internal.globals;
+
 function add_css$l(target) {
 	internal.append_styles(target, "svelte-9eg4zi", ".room-labels-container.svelte-9eg4zi{width:100%;height:100%;position:relative;color:#fff}");
 }
 
 function get_each_context$9(ctx, list, i) {
 	const child_ctx = ctx.slice();
-	child_ctx[9] = list[i];
+	child_ctx[12] = list[i];
 	return child_ctx;
 }
 
-// (70:2) {#each roomLabels as roomLableItem (roomLableItem.id)}
+// (82:2) {#each roomLabels as roomLableItem (roomLableItem.id)}
 function create_each_block$9(key_1, ctx) {
 	let first;
 	let roomlabelitem;
@@ -607,7 +609,7 @@ function create_each_block$9(key_1, ctx) {
 
 	roomlabelitem = new RoomLabelItem({
 			props: {
-				roomLabel: /*roomLableItem*/ ctx[9],
+				roomLabel: /*roomLableItem*/ ctx[12],
 				five: /*five*/ ctx[1]
 			}
 		});
@@ -628,7 +630,7 @@ function create_each_block$9(key_1, ctx) {
 		p(new_ctx, dirty) {
 			ctx = new_ctx;
 			const roomlabelitem_changes = {};
-			if (dirty & /*roomLabels*/ 1) roomlabelitem_changes.roomLabel = /*roomLableItem*/ ctx[9];
+			if (dirty & /*roomLabels*/ 1) roomlabelitem_changes.roomLabel = /*roomLableItem*/ ctx[12];
 			if (dirty & /*five*/ 2) roomlabelitem_changes.five = /*five*/ ctx[1];
 			roomlabelitem.$set(roomlabelitem_changes);
 		},
@@ -651,11 +653,11 @@ function create_each_block$9(key_1, ctx) {
 function create_fragment$p(ctx) {
 	let div;
 	let each_blocks = [];
-	let each_1_lookup = new Map();
+	let each_1_lookup = new Map_1();
 	let div_resize_listener;
 	let current;
 	let each_value = /*roomLabels*/ ctx[0];
-	const get_key = ctx => /*roomLableItem*/ ctx[9].id;
+	const get_key = ctx => /*roomLableItem*/ ctx[12].id;
 
 	for (let i = 0; i < each_value.length; i += 1) {
 		let child_ctx = get_each_context$9(ctx, each_value, i);
@@ -672,7 +674,7 @@ function create_fragment$p(ctx) {
 			}
 
 			internal.attr(div, "class", "room-labels-container svelte-9eg4zi");
-			internal.add_render_callback(() => /*div_elementresize_handler*/ ctx[4].call(div));
+			internal.add_render_callback(() => /*div_elementresize_handler*/ ctx[6].call(div));
 		},
 		m(target, anchor) {
 			internal.insert(target, div, anchor);
@@ -681,7 +683,7 @@ function create_fragment$p(ctx) {
 				each_blocks[i].m(div, null);
 			}
 
-			div_resize_listener = internal.add_resize_listener(div, /*div_elementresize_handler*/ ctx[4].bind(div));
+			div_resize_listener = internal.add_resize_listener(div, /*div_elementresize_handler*/ ctx[6].bind(div));
 			current = true;
 		},
 		p(ctx, [dirty]) {
@@ -721,22 +723,17 @@ function create_fragment$p(ctx) {
 }
 
 function instance$p($$self, $$props, $$invalidate) {
+	let rendererSize;
 	let { five } = $$props;
 	let { roomLabels } = $$props;
 	let containerWidth;
 	let containerHeight;
+	let shownFloor = null;
 
-	function getLabelVisible(five, roomLabelItem) {
-		// 先看是不是在当前展示的楼层上
-		const isLabelInFloor = five.model.shownFloor === null || roomLabelItem.floorIndex === five.model.shownFloor;
-
-		if (!isLabelInFloor) return false;
-
-		// 再看是不是被模型遮挡
+	function getLabelVisible(item) {
 		const raycaster = new THREE.Raycaster();
-
 		const cameraPosition = five.camera.position.clone();
-		const position = new THREE.Vector3(roomLabelItem.position.x, roomLabelItem.position.y, roomLabelItem.position.z);
+		const position = new THREE.Vector3(item.position.x, item.position.y, item.position.z);
 		const vectorDistance = position.distanceTo(cameraPosition);
 		raycaster.set(cameraPosition.clone(), position.clone().sub(cameraPosition).normalize());
 		const [intersection] = five.model.intersectRaycaster(raycaster);
@@ -744,53 +741,60 @@ function instance$p($$self, $$props, $$invalidate) {
 		return true;
 	}
 
-	function getLabelTransform(five, roomLabelItem) {
-		const position = new THREE.Vector3(roomLabelItem.position.x, roomLabelItem.position.y, roomLabelItem.position.z);
+	function getLabelTransform(item, rendererSize) {
+		const position = new THREE.Vector3(item.position.x, item.position.y, item.position.z);
 		const mouse = position.clone().project(five.camera);
-		const xOffset = Math.ceil((mouse.x + 1) / 2 * containerWidth);
-		const yOffset = Math.ceil((-mouse.y + 1) / 2 * containerHeight);
+		const xOffset = Math.ceil((mouse.x + 1) / 2 * rendererSize.x);
+		const yOffset = Math.ceil((-mouse.y + 1) / 2 * rendererSize.y);
 		return `translate(${xOffset}px, ${yOffset}px)`;
 	}
 
-	function getFormatedRoomLabels(five, labels) {
-		const newLabels = labels.map(roomLabelItem => {
-			// 计算是否可见，如果不可见，不会更新位置
-			const visible = getLabelVisible(five, roomLabelItem);
+	function getFormatedRoomLabels(rendererSize) {
+		// 因为 item distance 需要重复计算，所以缓存一下
+		const distanceMap = new Map();
+
+		function getItemDistance(item) {
+			const cacheDistance = distanceMap.get(item.id);
+			if (cacheDistance) return cacheDistance;
+			const { x, y, z } = item.position;
+			const distance = new THREE.Vector3(x, y, z).clone().distanceTo(five.camera.position);
+			distanceMap.set(item.id, distance);
+			return distance;
+		}
 
-			if (!visible) return Object.assign(Object.assign({}, roomLabelItem), { visible });
+		const formatedItems = roomLabels.map(item => {
+			const visible = getLabelVisible(item);
 
-			// 更新位置
-			const transform = getLabelTransform(five, roomLabelItem);
+			const transform = visible
+			? getLabelTransform(item, rendererSize)
+			: item.transform;
 
-			return Object.assign(Object.assign({}, roomLabelItem), { visible, transform });
-		});
+			const itemDistance = getItemDistance(item);
 
-		const sortedRoomLabelItems = newLabels.filter(({ visible }) => visible).map(roomLabelItem => ({
-			roomLabelItem,
-			distance: new THREE.Vector3(...Object.values(roomLabelItem.position)).clone().distanceTo(five.camera.position)
-		})).sort((a, b) => a.distance - b.distance);
+			// visible === true 的 item 中，distance 比自己小的 item 个数
+			const minItemLen = roomLabels.filter(item => item.visible && getItemDistance(item) < itemDistance).length;
 
-		return newLabels.map(roomLabelItem => {
-			const sortIndex = sortedRoomLabelItems.findIndex(item => item.roomLabelItem.id === roomLabelItem.id);
-			if (sortIndex !== undefined) return Object.assign(Object.assign({}, roomLabelItem), { zIndex: sortIndex * 10 });
-			return roomLabelItem;
+			const zIndex = minItemLen * 10;
+			return Object.assign(Object.assign({}, item), { visible, transform, zIndex });
 		});
+
+		return formatedItems;
 	}
 
 	function onFiveCameraUpdate() {
-		$$invalidate(0, roomLabels = getFormatedRoomLabels(five, roomLabels));
+		$$invalidate(0, roomLabels = getFormatedRoomLabels(rendererSize));
+	}
+
+	function onFiveModelShownFloorChange(floorIndex) {
+		$$invalidate(4, shownFloor = floorIndex);
 	}
 
 	five.on('cameraUpdate', onFiveCameraUpdate);
-	five.on('modelShownFloorChange', onFiveCameraUpdate);
+	five.on('modelShownFloorChange', onFiveModelShownFloorChange);
 
 	svelte.onDestroy(() => {
 		five.off('cameraUpdate', onFiveCameraUpdate);
-		five.off('modelShownFloorChange', onFiveCameraUpdate);
-	});
-
-	svelte.onMount(() => {
-		onFiveCameraUpdate();
+		five.off('modelShownFloorChange', onFiveModelShownFloorChange);
 	});
 
 	function div_elementresize_handler() {
@@ -805,7 +809,39 @@ function instance$p($$self, $$props, $$invalidate) {
 		if ('roomLabels' in $$props) $$invalidate(0, roomLabels = $$props.roomLabels);
 	};
 
-	return [roomLabels, five, containerWidth, containerHeight, div_elementresize_handler];
+	$$self.$$.update = () => {
+		if ($$self.$$.dirty & /*containerWidth, containerHeight*/ 12) {
+			$$invalidate(5, rendererSize = { x: containerWidth, y: containerHeight });
+		}
+
+		if ($$self.$$.dirty & /*rendererSize*/ 32) {
+			{
+				// rendererSize 变化时，触发 reRender
+				$$invalidate(0, roomLabels = getFormatedRoomLabels(rendererSize));
+			}
+		}
+
+		if ($$self.$$.dirty & /*roomLabels, shownFloor*/ 17) {
+			{
+				// shownFloor 变化时，更新 item visible
+				$$invalidate(0, roomLabels = roomLabels.map(item => {
+					const isLabelInFloor = shownFloor === null || item.floorIndex === shownFloor;
+					const visible = isLabelInFloor ? item.visible : false;
+					return Object.assign(Object.assign({}, item), { visible });
+				}));
+			}
+		}
+	};
+
+	return [
+		roomLabels,
+		five,
+		containerWidth,
+		containerHeight,
+		shownFloor,
+		rendererSize,
+		div_elementresize_handler
+	];
 }
 
 class RoomLabelItems extends internal.SvelteComponent {
@@ -974,6 +1010,10 @@ class ModelRoomLabelController {
 const ModelRoomLabelPlugin = (five) => {
     return new ModelRoomLabelController(five);
 };
+const modelRoomLabelPluginServerParams = {
+    name: 'ModelRoomLabelPlugin',
+    version: 0,
+};
 
 exports.FLOOR_PLAN_ATTACHED_TO = void 0;
 (function (FLOOR_PLAN_ATTACHED_TO) {
@@ -6662,20 +6702,20 @@ function tweenProgress$1(duration, easing) {
 /**
  * 运镜效果
  */
-var CameraMovementEffect;
+exports.CameraMovementEffect = void 0;
 (function (CameraMovementEffect) {
     CameraMovementEffect["Move"] = "Move";
     CameraMovementEffect["Rotate"] = "Rotate";
-})(CameraMovementEffect || (CameraMovementEffect = {}));
+})(exports.CameraMovementEffect || (exports.CameraMovementEffect = {}));
 /**
  * 旋转类型
  */
-var Rotation;
+exports.Rotation = void 0;
 (function (Rotation) {
     Rotation["Clockwise"] = "Clockwise";
     Rotation["Anticlockwise"] = "Anticlockwise";
     Rotation["Loop"] = "Loop";
-})(Rotation || (Rotation = {}));
+})(exports.Rotation || (exports.Rotation = {}));
 
 const PI_2 = Math.PI * 2;
 /**
@@ -6706,18 +6746,18 @@ const getLongitudeParams = (from, to, rotation) => {
     from = formatLongitude(from);
     to = formatLongitude(to);
     // 逆时针旋转，初始值必须是较大的值
-    if (rotation === Rotation.Anticlockwise && from < to)
+    if (rotation === exports.Rotation.Anticlockwise && from < to)
         from += PI_2;
     // 顺时针旋转，结束值必须是较大值
-    if (rotation === Rotation.Clockwise && to < from)
+    if (rotation === exports.Rotation.Clockwise && to < from)
         to += PI_2;
     // Loop 旋转，找锐角旋转
     // 如果 to 比 from 大 180°，逆时针转
     // 如果 from 比 to 大 180°，顺时针转
-    if (rotation === Rotation.Loop && to - from > PI)
-        return getLongitudeParams(from, to, Rotation.Anticlockwise);
-    if (rotation === Rotation.Loop && from - to > PI)
-        return getLongitudeParams(from, to, Rotation.Clockwise);
+    if (rotation === exports.Rotation.Loop && to - from > PI)
+        return getLongitudeParams(from, to, exports.Rotation.Anticlockwise);
+    if (rotation === exports.Rotation.Loop && from - to > PI)
+        return getLongitudeParams(from, to, exports.Rotation.Clockwise);
     return { from, to };
 };
 /**
@@ -6767,7 +6807,7 @@ const CameraMovementPlugin = (five$1) => {
         const fromLatitude = formatLatitude(currentFiveState.latitude);
         const toLatitude = formatLatitude(args.latitude);
         // longitude
-        const { from: fromLongitude, to: toLongitude } = getLongitudeParams(currentFiveState.longitude, args.longitude, args.rotation || Rotation.Loop);
+        const { from: fromLongitude, to: toLongitude } = getLongitudeParams(currentFiveState.longitude, args.longitude, args.rotation || exports.Rotation.Loop);
         // fov
         const fromFov = currentFiveState.fov;
         const toFov = args.fov;
@@ -6825,7 +6865,7 @@ const CameraMovementPlugin = (five$1) => {
                 .onUpdate(onUpdate)
                 .onComplete(onComplete)
                 .onDestroy(onDestroy);
-            if (args.rotation === Rotation.Loop) {
+            if (args.rotation === exports.Rotation.Loop) {
                 tween.repeat(Infinity).yoyo(true);
             }
             /**
@@ -7796,6 +7836,11 @@ class PanoCompassController {
     }
 }
 
+const panoCompassPluginServerParams = {
+    name: 'PanoCompassPlugin',
+    version: 0,
+};
+
 /** 交换数组元素 */
 function exchange(array, index1, index2) {
     const value = array[index1];
@@ -14085,7 +14130,9 @@ const PanoSpatialTagPlugin = (five$1, params) => {
             }))
                 continue;
             const raycaster = new THREE__namespace.Raycaster(camera.position.clone().setY(RAY_ORIGIN_Y), point.position.clone().sub(camera.position.clone().setY(RAY_ORIGIN_Y)).normalize(), 0, point.distance + RAY_TOLERANT_DISTANCE);
-            const [intersect] = five$1.model.intersectRaycaster(raycaster);
+            const [intersect] = five$1.model.bvhs.loaded ?
+                five$1.model.intersectRaycaster(raycaster) :
+                raycaster.intersectObjects(five$1.model.children, true);
             if (!intersect)
                 continue;
             if (point.distance - intersect.distance < RAY_TOLERANT_DISTANCE) {
@@ -14126,10 +14173,10 @@ const PanoSpatialTagPlugin = (five$1, params) => {
         return newTags;
     };
     /** 标签数据加载
-    * @param data.points {Array} 标签数据
-    * @param data.enabled {Boolean} 插件是否启用
-    * @param data.folded {Boolean} 标签是否默认展开
-    */
+     * @param data.points {Array} 标签数据
+     * @param data.enabled {Boolean} 插件是否启用
+     * @param data.folded {Boolean} 标签是否默认展开
+     */
     const load = (data) => {
         state.points = data.points.map(point => {
             var _a, _b;
@@ -14153,16 +14200,16 @@ const PanoSpatialTagPlugin = (five$1, params) => {
             state.folded = data.folded;
     };
     /** 标签启用
-    * 启用插件并重新计算展示标签
-    */
+     * 启用插件并重新计算展示标签
+     */
     const enable = () => {
         state.enabled = true;
         updateTags();
     };
     /** 插件禁用
-    * 1. 禁用同时会清除已展示的标签
-    * 2. 再次启用时会重新计算展示标签
-    */
+     * 1. 禁用同时会清除已展示的标签
+     * 2. 再次启用时会重新计算展示标签
+     */
     const disable = () => {
         state.enabled = false;
         origins.$set({ origins: [] });
@@ -14174,9 +14221,9 @@ const PanoSpatialTagPlugin = (five$1, params) => {
         state.tags = [];
     };
     /** 展开所有标签
-    * 1. 展开所有收起的标签
-    * 2. 新标签会默认展开
-    */
+     * 1. 展开所有收起的标签
+     * 2. 新标签会默认展开
+     */
     const unfoldAll = () => {
         state.folded = false;
         state.tags.forEach(tag => {
@@ -14184,9 +14231,9 @@ const PanoSpatialTagPlugin = (five$1, params) => {
         });
     };
     /** 收起所有标签
-    * 1. 收起所有展开的标签
-    * 2. 新标签会默认收起
-    */
+     * 1. 收起所有展开的标签
+     * 2. 新标签会默认收起
+     */
     const foldAll = () => {
         state.folded = true;
         state.tags.forEach(tag => {
@@ -14194,8 +14241,8 @@ const PanoSpatialTagPlugin = (five$1, params) => {
         });
     };
     /** 展开单个标签
-    * @param id {Number | String} 标签ID
-    */
+     * @param id {Number | String} 标签ID
+     */
     const unfold = (id) => {
         state.tags.forEach(tag => {
             if (tag.id === id)
@@ -14203,8 +14250,8 @@ const PanoSpatialTagPlugin = (five$1, params) => {
         });
     };
     /** 收起单个标签
-    * @param id {Number | String} 标签ID
-    */
+     * @param id {Number | String} 标签ID
+     */
     const fold = (id) => {
         state.tags.forEach(tag => {
             if (tag.id === id)
@@ -14238,7 +14285,7 @@ const PanoSpatialTagPlugin = (five$1, params) => {
         five$1.on('cameraUpdate', onCameraUpdate);
     }
     else {
-        five$1.once('modelBvhLoaded', () => {
+        five$1.once('modelLoaded', () => {
             if (!wrapper)
                 wrapper = five$1.getElement().parentElement;
             wrapper.appendChild(container);
@@ -14264,13 +14311,13 @@ const PanoSpatialTagPlugin = (five$1, params) => {
     };
 };
 
-var DISPLAY_STRATEGY_TYPE;
+exports.DISPLAY_STRATEGY_TYPE = void 0;
 (function (DISPLAY_STRATEGY_TYPE) {
     DISPLAY_STRATEGY_TYPE["SMALL"] = "small";
     DISPLAY_STRATEGY_TYPE["MIDLLE"] = "middle";
     DISPLAY_STRATEGY_TYPE["LARGE"] = "large";
     DISPLAY_STRATEGY_TYPE["EXTRA_LARGE"] = "x-large";
-})(DISPLAY_STRATEGY_TYPE || (DISPLAY_STRATEGY_TYPE = {}));
+})(exports.DISPLAY_STRATEGY_TYPE || (exports.DISPLAY_STRATEGY_TYPE = {}));
 
 /* src/ModelItemLabelPlugin/ItemLabelItem.svelte generated by Svelte v3.47.0 */
 
@@ -14410,7 +14457,7 @@ function get_each_context(ctx, list, i) {
 	return child_ctx;
 }
 
-// (162:1) {#each renderItemLabels as itemLabelItem (itemLabelItem.id)}
+// (163:1) {#each renderItemLabels as itemLabelItem (itemLabelItem.id)}
 function create_each_block(key_1, ctx) {
 	let first;
 	let itemlabelitem;
@@ -14611,13 +14658,13 @@ function instance($$self, $$props, $$invalidate) {
 
 	function getStrokeLength(itemSpaceHeight, type) {
 		switch (type) {
-			case DISPLAY_STRATEGY_TYPE.SMALL:
+			case exports.DISPLAY_STRATEGY_TYPE.SMALL:
 				return Math.ceil(-27.78 * itemSpaceHeight + 85);
-			case DISPLAY_STRATEGY_TYPE.MIDLLE:
+			case exports.DISPLAY_STRATEGY_TYPE.MIDLLE:
 				return Math.ceil(-38.9 * itemSpaceHeight + 130);
-			case DISPLAY_STRATEGY_TYPE.LARGE:
+			case exports.DISPLAY_STRATEGY_TYPE.LARGE:
 				return Math.ceil(-44.44 * itemSpaceHeight + 140);
-			case DISPLAY_STRATEGY_TYPE.EXTRA_LARGE:
+			case exports.DISPLAY_STRATEGY_TYPE.EXTRA_LARGE:
 				return Math.ceil(-92.59 * itemSpaceHeight + 300);
 		}
 	}
@@ -14793,7 +14840,7 @@ const ModelItemLabelPlugin = (five$1, params) => {
         app: undefined,
         hooks: new five.Subscribe(),
         modelOcclusionEnable: (_a = params === null || params === void 0 ? void 0 : params.modelOcclusionEnable) !== null && _a !== void 0 ? _a : true,
-        displayStrategyType: (_b = params === null || params === void 0 ? void 0 : params.displayStrategyType) !== null && _b !== void 0 ? _b : DISPLAY_STRATEGY_TYPE.SMALL,
+        displayStrategyType: (_b = params === null || params === void 0 ? void 0 : params.displayStrategyType) !== null && _b !== void 0 ? _b : exports.DISPLAY_STRATEGY_TYPE.SMALL,
     };
     pluginState.container.setAttribute('class', 'model-item-label-plugin-container');
     pluginState.container.style.cssText = `
@@ -14897,13 +14944,18 @@ const ModelItemLabelPlugin = (five$1, params) => {
     };
 };
 
-var DIRECTION;
+const modelItemLabelPluginServerParams = {
+    name: 'ModelItemLabelPlugin',
+    version: 0,
+};
+
+exports.DIRECTION = void 0;
 (function (DIRECTION) {
     DIRECTION["TOP_LEFT"] = "topLeft";
     DIRECTION["TOP_RIGHT"] = "topRight";
     DIRECTION["BOTTOM_LEFT"] = "bottomLeft";
     DIRECTION["BOTTOM_RIGHT"] = "bottomRight";
-})(DIRECTION || (DIRECTION = {}));
+})(exports.DIRECTION || (exports.DIRECTION = {}));
 
 function parseModelTVVideoPoints(points) {
     if (points.length === 0)
@@ -14912,7 +14964,7 @@ function parseModelTVVideoPoints(points) {
         return points;
     let newPoints = [];
     points.map(point => {
-        const newPoint = [point[DIRECTION.TOP_LEFT], point[DIRECTION.BOTTOM_LEFT], point[DIRECTION.BOTTOM_RIGHT], point[DIRECTION.TOP_RIGHT]];
+        const newPoint = [point[exports.DIRECTION.TOP_LEFT], point[exports.DIRECTION.BOTTOM_LEFT], point[exports.DIRECTION.BOTTOM_RIGHT], point[exports.DIRECTION.TOP_RIGHT]];
         newPoints.push(newPoint);
     });
     return newPoints;
@@ -15186,3 +15238,6 @@ exports.PanoMeasurePlugin = PanoMeasurePlugin;
 exports.PanoRulerPlugin = PanoRulerPlugin;
 exports.PanoSpatialTagPlugin = PanoSpatialTagPlugin;
 exports.TopviewFloorplanPlugin = TopviewFloorplanPlugin;
+exports.modelItemLabelPluginServerParams = modelItemLabelPluginServerParams;
+exports.modelRoomLabelPluginServerParams = modelRoomLabelPluginServerParams;
+exports.panoCompassPluginServerParams = panoCompassPluginServerParams;