@realsee/dnalogel 2.0.2 → 2.0.3

package/libs/ModelRoomLabelPlugin/RoomLabelItems.js

@@ -34,11 +34,11 @@ function add_css(target) {
 
 function get_each_context(ctx, list, i) {
 	const child_ctx = ctx.slice();
-	child_ctx[12] = list[i];
+	child_ctx[13] = list[i];
 	return child_ctx;
 }
 
-// (82:2) {#each roomLabels as roomLableItem (roomLableItem.id)}
+// (79:2) {#each roomLabels as roomLableItem (roomLableItem.id)}
 function create_each_block(key_1, ctx) {
 	let first;
 	let roomlabelitem;
@@ -46,7 +46,7 @@ function create_each_block(key_1, ctx) {
 
 	roomlabelitem = new RoomLabelItem({
 			props: {
-				roomLabel: /*roomLableItem*/ ctx[12],
+				roomLabel: /*roomLableItem*/ ctx[13],
 				five: /*five*/ ctx[1]
 			}
 		});
@@ -67,7 +67,7 @@ function create_each_block(key_1, ctx) {
 		p(new_ctx, dirty) {
 			ctx = new_ctx;
 			const roomlabelitem_changes = {};
-			if (dirty & /*roomLabels*/ 1) roomlabelitem_changes.roomLabel = /*roomLableItem*/ ctx[12];
+			if (dirty & /*roomLabels*/ 1) roomlabelitem_changes.roomLabel = /*roomLableItem*/ ctx[13];
 			if (dirty & /*five*/ 2) roomlabelitem_changes.five = /*five*/ ctx[1];
 			roomlabelitem.$set(roomlabelitem_changes);
 		},
@@ -94,7 +94,7 @@ function create_fragment(ctx) {
 	let div_resize_listener;
 	let current;
 	let each_value = /*roomLabels*/ ctx[0];
-	const get_key = ctx => /*roomLableItem*/ ctx[12].id;
+	const get_key = ctx => /*roomLableItem*/ ctx[13].id;
 
 	for (let i = 0; i < each_value.length; i += 1) {
 		let child_ctx = get_each_context(ctx, each_value, i);
@@ -161,13 +161,19 @@ function create_fragment(ctx) {
 
 function instance($$self, $$props, $$invalidate) {
 	let rendererSize;
+	var _a;
 	let { five } = $$props;
 	let { roomLabels } = $$props;
 	let containerWidth;
 	let containerHeight;
-	let shownFloor = null;
+
+	let shownFloor = (_a = five.model.shownFloor) !== null && _a !== void 0
+	? _a
+	: null;
 
 	function getLabelVisible(item) {
+		const isLabelInFloor = shownFloor === null || item.floorIndex === shownFloor;
+		if (!isLabelInFloor) return false;
 		const raycaster = new Raycaster();
 		const cameraPosition = five.camera.position.clone();
 		const position = new Vector3(item.position.x, item.position.y, item.position.z);
@@ -186,7 +192,9 @@ function instance($$self, $$props, $$invalidate) {
 		return `translate(${xOffset}px, ${yOffset}px)`;
 	}
 
-	function getFormatedRoomLabels(rendererSize) {
+	function getFormatedRoomLabels(params) {
+		const { rendererSize, shownFloor } = params;
+
 		// 因为 item distance 需要重复计算，所以缓存一下
 		const distanceMap = new Map();
 
@@ -219,7 +227,7 @@ function instance($$self, $$props, $$invalidate) {
 	}
 
 	function onFiveCameraUpdate() {
-		$$invalidate(0, roomLabels = getFormatedRoomLabels(rendererSize));
+		$$invalidate(0, roomLabels = getFormatedRoomLabels({ rendererSize, shownFloor }));
 	}
 
 	function onFiveModelShownFloorChange(floorIndex) {
@@ -251,21 +259,10 @@ function instance($$self, $$props, $$invalidate) {
 			$: $$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) {
+		if ($$self.$$.dirty & /*rendererSize, shownFloor*/ 48) {
 			$: {
-				// 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 });
-				}));
+				// rendererSize 和 shownFloor 变化时，触发 reRender
+				$$invalidate(0, roomLabels = getFormatedRoomLabels({ rendererSize, shownFloor }));
 			}
 		}
 	};

package/libs/ModelViewPlugin/Plugin.d.ts

@@ -1,4 +1,11 @@
-import type { FivePlugin } from '@realsee/five';
+import type { PartialDeep } from 'type-fest';
+import { FivePlugin } from '@realsee/five';
+export interface Config {
+    lookAtCurrentCamera: boolean;
+    lockedPanoIndex: number | null;
+    lockedLatitude: number | null;
+    lockedLongitude: number | null;
+}
 export interface ModelViewPluginExportType {
     appendTo: (element: HTMLElement, size?: {
         width?: number;
@@ -8,10 +15,14 @@ export interface ModelViewPluginExportType {
         width?: number;
         height?: number;
     }) => void;
+    changeConfigs: (config: Partial<Config>) => void;
+}
+export interface ModelViewPluginParameterType {
+    config: Config;
 }
 /**
  * Five 模型插件
  * @template ExportType 导出方法
  */
-export declare const ModelViewPlugin: FivePlugin<void, ModelViewPluginExportType>;
+export declare const ModelViewPlugin: FivePlugin<PartialDeep<ModelViewPluginParameterType> | undefined, ModelViewPluginExportType>;
 export default ModelViewPlugin;

package/libs/ModelViewPlugin/Plugin.js

@@ -1,14 +1,24 @@
+import { Camera } from '@realsee/five';
 import * as THREE from 'three';
 /**
  * Five 模型插件
  * @template ExportType 导出方法
  */
-export const ModelViewPlugin = (five) => {
+export const ModelViewPlugin = (five, params) => {
     let needsRender = true;
     let renderer = null;
+    const defaultConfig = {
+        lookAtCurrentCamera: false,
+        lockedPanoIndex: null,
+        lockedLatitude: null,
+        lockedLongitude: null,
+    };
+    const config = Object.assign(Object.assign({}, defaultConfig), params === null || params === void 0 ? void 0 : params.config);
     const scene = new THREE.Scene();
-    const camera = new THREE.PerspectiveCamera(60, 1, 0.1, 1000);
+    const camera = new Camera(60);
     let model = new THREE.Object3D();
+    let distance;
+    let offset;
     {
         const light = new THREE.DirectionalLight(0xffffff, 0.5);
         light.position.copy(new THREE.Vector3(1, 1, 1));
@@ -48,6 +58,8 @@ export const ModelViewPlugin = (five) => {
         update();
     };
     const handleModelLoaded = () => {
+        distance = getDistanceFromModel(five.model, camera.fov, camera.aspect);
+        offset = five.model.bounding.getCenter(new THREE.Vector3());
         function cloneMaterial(_material) {
             const material = _material.clone();
             material.uniforms.modelAlpha.value = 1;
@@ -107,29 +119,36 @@ export const ModelViewPlugin = (five) => {
         }
         update();
     };
-    const cameraDistance = () => {
-        const bounding = five.model.bounding;
-        const { fov, aspect } = camera;
-        const radius = Math.sqrt(Math.pow(bounding.max.x - bounding.min.x + 2, 2) +
-            Math.pow(bounding.max.y - bounding.min.y + 2, 2) +
-            Math.pow(bounding.max.z - bounding.min.z + 2, 2));
+    function getDistanceFromModel(model, fov, aspect) {
+        const bounding = model.bounding;
+        const radius = Math.pow(Math.pow(bounding.max.x - bounding.min.x + 1, 2) +
+            Math.pow(bounding.max.y - bounding.min.y + 1, 2) +
+            Math.pow(bounding.max.z - bounding.min.z + 1, 2), 1 / 2);
         // fit screen
         let distance = radius / 2 / Math.tan((Math.PI * fov) / 360);
         if (aspect < 1)
             distance = distance / aspect;
         return isNaN(distance) ? radius : distance;
-    };
+    }
+    function getOffsetFromPanoIndex(panoIndex) {
+        return five.work.observers[panoIndex].standingPosition.clone();
+    }
     const update = () => {
-        const { longitude, latitude } = five.getPose();
-        const distance = cameraDistance();
-        const lookAt = five.model.bounding.getCenter(new THREE.Vector3());
-        const longitudeDistance = distance * Math.cos(latitude);
-        const cameraPosition = new THREE.Vector3();
-        cameraPosition.x = Math.sin(longitude) * longitudeDistance + lookAt.x;
-        cameraPosition.z = Math.cos(longitude) * longitudeDistance + lookAt.z;
-        cameraPosition.y = Math.sin(latitude) * distance + lookAt.y;
-        camera.position.copy(cameraPosition);
-        camera.lookAt(lookAt);
+        if (!distance || !offset)
+            return;
+        const pose = five.getPose();
+        pose.fov = camera.fov;
+        pose.offset = offset;
+        pose.distance = distance;
+        if (typeof config.lockedLatitude === 'number')
+            pose.latitude = config.lockedLatitude;
+        if (typeof config.lockedLongitude === 'number')
+            pose.longitude = config.lockedLongitude;
+        if (typeof config.lockedPanoIndex === 'number')
+            pose.offset = getOffsetFromPanoIndex(config.lockedPanoIndex);
+        if (config.lookAtCurrentCamera)
+            pose.offset = five.camera.position.clone().setY(five.camera.position.y + 1);
+        camera.setFromPose(pose);
         needsRender = true;
     };
     const render = () => {
@@ -150,11 +169,17 @@ export const ModelViewPlugin = (five) => {
             renderer.dispose();
         renderer = null;
     };
+    const changeConfigs = (userConfig) => {
+        Object.assign(config, userConfig);
+        update();
+    };
+    Object.assign(window, { camera });
     five.on('modelLoaded', handleModelLoaded);
     five.on('modelWillLoad', handleModelWillLoad);
     five.on('cameraDirectionUpdate', update);
     five.on('dispose', dispose);
     five.on('renderFrame', render);
-    return { appendTo, refresh };
+    five.on('cameraPositionUpdate', update);
+    return { appendTo, refresh, changeConfigs };
 };
 export default ModelViewPlugin;

package/package.json

@@ -8,7 +8,7 @@
   "repository": "https://github.com/realsee-developer/dnalogel.git",
   "description": "如视 VR 看房插件合集",
   "private": false,
-  "version": "2.0.2",
+  "version": "2.0.3",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "build": "yarn run tsb && yarn run build:rollup && yarn run build:components && yarn build:docs",
@@ -46,8 +46,8 @@
     "eslint": "^8.9.0",
     "eslint-config-alloy": "^4.5.1",
     "glob": "^8.0.1",
-    "postcss": "^8.4.6",
     "polyline-normals": "^2.0.2",
+    "postcss": "^8.4.6",
     "postcss-plugin-px2rem": "^0.8.1",
     "replace": "^1.2.1",
     "rollup-plugin-multi-input": "^1.3.1",
@@ -59,7 +59,7 @@
     "svelte-strip": "^1.0.1",
     "three": "0.117.1",
     "tslib": "^2.3.1",
-    "type-fest": "^2.19.0",
+    "type-fest": "^3.0.0",
     "typedoc": "^0.22.11",
     "typescript": "^4.5.5",
     "vite": "^2.8.0"