@realsee/dnalogel 2.0.0-alpha.12 → 2.0.0-alpha.15

package/dist/ModelItemLabelPlugin/index.js

@@ -149,6 +149,21 @@ class ItemLabelItem extends internal.SvelteComponent {
 	}
 }
 
+/**
+ * 创建一个防抖动函数，该函数会在 wait 毫秒后调用 func 方法
+ * @param func - 要防抖动的函数
+ * @param [wait=0] - 需要延迟的毫秒数
+ */
+function debounce(func, wait = 200) {
+    let last;
+    return function (...args) {
+        clearTimeout(last);
+        last = setTimeout(() => {
+            func(...args);
+        }, wait);
+    };
+}
+
 /* src/ModelItemLabelPlugin/ItemLabelComponent.svelte generated by Svelte v3.47.0 */
 
 function add_css(target) {
@@ -157,11 +172,11 @@ function add_css(target) {
 
 function get_each_context(ctx, list, i) {
 	const child_ctx = ctx.slice();
-	child_ctx[26] = list[i];
+	child_ctx[27] = list[i];
 	return child_ctx;
 }
 
-// (179:1) {#each renderItemLabels as itemLabelItem (itemLabelItem.id)}
+// (159:1) {#each renderItemLabels as itemLabelItem (itemLabelItem.id)}
 function create_each_block(key_1, ctx) {
 	let first;
 	let itemlabelitem;
@@ -169,7 +184,7 @@ function create_each_block(key_1, ctx) {
 
 	itemlabelitem = new ItemLabelItem({
 			props: {
-				itemLabel: /*itemLabelItem*/ ctx[26],
+				itemLabel: /*itemLabelItem*/ ctx[27],
 				hooks: /*hooks*/ ctx[0]
 			}
 		});
@@ -190,7 +205,7 @@ function create_each_block(key_1, ctx) {
 		p(new_ctx, dirty) {
 			ctx = new_ctx;
 			const itemlabelitem_changes = {};
-			if (dirty & /*renderItemLabels*/ 2) itemlabelitem_changes.itemLabel = /*itemLabelItem*/ ctx[26];
+			if (dirty & /*renderItemLabels*/ 2) itemlabelitem_changes.itemLabel = /*itemLabelItem*/ ctx[27];
 			if (dirty & /*hooks*/ 1) itemlabelitem_changes.hooks = /*hooks*/ ctx[0];
 			itemlabelitem.$set(itemlabelitem_changes);
 		},
@@ -217,7 +232,7 @@ function create_fragment(ctx) {
 	let div_resize_listener;
 	let current;
 	let each_value = /*renderItemLabels*/ ctx[1];
-	const get_key = ctx => /*itemLabelItem*/ ctx[26].id;
+	const get_key = ctx => /*itemLabelItem*/ ctx[27].id;
 
 	for (let i = 0; i < each_value.length; i += 1) {
 		let child_ctx = get_each_context(ctx, each_value, i);
@@ -234,7 +249,8 @@ function create_fragment(ctx) {
 			}
 
 			internal.attr(div, "class", "item-labels-container svelte-rmdeb");
-			internal.add_render_callback(() => /*div_elementresize_handler*/ ctx[9].call(div));
+			internal.add_render_callback(() => /*div_elementresize_handler*/ ctx[10].call(div));
+			internal.set_style(div, "opacity", /*itemsVisible*/ ctx[4] ? 1 : 0, false);
 		},
 		m(target, anchor) {
 			internal.insert(target, div, anchor);
@@ -243,7 +259,7 @@ function create_fragment(ctx) {
 				each_blocks[i].m(div, null);
 			}
 
-			div_resize_listener = internal.add_resize_listener(div, /*div_elementresize_handler*/ ctx[9].bind(div));
+			div_resize_listener = internal.add_resize_listener(div, /*div_elementresize_handler*/ ctx[10].bind(div));
 			current = true;
 		},
 		p(ctx, [dirty]) {
@@ -253,6 +269,10 @@ function create_fragment(ctx) {
 				each_blocks = internal.update_keyed_each(each_blocks, dirty, get_key, 1, ctx, each_value, each_1_lookup, div, internal.outro_and_destroy_block, create_each_block, null, get_each_context);
 				internal.check_outros();
 			}
+
+			if (dirty & /*itemsVisible*/ 16) {
+				internal.set_style(div, "opacity", /*itemsVisible*/ ctx[4] ? 1 : 0, false);
+			}
 		},
 		i(local) {
 			if (current) return;
@@ -302,6 +322,14 @@ function instance($$self, $$props, $$invalidate) {
 	// 计算重叠
 	let cssOffsetLists = [];
 
+	// 动画过程中 itemsVisible 为 false
+	let itemsVisible = true;
+
+	/**
+ * 可见性策略：
+ * 1、当前楼层(假设先不考虑多楼层)
+ * 2、模型未被遮挡（一个 box 有没有被遮挡的计算？ TODO）
+ * */
 	const getLabelVisible = (five, itemLabel) => {
 		// 虚拟 VR 仅有一层，不考虑楼层信息
 		const raycaster = new Raycaster();
@@ -321,8 +349,15 @@ function instance($$self, $$props, $$invalidate) {
 	const getLabelCssOffset = (five, itemLabel) => {
 		const modelPosition = new Vector3(itemLabel.modelPosition[0], itemLabel.modelPosition[1], itemLabel.modelPosition[2]);
 		const cssPosition = five.project2d(modelPosition);
-		const xOffset = cssPosition?.x;
-		const yOffset = cssPosition?.y;
+
+		const xOffset = cssPosition === null || cssPosition === void 0
+		? void 0
+		: cssPosition.x;
+
+		const yOffset = cssPosition === null || cssPosition === void 0
+		? void 0
+		: cssPosition.y;
+
 		return [xOffset, yOffset];
 	};
 
@@ -364,18 +399,13 @@ function instance($$self, $$props, $$invalidate) {
 			: true;
 
 			const visible = naturalVisible && !isOverlap([cssOffset[0], cssOffset[1] + strokeLength], curLabelWidth);
-			if (!visible) return { ...label, visible };
+			if (!visible) return Object.assign(Object.assign({}, label), { visible });
 			cssOffsetLists.push(cssOffset);
 
 			// position
 			const transform = getLabelTransform(cssOffset);
 
-			return {
-				...label,
-				visible,
-				transform,
-				strokeLength
-			};
+			return Object.assign(Object.assign({}, label), { visible, transform, strokeLength });
 		});
 
 		const sortedItemLabelItems = newLabels.filter(({ visible }) => visible).map(label => ({
@@ -385,7 +415,7 @@ function instance($$self, $$props, $$invalidate) {
 
 		return newLabels.map(label => {
 			const sortIndex = sortedItemLabelItems.findIndex(item => item.itemLabelItem.id === label.id);
-			if (sortIndex !== undefined) return { ...label, zIndex: sortIndex * 10 };
+			if (sortIndex !== undefined) return Object.assign(Object.assign({}, label), { zIndex: sortIndex * 10 });
 			return label;
 		});
 	};
@@ -403,11 +433,22 @@ function instance($$self, $$props, $$invalidate) {
 		$$invalidate(1, renderItemLabels = itemLabels);
 		curItemLabels = itemLabels;
 		onItemLabelUpdate();
-
-		// five.on('cameraUpdate', onItemLabelUpdate)
 		addResizeListener();
+
+		five.on('cameraUpdate', () => {
+			$$invalidate(4, itemsVisible = false);
+			handleCameraUpdate();
+		});
 	});
 
+	const handleCameraUpdate = debounce(
+		() => {
+			$$invalidate(4, itemsVisible = true);
+			onItemLabelUpdate();
+		},
+		300
+	);
+
 	const addResizeListener = () => {
 		wrapperSize = {
 			width: wrapper.clientWidth,
@@ -421,7 +462,6 @@ function instance($$self, $$props, $$invalidate) {
 		if (curItemLabels !== itemLabels) {
 			$$invalidate(1, renderItemLabels = itemLabels);
 			curItemLabels = itemLabels;
-			console.log('--debug--update--');
 			onItemLabelUpdate();
 		}
 	};
@@ -439,9 +479,8 @@ function instance($$self, $$props, $$invalidate) {
 		});
 
 	svelte.onDestroy(() => {
-		// five.off('cameraUpdate', onItemLabelUpdate)
+		five.off('cameraUpdate');
 		resizeObserver.unobserve(wrapper);
-
 		curItemLabels = null;
 		$$invalidate(1, renderItemLabels = null);
 		wrapperSize = { width: 0, height: 0 };
@@ -455,12 +494,12 @@ function instance($$self, $$props, $$invalidate) {
 	}
 
 	$$self.$$set = $$props => {
-		if ('five' in $$props) $$invalidate(4, five = $$props.five);
-		if ('modelOcclusionEnable' in $$props) $$invalidate(5, modelOcclusionEnable = $$props.modelOcclusionEnable);
-		if ('itemLabels' in $$props) $$invalidate(6, itemLabels = $$props.itemLabels);
-		if ('wrapper' in $$props) $$invalidate(7, wrapper = $$props.wrapper);
+		if ('five' in $$props) $$invalidate(5, five = $$props.five);
+		if ('modelOcclusionEnable' in $$props) $$invalidate(6, modelOcclusionEnable = $$props.modelOcclusionEnable);
+		if ('itemLabels' in $$props) $$invalidate(7, itemLabels = $$props.itemLabels);
+		if ('wrapper' in $$props) $$invalidate(8, wrapper = $$props.wrapper);
 		if ('hooks' in $$props) $$invalidate(0, hooks = $$props.hooks);
-		if ('displayStrategyType' in $$props) $$invalidate(8, displayStrategyType = $$props.displayStrategyType);
+		if ('displayStrategyType' in $$props) $$invalidate(9, displayStrategyType = $$props.displayStrategyType);
 	};
 
 	return [
@@ -468,6 +507,7 @@ function instance($$self, $$props, $$invalidate) {
 		renderItemLabels,
 		containerWidth,
 		containerHeight,
+		itemsVisible,
 		five,
 		modelOcclusionEnable,
 		itemLabels,
@@ -488,12 +528,12 @@ class ItemLabelComponent extends internal.SvelteComponent {
 			create_fragment,
 			internal.safe_not_equal,
 			{
-				five: 4,
-				modelOcclusionEnable: 5,
-				itemLabels: 6,
-				wrapper: 7,
+				five: 5,
+				modelOcclusionEnable: 6,
+				itemLabels: 7,
+				wrapper: 8,
 				hooks: 0,
-				displayStrategyType: 8
+				displayStrategyType: 9
 			},
 			add_css
 		);
@@ -502,13 +542,11 @@ class ItemLabelComponent extends internal.SvelteComponent {
 
 /** @description 转成内部所需数据 */
 function parseModelItemLabelPluginData(data) {
-    return data.model_item_labels.map(label => ({
-        modelPosition: [label.position[0], label.position[1] + label.size[1], label.position[2]],
-        ...label
-    }));
+    return data.model_item_labels.map(label => (Object.assign({ modelPosition: [label.position[0], label.position[1] + label.size[1], label.position[2]] }, label)));
 }
 
 const ModelItemLabelPlugin = (five$1, params) => {
+    var _a, _b;
     const pluginState = {
         container: document.createElement('div'),
         data: null,
@@ -518,8 +556,8 @@ const ModelItemLabelPlugin = (five$1, params) => {
         wrapper: null,
         app: undefined,
         hooks: new five.Subscribe(),
-        modelOcclusionEnable: params?.modelOcclusionEnable ?? true,
-        displayStrategyType: params?.displayStrategyType ?? DISPLAY_STRATEGY_TYPE.SMALL
+        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,
     };
     pluginState.container.setAttribute('class', 'model-item-label-plugin-container');
     pluginState.container.style.cssText = `
@@ -528,8 +566,8 @@ const ModelItemLabelPlugin = (five$1, params) => {
         top: 0;
         width: 100%;
         height: 100%;
-        pointerEvents: none;
     `;
+    pluginState.container.style.pointerEvents = 'none'; // 写到 cssText 里不生效
     const appendTo = (wrapper) => {
         pluginState.wrapper = wrapper;
         wrapper.appendChild(pluginState.container);
@@ -537,7 +575,6 @@ const ModelItemLabelPlugin = (five$1, params) => {
         return true;
     };
     const load = (data) => {
-        console.log('🐶--当前标签总条数： ', data.model_item_labels.length);
         pluginState.itemLabels = parseModelItemLabelPluginData(data);
         render();
     };
@@ -559,46 +596,13 @@ const ModelItemLabelPlugin = (five$1, params) => {
         removeListener4Five();
         pluginState.container.remove();
     };
-    const handleRerender = () => {
-        if (!pluginState.enabled || !pluginState.fiveModeEnabled)
-            return;
-        disable();
-    };
-    const rerender = (a, b, c) => {
-        if (!pluginState.fiveModeEnabled)
-            return;
-        if (!c)
-            return;
-        enable();
-        render();
-    };
-    const handleInteriaPanRerender = (a, b) => {
-        if (!pluginState.fiveModeEnabled)
-            return;
-        if (!b)
-            return;
-        enable();
-        render();
-    };
-    const handleWantsPanGesture = (pose, final) => {
-        if (pose) {
-            handleRerender();
-        }
-    };
-    const handlePanGesture = (pose, final) => {
-        if (!pluginState.fiveModeEnabled)
-            return;
-        if (!final)
-            return;
-        enable();
-        render();
-    };
     const render = () => {
+        var _a;
         if (!pluginState.wrapper)
             return;
         // 只要不可展示，销毁容器
         if (!pluginState.enabled || !pluginState.fiveModeEnabled) {
-            pluginState.app?.$destroy();
+            (_a = pluginState.app) === null || _a === void 0 ? void 0 : _a.$destroy();
             pluginState.app = undefined;
             return;
         }
@@ -627,32 +631,14 @@ const ModelItemLabelPlugin = (five$1, params) => {
     const addListener4Five = () => {
         five$1.on('modeChange', onFiveModeChange);
         five$1.once('dispose', dispose);
-        // five.on('wantsGesture', handleRerender)
-        // five.on('gesture', rerender)
-        five$1.on('wantsMouseWheel', handleRerender);
-        five$1.on('mouseWheel', rerender);
-        five$1.on('wantsInteriaPan', handleRerender);
-        five$1.on('interiaPan', handleInteriaPanRerender);
-        five$1.on('wantsPanGesture', handleWantsPanGesture);
-        five$1.on('panGesture', handlePanGesture);
-        five$1.on('wantsPinchGesture', handleRerender);
-        five$1.on('pinchGesture', rerender);
     };
     // 取消 five 监听
     const removeListener4Five = () => {
         five$1.off('modeChange', onFiveModeChange);
-        // five.off('wantsGesture', handleRerender)
-        // five.off('gesture', rerender)
-        five$1.off('wantsMouseWheel', handleRerender);
-        five$1.off('mouseWheel', rerender);
-        five$1.off('wantsInteriaPan', handleRerender);
-        five$1.off('interiaPan', handleInteriaPanRerender);
-        five$1.off('wantsPanGesture', handleWantsPanGesture);
-        five$1.off('panGesture', handlePanGesture);
-        five$1.off('wantsPinchGesture', handleRerender);
-        five$1.off('pinchGesture', rerender);
     };
     const onFiveModeChange = (mode) => {
+        if (!pluginState.enabled)
+            return;
         if (mode !== five.Five.Mode.Floorplan) {
             pluginState.fiveModeEnabled = false;
             render();

package/dist/ModelRoomLabelPlugin/index.js

@@ -278,12 +278,12 @@ function instance($$self, $$props, $$invalidate) {
 			// 计算是否可见，如果不可见，不会更新位置
 			const visible = getLabelVisible(five, roomLabelItem);
 
-			if (!visible) return { ...roomLabelItem, visible };
+			if (!visible) return Object.assign(Object.assign({}, roomLabelItem), { visible });
 
 			// 更新位置
 			const transform = getLabelTransform(five, roomLabelItem);
 
-			return { ...roomLabelItem, visible, transform };
+			return Object.assign(Object.assign({}, roomLabelItem), { visible, transform });
 		});
 
 		const sortedRoomLabelItems = newLabels.filter(({ visible }) => visible).map(roomLabelItem => ({
@@ -293,7 +293,7 @@ function instance($$self, $$props, $$invalidate) {
 
 		return newLabels.map(roomLabelItem => {
 			const sortIndex = sortedRoomLabelItems.findIndex(item => item.roomLabelItem.id === roomLabelItem.id);
-			if (sortIndex !== undefined) return { ...roomLabelItem, zIndex: sortIndex * 10 };
+			if (sortIndex !== undefined) return Object.assign(Object.assign({}, roomLabelItem), { zIndex: sortIndex * 10 });
 			return roomLabelItem;
 		});
 	}
@@ -352,14 +352,69 @@ function parseModelRoomLabelPluginData(data) {
 }
 
 class ModelRoomLabelController {
-    five;
-    enabled = true;
-    fiveModeEnabled;
-    app = undefined;
-    wrapper;
-    roomLabels = [];
-    container = document.createElement('div');
     constructor(five) {
+        Object.defineProperty(this, "five", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "enabled", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: true
+        });
+        Object.defineProperty(this, "fiveModeEnabled", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "app", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: undefined
+        });
+        Object.defineProperty(this, "wrapper", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "roomLabels", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: []
+        });
+        Object.defineProperty(this, "container", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: document.createElement('div')
+        });
+        /** 监听 Five Mode 变化
+         * @description
+         * Mode 不符合要求时，立刻消失，满足要求时，需要等待动画结束再展示
+         */
+        Object.defineProperty(this, "onFiveModeChange", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (mode) => {
+                if (mode !== 'Floorplan') {
+                    this.fiveModeEnabled = false;
+                    this.render();
+                    return;
+                }
+                this.five.once('initAnimationEnded', () => {
+                    this.fiveModeEnabled = this.five.currentMode === 'Floorplan';
+                    this.render();
+                });
+            }
+        });
         this.five = five;
         this.fiveModeEnabled = this.five.currentMode === 'Floorplan';
         // init container style
@@ -412,26 +467,12 @@ class ModelRoomLabelController {
         this.render();
         return this;
     }
-    /** 监听 Five Mode 变化
-     * @description
-     * Mode 不符合要求时，立刻消失，满足要求时，需要等待动画结束再展示
-     */
-    onFiveModeChange = (mode) => {
-        if (mode !== 'Floorplan') {
-            this.fiveModeEnabled = false;
-            this.render();
-            return;
-        }
-        this.five.once('initAnimationEnded', () => {
-            this.fiveModeEnabled = this.five.currentMode === 'Floorplan';
-            this.render();
-        });
-    };
     render() {
+        var _a;
         if (!this.wrapper)
             return;
         if (!this.enabled || !this.fiveModeEnabled) {
-            this.app?.$destroy();
+            (_a = this.app) === null || _a === void 0 ? void 0 : _a.$destroy();
             this.app = undefined;
             return;
         }

package/dist/ModelTVVideoPlugin/index.d.ts

@@ -0,0 +1,4 @@
+import type { FivePlugin } from '@realsee/five';
+import { ModelTVVideoPluginExportType, ModelTVVideoPluginParameterType } from "./typings";
+export declare const ModelTVVideoPlugin: FivePlugin<ModelTVVideoPluginParameterType, ModelTVVideoPluginExportType>;
+export default ModelTVVideoPlugin;