@realsee/dnalogel 2.1.0-alpha.15 → 2.1.0-alpha.16

package/libs/floorplan/PanoFloorplanRadarPlugin/Components/Camera.svelte

@@ -0,0 +1,85 @@
+<script>import { onMount } from 'svelte';
+import { CAMERA_IMAGE } from '../../Assets/camera';
+import throttle from '../../../shared-utils/throttle';
+export let five;
+export let pxmm;
+export let floorplanData;
+export let cameraImageUrl;
+let panoIndex = five.getCurrentState().panoIndex;
+let longitude = five.getCurrentState().longitude;
+// 初始状态，不能等 mount 之后再计算，那样第一次 camera 展示的时候也会有动画
+$: positionTransform = getCameraPositionTransform(floorplanData, panoIndex);
+$: rotateTransform = getCameraRotateTransform(longitude);
+/** 获取相机在当前 Five 状态下的位移 */
+function getCameraPositionTransform(floorplanData, panoIndex) {
+    const bounding = floorplanData.bounding;
+    const floorplanObserver = floorplanData.observers[panoIndex];
+    if (!floorplanObserver)
+        return '';
+    const clientWidth = (bounding.max.x - bounding.min.x) * pxmm;
+    const clientHeight = (bounding.max.y - bounding.min.y) * pxmm;
+    const left = Math.floor(floorplanObserver.positionInImage.x * clientWidth);
+    const top = Math.floor(floorplanObserver.positionInImage.y * clientHeight);
+    return `translate(${left}px, ${top}px)`;
+}
+/** 获取相机在当前 Five 状态下的旋转 */
+function getCameraRotateTransform(longitude) {
+    // 为什么要加 45 ==> 因为 UI 给的图初始角度是 -45
+    const rotate = Math.floor((longitude / Math.PI) * 180) * -1 + 45;
+    return `rotate(${rotate}deg)`;
+}
+function onFivePanoWillArrive(_panoIndex) {
+    panoIndex = _panoIndex;
+}
+const onFiveCameraDirectionUpdate = throttle((pose) => {
+    longitude = pose.longitude;
+}, 1000 / 60);
+onMount(() => {
+    five.on('panoWillArrive', onFivePanoWillArrive);
+    five.on('cameraDirectionUpdate', onFiveCameraDirectionUpdate);
+    return function dispose() {
+        five.off('panoWillArrive', onFivePanoWillArrive);
+        five.off('cameraDirectionUpdate', onFiveCameraDirectionUpdate);
+    };
+});
+</script>
+
+<div class="plugin-radar__camera-wrapper">
+  <div class="plugin-radar__camera-position" style:transform={positionTransform}>
+    <div
+      class="plugin-radar__camera-rotate"
+      style:transform={rotateTransform}
+      style="background-image: url({cameraImageUrl || CAMERA_IMAGE})"
+    />
+  </div>
+</div>
+
+<style>
+  .plugin-radar__camera-wrapper {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    pointer-events: none;
+  }
+  .plugin-radar__camera-position {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 0;
+    height: 0;
+    transform: none;
+    pointer-events: none;
+    transition: transform 1s linear;
+  }
+  .plugin-radar__camera-rotate {
+    position: absolute;
+    left: -15px;
+    top: -15px;
+    width: 17px;
+    height: 17px;
+    transform-origin: 15px 15px;
+    transform: rotate(45deg);
+    background-repeat: no-repeat;
+    background-size: 100%;
+  }
+</style>

package/libs/floorplan/PanoFloorplanRadarPlugin/Components/CurrentFloor/CurrentFloor.js

