@realsee/dnalogel 2.0.0-alpha.2 → 2.0.0-alpha.22

package/libs/shared-utils/animationFrame/BetterTween.js

@@ -1,24 +1,53 @@
 import TWEEN from '@tweenjs/tween.js';
 import { requestAnimationFrameInterval } from './index';
 export class BetterTween extends TWEEN.Tween {
-    disposeMethods = [];
-    animationFrameDisposer;
-    onDispose = (callback) => {
-        this.disposeMethods.push(callback);
-        return this;
-    };
-    play = () => {
-        this.start(0);
-        this.animationFrameDisposer = requestAnimationFrameInterval((time) => this.update(time));
-        return this;
-    };
-    dispose = () => {
-        this.stop();
-        this.animationFrameDisposer?.();
-        this.disposeMethods.forEach((fn) => fn());
-        this.disposeMethods = [];
-        TWEEN.remove(this);
-    };
+    constructor() {
+        super(...arguments);
+        Object.defineProperty(this, "disposeMethods", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: []
+        });
+        Object.defineProperty(this, "animationFrameDisposer", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "onDispose", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (callback) => {
+                this.disposeMethods.push(callback);
+                return this;
+            }
+        });
+        Object.defineProperty(this, "play", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: () => {
+                this.start(0);
+                this.animationFrameDisposer = requestAnimationFrameInterval((time) => this.update(time));
+                return this;
+            }
+        });
+        Object.defineProperty(this, "dispose", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: () => {
+                var _a;
+                this.stop();
+                (_a = this.animationFrameDisposer) === null || _a === void 0 ? void 0 : _a.call(this);
+                this.disposeMethods.forEach((fn) => fn());
+                this.disposeMethods = [];
+                TWEEN.remove(this);
+            }
+        });
+    }
 }
 export function tweenProgress(duration, easing = TWEEN.Easing.Linear.None) {
     const tween = new BetterTween({ progress: 0 }).to({ progress: 1 });

package/libs/shared-utils/createCanvasTextTexture.js

@@ -1,10 +1,11 @@
 import { CanvasTexture } from 'three';
 export default function createCanvasTextTexture(text, config) {
-    const size = config?.size ?? 512;
-    const fontSize = config?.fontSize ?? size * (35 / 256) * 1.2;
-    const backgroundColor = config?.backgroundColor ?? 'rgba(0,0,0,0)';
-    const fontColor = config?.fontColor ?? '#fff';
-    const textAlign = config?.textAlign ?? 'center';
+    var _a, _b, _c, _d, _e;
+    const size = (_a = config === null || config === void 0 ? void 0 : config.size) !== null && _a !== void 0 ? _a : 512;
+    const fontSize = (_b = config === null || config === void 0 ? void 0 : config.fontSize) !== null && _b !== void 0 ? _b : size * (35 / 256) * 1.2;
+    const backgroundColor = (_c = config === null || config === void 0 ? void 0 : config.backgroundColor) !== null && _c !== void 0 ? _c : 'rgba(0,0,0,0)';
+    const fontColor = (_d = config === null || config === void 0 ? void 0 : config.fontColor) !== null && _d !== void 0 ? _d : '#fff';
+    const textAlign = (_e = config === null || config === void 0 ? void 0 : config.textAlign) !== null && _e !== void 0 ? _e : 'center';
     const canvas = document.createElement('canvas');
     canvas.setAttribute('width', size + '');
     canvas.setAttribute('height', size + '');

package/libs/shared-utils/getPxmm.d.ts

@@ -1,6 +1,11 @@
 import type { Five } from '@realsee/five';
+import { FLOOR_PLAN_ATTACHED_TO } from '../floorplan/constant';
+interface GetPxmmOption {
+    attachedTo: FLOOR_PLAN_ATTACHED_TO;
+}
 /**
  * 获取「在俯视图」状态下，模型 mm 与屏幕像素 px 的对应关系，即每 mm 对应多少 px
  * @param five five
  */
-export default function getPxmm(five: Five, container: Element): number;
+export default function getPxmm(five: Five, container: Element, floorIndex: number, options?: GetPxmmOption): number;
+export {};

package/libs/shared-utils/getPxmm.js

@@ -1,20 +1,34 @@
+import { FLOOR_PLAN_ATTACHED_TO } from '../floorplan/constant';
 import * as THREE from 'three';
 /**
  * 获取「在俯视图」状态下，模型 mm 与屏幕像素 px 的对应关系，即每 mm 对应多少 px
  * @param five five
  */
-export default function getPxmm(five, container) {
-    const boundingCenter = new THREE.Vector3(0, 0, 0);
-    five.model.bounding.getCenter(boundingCenter);
-    const { y: boundingCenterY } = boundingCenter;
-    const { longitude } = five.getCurrentState();
-    // 因为模型可能经过旋转，所以屏幕水平方向上的 1m 对应 X 轴距离需要转换
-    const X = 1 / Math.abs(Math.cos(longitude));
-    // 模型绕 (boundingCenterX, boundingCenterY, boundingCenterZ) 旋转
-    const originPosition = new THREE.Vector3(0, boundingCenterY, 0);
-    const originPositionXUnit = new THREE.Vector3(X, boundingCenterY, 0);
-    const mouse = originPosition.project(five.camera);
-    const xUnitMouse = originPositionXUnit.project(five.camera);
+export default function getPxmm(five, container, floorIndex, options) {
+    const maxFloorIndex = Math.max(...five.work.observers.map((ob) => ob.floorIndex));
+    function getFloorY(floorIndex) {
+        return floorIndex > maxFloorIndex
+            ? five.model.bounding.max.y
+            : Math.max(...five.work.observers
+                .filter((ob) => ob.floorIndex === floorIndex)
+                .map((ob) => ob.standingPosition.y));
+    }
+    function getY() {
+        const currentFloorY = getFloorY(floorIndex);
+        const nextFloorY = getFloorY(floorIndex + 1);
+        const attachedTo = (options === null || options === void 0 ? void 0 : options.attachedTo) || FLOOR_PLAN_ATTACHED_TO.BOUNDING_CENTER;
+        if (attachedTo === FLOOR_PLAN_ATTACHED_TO.BOUNDING_CENTER)
+            return (five.model.bounding.max.y + five.model.bounding.min.y) / 2;
+        else if (attachedTo === FLOOR_PLAN_ATTACHED_TO.CEILING)
+            return nextFloorY;
+        else
+            return currentFloorY;
+    }
+    const y = getY();
+    const originPosition = new THREE.Vector3(0, y, 0);
+    const originPositionXUnit = new THREE.Vector3(1, y, 0);
+    const mouse = originPosition.clone().project(five.camera);
+    const xUnitMouse = originPositionXUnit.clone().project(five.camera);
     const pxmm = Math.abs((xUnitMouse.x - mouse.x) / 1000) * (container.getBoundingClientRect().width / 2);
     return pxmm;
 }

package/libs/shared-utils/math/evenNumber.js

@@ -1,4 +1,4 @@
 export default function evenNumber(num, config) {
     const roundNum = Math.round(num);
-    return roundNum % 2 === 0 ? roundNum : roundNum + Number(config?.smaller ? -1 : 1);
+    return roundNum % 2 === 0 ? roundNum : roundNum + Number((config === null || config === void 0 ? void 0 : config.smaller) ? -1 : 1);
 }

package/libs/shared-utils/three/getExtraModelLoader.d.ts

@@ -1,4 +1,4 @@
-import * as THREE from 'three';
+import type * as THREE from 'three';
 /** 模型资源加载器，用于满足资源共用 */
 export declare function getExtraModelLoader(): {
     load: (url: string, type?: string) => Promise<THREE.Group>;

package/libs/shared-utils/three/getNormal.d.ts

@@ -1,2 +1,2 @@
-import { Vector3 } from 'three';
+import type { Vector3 } from 'three';
 export default function getNormal(a: Vector3, b: Vector3, c: Vector3): Vector3;

package/libs/shared-utils/three/getTextureLoader.d.ts

@@ -1,4 +1,4 @@
-import * as THREE from 'three';
+import type * as THREE from 'three';
 /** 贴图加载器，用于满足资源共用 */
 export declare function getTextureLoader(): {
     load: (url: string) => Promise<THREE.Texture>;

package/libs/shared-utils/three/loadFbxObj.d.ts

@@ -1,2 +1,2 @@
-import { Group } from 'three';
+import type { Group } from 'three';
 export declare function loadFbxObj(url: string): Promise<Group>;

package/libs/shared-utils/three/transfromToMeshBasicMaterial.js

@@ -1,12 +1,13 @@
 import { MeshBasicMaterial } from 'three';
 export default function transfromToMeshBasicMaterial(object, options) {
     object.traverse((ele) => {
+        var _a;
         if (ele.type === 'Mesh') {
             const mesh = ele;
             const materialConf = Object.assign({ map: mesh.material.map || {} }, options);
             mesh.material = new MeshBasicMaterial(materialConf);
             mesh.renderOrder = 1;
-            if (ele.parent?.type === 'Mesh') {
+            if (((_a = ele.parent) === null || _a === void 0 ? void 0 : _a.type) === 'Mesh') {
                 ele.renderOrder = ele.parent.renderOrder + 1;
             }
         }

package/libs/shared-utils/tinyEJSrender.d.ts

@@ -0,0 +1,5 @@
+interface RenderData {
+    [key: string]: string;
+}
+export default function render(template: string, data: RenderData): string;
+export {};

package/libs/shared-utils/tinyEJSrender.js

@@ -0,0 +1,210 @@
+const DEFAULT_OPEN_DELIMITER = '<';
+const DEFAULT_CLOSE_DELIMITER = '>';
+const DEFAULT_DELIMITER = '%';
+const DEFAULT_LOCALS_NAME = 'locals';
+const REGEX_STRING = '(<%%|%%>|<%=|<%-|<%_|<%#|<%|%>|-%>|_%>)';
+const ENCODE_HTML_RULES = {
+    '&': '&amp',
+    '<': '&lt',
+    '>': '&gt',
+    '"': '&#34',
+    "'": '&#39'
+};
+const TEMPLATE_MODES = {
+    EVAL: 'eval',
+    ESCAPED: 'escaped',
+    RAW: 'raw',
+    COMMENT: 'comment',
+    LITERAL: 'literal',
+};
+function stripSemi(str) {
+    return str.replace(/;(\s*$)/, '$1');
+}
+export default function render(template, data) {
+    const templ = new Template(template);
+    return templ.compileFunction()(data);
+}
+class Template {
+    constructor(text) {
+        Object.defineProperty(this, "templateText", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "mode", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: null
+        });
+        Object.defineProperty(this, "truncate", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
+        Object.defineProperty(this, "currentLine", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 1
+        });
+        Object.defineProperty(this, "source", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: ''
+        });
+        Object.defineProperty(this, "regex", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new RegExp(REGEX_STRING)
+        });
+        this.templateText = text;
+    }
+    compileFunction() {
+        let src;
+        const prepended = '  var __output = "";\n' +
+            '  function __append(s) { if (s !== undefined && s !== null) __output += s }\n' +
+            '  with (' + DEFAULT_LOCALS_NAME + ' || {}) {' + '\n';
+        const appended = '  }' + '\n  return __output;' + '\n';
+        const escapeFn = function (markup) {
+            return markup == undefined
+                ? ''
+                : String(markup)
+                    .replace(/[&<>'"]/g, function (c) {
+                    return ENCODE_HTML_RULES[c] || c;
+                });
+        };
+        this._generateSource();
+        this.source = prepended + this.source + appended;
+        src = this.source;
+        src = 'escapeFn = escapeFn || ' + escapeFn.toString() + ';' + '\n' + src;
+        return new Function(DEFAULT_LOCALS_NAME + ', escapeFn', src);
+    }
+    _generateSource() {
+        this.templateText =
+            this.templateText.replace(/[ \t]*<%_/gm, '<%_').replace(/_%>[ \t]*/gm, '_%>');
+        const matches = this._parseTemplateText();
+        const d = DEFAULT_DELIMITER;
+        const o = DEFAULT_OPEN_DELIMITER;
+        const c = DEFAULT_CLOSE_DELIMITER;
+        if (matches && matches.length) {
+            matches.forEach((line, index) => {
+                let closing;
+                if (line.indexOf(o + d) === 0
+                    && line.indexOf(o + d + d) !== 0) {
+                    closing = matches[index + 2];
+                    if (!(closing == d + c || closing == '-' + d + c || closing == '_' + d + c)) {
+                        throw new Error('Could not find matching close tag for "' + line + '".');
+                    }
+                }
+                this._scanLine(line);
+            });
+        }
+    }
+    _parseTemplateText() {
+        let str = this.templateText;
+        const pat = this.regex;
+        let result = pat.exec(str);
+        const arr = [];
+        let firstPos;
+        while (result) {
+            firstPos = result.index;
+            if (firstPos !== 0) {
+                arr.push(str.substring(0, firstPos));
+                str = str.slice(firstPos);
+            }
+            arr.push(result[0]);
+            str = str.slice(result[0].length);
+            result = pat.exec(str);
+        }
+        if (str) {
+            arr.push(str);
+        }
+        return arr;
+    }
+    _addOutput(line) {
+        if (this.truncate) {
+            line = line.replace(/^(?:\r\n|\r|\n)/, '');
+            this.truncate = false;
+        }
+        if (!line)
+            return line;
+        line = line.replace(/\\/g, '\\\\');
+        line = line.replace(/\n/g, '\\n');
+        line = line.replace(/\r/g, '\\r');
+        line = line.replace(/"/g, '\\"');
+        this.source += '    ; __append("' + line + '")' + '\n';
+    }
+    _scanLine(line) {
+        const d = DEFAULT_DELIMITER;
+        const o = DEFAULT_OPEN_DELIMITER;
+        const c = DEFAULT_CLOSE_DELIMITER;
+        const newLineCount = line.split('\n').length - 1;
+        switch (line) {
+            case o + d:
+            case o + d + '_':
+                this.mode = TEMPLATE_MODES.EVAL;
+                break;
+            case o + d + '=':
+                this.mode = TEMPLATE_MODES.ESCAPED;
+                break;
+            case o + d + '-':
+                this.mode = TEMPLATE_MODES.RAW;
+                break;
+            case o + d + '#':
+                this.mode = TEMPLATE_MODES.COMMENT;
+                break;
+            case o + d + d:
+                this.mode = TEMPLATE_MODES.LITERAL;
+                this.source += '    ; __append("' + line.replace(o + d + d, o + d) + '")' + '\n';
+                break;
+            case d + d + c:
+                this.mode = TEMPLATE_MODES.LITERAL;
+                this.source += '    ; __append("' + line.replace(d + d + c, d + c) + '")' + '\n';
+                break;
+            case d + c:
+            case '-' + d + c:
+            case '_' + d + c:
+                if (this.mode == TEMPLATE_MODES.LITERAL) {
+                    this._addOutput(line);
+                }
+                this.mode = null;
+                this.truncate = line.indexOf('-') === 0 || line.indexOf('_') === 0;
+                break;
+            default:
+                if (this.mode) {
+                    switch (this.mode) {
+                        case TEMPLATE_MODES.EVAL:
+                        case TEMPLATE_MODES.ESCAPED:
+                        case TEMPLATE_MODES.RAW:
+                            if (line.lastIndexOf('//') > line.lastIndexOf('\n')) {
+                                line += '\n';
+                            }
+                    }
+                    switch (this.mode) {
+                        case TEMPLATE_MODES.EVAL:
+                            this.source += '    ; ' + line + '\n';
+                            break;
+                        case TEMPLATE_MODES.ESCAPED:
+                            this.source += '    ; __append(escapeFn(' + stripSemi(line) + '))' + '\n';
+                            break;
+                        case TEMPLATE_MODES.RAW:
+                            this.source += '    ; __append(' + stripSemi(line) + ')' + '\n';
+                            break;
+                        case TEMPLATE_MODES.COMMENT:
+                            break;
+                        case TEMPLATE_MODES.LITERAL:
+                            this._addOutput(line);
+                            break;
+                    }
+                }
+                else {
+                    this._addOutput(line);
+                }
+        }
+    }
+}

package/libs/shared-utils/useDebounce.js

@@ -16,7 +16,7 @@ export const useDebounce = (callback, waitFor = 200) => {
             clearTimeout(timer.current);
             timer.current = null;
         }
-        timer.current = setTimeout(() => savedFunc.current?.(...args), waitFor);
+        timer.current = setTimeout(() => { var _a; return (_a = savedFunc.current) === null || _a === void 0 ? void 0 : _a.call(savedFunc, ...args); }, waitFor);
     }, []);
 };
 export default useDebounce;

package/libs/shared-utils/useThrottle.js

@@ -12,9 +12,10 @@ export const useThrottle = (callback, waitFor) => {
         savedFunc.current = callback;
     }, [waitFor]);
     return useCallback((...args) => {
+        var _a;
         if (timer.current)
             return;
-        savedFunc.current?.(...args);
+        (_a = savedFunc.current) === null || _a === void 0 ? void 0 : _a.call(savedFunc, ...args);
         timer.current = setTimeout(() => {
             if (timer.current)
                 clearTimeout(timer.current);

package/libs/shared-utils/vectorTocoordinates.d.ts

@@ -1,4 +1,4 @@
-import * as THREE from 'three';
+import type * as THREE from 'three';
 /** 单位向量转换成坐标 */
 declare function vectorTocoordinates(vector: THREE.Vector3): {
     longitude: number;

package/package.json

@@ -1,32 +1,38 @@
 {
   "name": "@realsee/dnalogel",
   "main": "libs/index.js",
+  "typings": "./lib/index.d.ts",
   "type": "module",
   "author": "REALSEE-DEVELOPER",
   "repository": "https://github.com/realsee-developer/dnalogel.git",
+  "description": "如视 VR 看房插件合集",
   "private": false,
-  "version": "2.0.0-alpha.2",
+  "version": "2.0.0-alpha.22",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
-    "build:dev": "yarn tsb && vite build --watch",
-    "build": "yarn tsb && vite build",
-    "tsb": "tsc && yarn build:svelte",
-    "build:svelte": "svelte-strip strip src/ libs",
+    "build": "yarn run tsb && yarn run build:rollup && yarn build:docs",
+    "build:dev": "yarn build:svelte && tsc --watch",
+    "build:rollup": " rollup --config rollup.config.js",
+    "tsb": "tsc && yarn build:svelte && ./bin/svelte-compile.js",
+    "build:svelte": "svelte-strip strip src/ libs -m=false",
     "build:docs": "typedoc --options ./typedoc.json",
     "preview": "vite preview",
     "check": "svelte-check --tsconfig ./tsconfig.json"
   },
   "files": [
     "libs",
-    "dist"
+    "dist",
+    "docs",
+    "TERMS.txt"
   ],
   "devDependencies": {
     "@babel/core": "^7.17.5",
-    "@realsee/five": "^5.0.0-alpha.98",
+    "@realsee/five": "^5.0.0-alpha.123",
     "@rollup/plugin-alias": "^3.1.9",
-    "@sveltejs/vite-plugin-svelte": "^1.0.0-next.30",
+    "@rollup/plugin-commonjs": "^21.1.0",
+    "@rollup/plugin-typescript": "^8.3.2",
+    "@sveltejs/vite-plugin-svelte": "^1.0.0-next.44",
     "@tsconfig/svelte": "^2.0.1",
-    "@tweenjs/tween.js": "^18.6.4",
     "@typescript-eslint/eslint-plugin": "^5.12.1",
     "@typescript-eslint/parser": "^5.12.1",
     "@vitejs/plugin-react-refresh": "^1.3.6",
@@ -34,18 +40,25 @@
     "classnames": "^2.3.1",
     "eslint": "^8.9.0",
     "eslint-config-alloy": "^4.5.1",
-    "glob": "^7.2.0",
-    "hammerjs": "^2.0.8",
+    "glob": "^8.0.1",
     "postcss": "^8.4.6",
     "postcss-plugin-px2rem": "^0.8.1",
-    "svelte": "^3.44.0",
+    "replace": "^1.2.1",
+    "rollup-plugin-multi-input": "^1.3.1",
+    "rollup-plugin-postcss": "^4.0.2",
+    "rollup-plugin-svelte": "^7.1.0",
     "svelte-check": "^2.2.7",
-    "svelte-preprocess": "^4.9.8",
+    "svelte-preprocess": "^4.10.6",
     "svelte-strip": "^1.0.1",
     "three": "0.117.1",
     "tslib": "^2.3.1",
     "typedoc": "^0.22.11",
     "typescript": "^4.5.5",
     "vite": "^2.8.0"
+  },
+  "dependencies": {
+    "@tweenjs/tween.js": "^18.6.4",
+    "hammerjs": "^2.0.8",
+    "svelte": "^3.47.0"
   }
 }