@@ -1,4 +1,4 @@
-/* generated by Svelte v3.51.0 */
+/* generated by Svelte v3.52.0 */
 import {
 	SvelteComponent,
 	assign,

package/libs/floorplan/PanoFloorplanRadarPlugin/Components/CurrentFloor/CurrentFloor.svelte

@@ -0,0 +1,18 @@
+<script>import ExtraObjects from './ExtraObjects.svelte';
+import BaseImage from '../../../Components/BaseImage.svelte';
+import Highlight from '../../../Components/RoomHighlight/RoomHighlight.svelte';
+export let five;
+export let pxmm;
+export let floorIndex;
+export let hoverEnable;
+export let floorplanData;
+export let extraObjects = [];
+$: currentFloorExtraObjects = extraObjects === null || extraObjects === void 0 ? void 0 : extraObjects.filter((object) => object.floorIndex === floorIndex);
+const onRoomHeightClick = undefined;
+</script>
+
+<BaseImage {...{ floorIndex, floorplanData }} />
+<ExtraObjects extraObjects={currentFloorExtraObjects} />
+{#if hoverEnable}
+  <Highlight {...{ five, pxmm, floorIndex, floorplanData, onRoomHeightClick }} />
+{/if}

package/libs/floorplan/PanoFloorplanRadarPlugin/Components/CurrentFloor/ExtraObjects.js

@@ -1,4 +1,4 @@
-/* generated by Svelte v3.51.0 */
+/* generated by Svelte v3.52.0 */
 import {
 	SvelteComponent,
 	append,
@@ -45,11 +45,11 @@ function create_each_block(key_1, ctx) {
 			t = space();
 			attr(div0, "class", "plugin-pano-floorplan__extra-object-item svelte-1i87fz7");
 			set_style(div0, "background-image", `url(${/*extraObject*/ ctx[1].icon.url})`);
-			set_style(div0, "width", style_width, false);
-			set_style(div0, "height", style_height, false);
+			set_style(div0, "width", style_width);
+			set_style(div0, "height", style_height);
 			attr(div1, "class", "plugin-pano-floorplan__extra-object-item--position svelte-1i87fz7");
-			set_style(div1, "top", style_top, false);
-			set_style(div1, "left", style_left, false);
+			set_style(div1, "top", style_top);
+			set_style(div1, "left", style_left);
 			this.first = div1;
 		},
 		m(target, anchor) {
@@ -65,19 +65,19 @@ function create_each_block(key_1, ctx) {
 			}
 
 			if (dirty & /*extraObjects*/ 1 && style_width !== (style_width = `${/*extraObject*/ ctx[1].icon.width / 16}rem`)) {
-				set_style(div0, "width", style_width, false);
+				set_style(div0, "width", style_width);
 			}
 
 			if (dirty & /*extraObjects*/ 1 && style_height !== (style_height = `${/*extraObject*/ ctx[1].icon.height / 16}rem`)) {
-				set_style(div0, "height", style_height, false);
+				set_style(div0, "height", style_height);
 			}
 
 			if (dirty & /*extraObjects*/ 1 && style_top !== (style_top = `${/*extraObject*/ ctx[1].positionInImage.y * 100}%`)) {
-				set_style(div1, "top", style_top, false);
+				set_style(div1, "top", style_top);
 			}
 
 			if (dirty & /*extraObjects*/ 1 && style_left !== (style_left = `${/*extraObject*/ ctx[1].positionInImage.x * 100}%`)) {
-				set_style(div1, "left", style_left, false);
+				set_style(div1, "left", style_left);
 			}
 		},
 		d(detaching) {

package/libs/floorplan/PanoFloorplanRadarPlugin/Components/CurrentFloor/ExtraObjects.svelte

@@ -0,0 +1,40 @@
+<script>export let extraObjects = [];
+</script>
+
+<div class="plugin-pano-floorplan__extra-objects">
+  {#each extraObjects as extraObject (extraObject.id)}
+    <div
+      class="plugin-pano-floorplan__extra-object-item--position"
+      style:top="{extraObject.positionInImage.y * 100}%"
+      style:left="{extraObject.positionInImage.x * 100}%"
+    >
+      <div
+        class="plugin-pano-floorplan__extra-object-item"
+        style:width="{extraObject.icon.width / 16}rem"
+        style:height="{extraObject.icon.height / 16}rem"
+        style="background-image: {`url(${extraObject.icon.url})`}"
+      />
+    </div>
+  {/each}
+</div>
+
+<style>
+  .plugin-pano-floorplan__extra-objects {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    pointer-events: none;
+  }
+
+  .plugin-pano-floorplan__extra-object-item--position {
+    position: absolute;
+    width: 0;
+    height: 0;
+  }
+
+  .plugin-pano-floorplan__extra-object-item {
+    transform: translate(-50%, -50%);
+  }
+</style>

package/libs/floorplan/PanoFloorplanRadarPlugin/Components/Main.js

@@ -1,4 +1,4 @@
-/* generated by Svelte v3.51.0 */
+/* generated by Svelte v3.52.0 */
 import {
 	SvelteComponent,
 	add_render_callback,
@@ -147,8 +147,8 @@ function create_if_block_1(ctx) {
 			t = space();
 			create_component(camera.$$.fragment);
 			attr(div, "class", "plugin-floorplan-radar-container svelte-1mvqyqq");
-			set_style(div, "width", style_width, false);
-			set_style(div, "height", style_height, false);
+			set_style(div, "width", style_width);
+			set_style(div, "height", style_height);
 		},
 		m(target, anchor) {
 			insert(target, div, anchor);
@@ -187,11 +187,11 @@ function create_if_block_1(ctx) {
 			camera.$set(camera_changes);
 
 			if (dirty & /*contentWidth*/ 256 && style_width !== (style_width = `${/*contentWidth*/ ctx[8]}px`)) {
-				set_style(div, "width", style_width, false);
+				set_style(div, "width", style_width);
 			}
 
 			if (dirty & /*contentHeight*/ 2048 && style_height !== (style_height = `${/*contentHeight*/ ctx[11]}px`)) {
-				set_style(div, "height", style_height, false);
+				set_style(div, "height", style_height);
 			}
 		},
 		i(local) {

package/libs/floorplan/PanoFloorplanRadarPlugin/Components/Main.svelte

@@ -0,0 +1,64 @@
+<script>import { onMount } from 'svelte';
+import Camera from './Camera.svelte';
+import CurrentFloor from './CurrentFloor/CurrentFloor.svelte';
+export let five;
+export let visible;
+export let hoverEnable;
+export let floorplanData;
+export let cameraImageUrl;
+export let extraObjects = [];
+let pxmm = 0;
+let floorIndex = 0;
+let clientWidth = 0;
+let clientHeight = 0;
+let contentWidth = 0;
+let contentHeight = 0;
+$: {
+    const size = Math.min(clientWidth, clientHeight);
+    const { max, min } = floorplanData.bounding;
+    const boundingWidth = max.x - min.x;
+    const boundingHeight = max.y - min.y;
+    const contentSize = (function getSize() {
+        if (boundingWidth > boundingHeight)
+            return [size, (size / boundingWidth) * boundingHeight];
+        return [(size / boundingHeight) * boundingWidth, size];
+    })();
+    contentWidth = contentSize[0];
+    contentHeight = contentSize[1];
+    pxmm = contentWidth / boundingWidth;
+}
+function handlePanoArrived(panoIndex) {
+    floorIndex = five.work.observers[panoIndex].floorIndex;
+}
+onMount(() => {
+    five.on('panoArrived', handlePanoArrived);
+    return () => {
+        five.off('panoArrived', handlePanoArrived);
+    };
+});
+</script>
+
+{#if visible}
+  <div class="plugin-floorplan-radar" bind:clientWidth bind:clientHeight>
+    {#if clientWidth !== 0}
+      <div class="plugin-floorplan-radar-container" style:width="{contentWidth}px" style:height="{contentHeight}px">
+        <CurrentFloor {...{ five, pxmm, floorIndex, floorplanData, hoverEnable, extraObjects }} />
+        <Camera {...{ pxmm, five, floorplanData, cameraImageUrl }} />
+      </div>
+    {/if}
+  </div>
+{/if}
+
+<style>
+  .plugin-floorplan-radar {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+
+  .plugin-floorplan-radar-container {
+    position: relative;
+  }
+</style>

package/libs/floorplan/PanoFloorplanRadarPlugin/Controller.js

@@ -1,4 +1,4 @@
-import Main from './Components/Main';
+import Main from './Components/Main.svelte';
 import equal from '../../shared-utils/equal';
 import { CAMERA_IMAGE } from '../Assets/camera';
 import * as BasePlugin from '../../base/BasePluginWithData';

package/libs/floorplan/TopviewFloorplanPlugin/Controller.js

@@ -1,6 +1,6 @@
 import * as THREE from 'three';
 import equal from '../../shared-utils/equal';
-import Main from '../Components/Main';
+import Main from '../Components/Main.svelte';
 import formatData from '../utils/formatData';
 import { CAMERA_IMAGE } from '../Assets/camera';
 import { omit } from '../../shared-utils/filter';

package/package.json

@@ -8,7 +8,7 @@
   "repository": "https://github.com/realsee-developer/dnalogel.git",
   "description": "如视 VR 看房插件合集",
   "private": false,
-  "version": "2.1.0-alpha.15",
+  "version": "2.1.0-alpha.16",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "build": "yarn run tsb && yarn run build:rollup && yarn run build:components && yarn build:docs",
@@ -47,8 +47,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",

package/libs/node_modules/brace-expansion/index.d.ts

@@ -1,2 +0,0 @@
-export = expandTop;
-declare function expandTop(str: any): any;

package/libs/node_modules/brace-expansion/index.js

@@ -1,177 +0,0 @@
-var balanced = require('balanced-match');
-module.exports = expandTop;
-var escSlash = '\0SLASH' + Math.random() + '\0';
-var escOpen = '\0OPEN' + Math.random() + '\0';
-var escClose = '\0CLOSE' + Math.random() + '\0';
-var escComma = '\0COMMA' + Math.random() + '\0';
-var escPeriod = '\0PERIOD' + Math.random() + '\0';
-function numeric(str) {
-    return parseInt(str, 10) == str
-        ? parseInt(str, 10)
-        : str.charCodeAt(0);
-}
-function escapeBraces(str) {
-    return str.split('\\\\').join(escSlash)
-        .split('\\{').join(escOpen)
-        .split('\\}').join(escClose)
-        .split('\\,').join(escComma)
-        .split('\\.').join(escPeriod);
-}
-function unescapeBraces(str) {
-    return str.split(escSlash).join('\\')
-        .split(escOpen).join('{')
-        .split(escClose).join('}')
-        .split(escComma).join(',')
-        .split(escPeriod).join('.');
-}
-// Basically just str.split(","), but handling cases
-// where we have nested braced sections, which should be
-// treated as individual members, like {a,{b,c},d}
-function parseCommaParts(str) {
-    if (!str)
-        return [''];
-    var parts = [];
-    var m = balanced('{', '}', str);
-    if (!m)
-        return str.split(',');
-    var pre = m.pre;
-    var body = m.body;
-    var post = m.post;
-    var p = pre.split(',');
-    p[p.length - 1] += '{' + body + '}';
-    var postParts = parseCommaParts(post);
-    if (post.length) {
-        p[p.length - 1] += postParts.shift();
-        p.push.apply(p, postParts);
-    }
-    parts.push.apply(parts, p);
-    return parts;
-}
-function expandTop(str) {
-    if (!str)
-        return [];
-    // I don't know why Bash 4.3 does this, but it does.
-    // Anything starting with {} will have the first two bytes preserved
-    // but *only* at the top level, so {},a}b will not expand to anything,
-    // but a{},b}c will be expanded to [a}c,abc].
-    // One could argue that this is a bug in Bash, but since the goal of
-    // this module is to match Bash's rules, we escape a leading {}
-    if (str.substr(0, 2) === '{}') {
-        str = '\\{\\}' + str.substr(2);
-    }
-    return expand(escapeBraces(str), true).map(unescapeBraces);
-}
-function embrace(str) {
-    return '{' + str + '}';
-}
-function isPadded(el) {
-    return /^-?0\d/.test(el);
-}
-function lte(i, y) {
-    return i <= y;
-}
-function gte(i, y) {
-    return i >= y;
-}
-function expand(str, isTop) {
-    var expansions = [];
-    var m = balanced('{', '}', str);
-    if (!m)
-        return [str];
-    // no need to expand pre, since it is guaranteed to be free of brace-sets
-    var pre = m.pre;
-    var post = m.post.length
-        ? expand(m.post, false)
-        : [''];
-    if (/\$$/.test(m.pre)) {
-        for (var k = 0; k < post.length; k++) {
-            var expansion = pre + '{' + m.body + '}' + post[k];
-            expansions.push(expansion);
-        }
-    }
-    else {
-        var isNumericSequence = /^-?\d+\.\.-?\d+(?:\.\.-?\d+)?$/.test(m.body);
-        var isAlphaSequence = /^[a-zA-Z]\.\.[a-zA-Z](?:\.\.-?\d+)?$/.test(m.body);
-        var isSequence = isNumericSequence || isAlphaSequence;
-        var isOptions = m.body.indexOf(',') >= 0;
-        if (!isSequence && !isOptions) {
-            // {a},b}
-            if (m.post.match(/,.*\}/)) {
-                str = m.pre + '{' + m.body + escClose + m.post;
-                return expand(str);
-            }
-            return [str];
-        }
-        var n;
-        if (isSequence) {
-            n = m.body.split(/\.\./);
-        }
-        else {
-            n = parseCommaParts(m.body);
-            if (n.length === 1) {
-                // x{{a,b}}y ==> x{a}y x{b}y
-                n = expand(n[0], false).map(embrace);
-                if (n.length === 1) {
-                    return post.map(function (p) {
-                        return m.pre + n[0] + p;
-                    });
-                }
-            }
-        }
-        // at this point, n is the parts, and we know it's not a comma set
-        // with a single entry.
-        var N;
-        if (isSequence) {
-            var x = numeric(n[0]);
-            var y = numeric(n[1]);
-            var width = Math.max(n[0].length, n[1].length);
-            var incr = n.length == 3
-                ? Math.abs(numeric(n[2]))
-                : 1;
-            var test = lte;
-            var reverse = y < x;
-            if (reverse) {
-                incr *= -1;
-                test = gte;
-            }
-            var pad = n.some(isPadded);
-            N = [];
-            for (var i = x; test(i, y); i += incr) {
-                var c;
-                if (isAlphaSequence) {
-                    c = String.fromCharCode(i);
-                    if (c === '\\')
-                        c = '';
-                }
-                else {
-                    c = String(i);
-                    if (pad) {
-                        var need = width - c.length;
-                        if (need > 0) {
-                            var z = new Array(need + 1).join('0');
-                            if (i < 0)
-                                c = '-' + z + c.slice(1);
-                            else
-                                c = z + c;
-                        }
-                    }
-                }
-                N.push(c);
-            }
-        }
-        else {
-            N = [];
-            for (var j = 0; j < n.length; j++) {
-                N.push.apply(N, expand(n[j], false));
-            }
-        }
-        for (var j = 0; j < N.length; j++) {
-            for (var k = 0; k < post.length; k++) {
-                var expansion = pre + N[j] + post[k];
-                if (!isTop || isSequence || expansion)
-                    expansions.push(expansion);
-            }
-        }
-    }
-    return expansions;
-}

package/libs/node_modules/glob/common.d.ts

@@ -1,7 +0,0 @@
-export function setopts(self: any, pattern: any, options: any): void;
-export function ownProp(obj: any, field: any): any;
-export function makeAbs(self: any, f: any): any;
-export function finish(self: any): void;
-export function mark(self: any, p: any): any;
-export function isIgnored(self: any, path: any): any;
-export function childrenIgnored(self: any, path: any): any;