@realsee/dnalogel 2.0.0-alpha.42 → 2.0.0-alpha.43

package/libs/shared-utils/five/changeMode.js

@@ -1,47 +1,36 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import nearlyEqual from '../nearlyEqual';
 /** 等待 five changeMode 结束
  * @description Promise 的状态只代表 mode 与预期是否一致，不保证参数的一致性
  */
-export default function changeMode(five, changeModeParams) {
-    return __awaiter(this, void 0, void 0, function* () {
-        yield new Promise((resolve, reject) => {
-            // 虽然 changeMode 是异步函数，但不代表异步流程结束代表切换 Mode 动画结束
-            five.changeMode(...changeModeParams).catch((error) => reject(error));
-            five.once('initAnimationEnded', () => {
-                const fiveCurrentState = five.getCurrentState();
-                const correctMode = changeModeParams[0];
-                if (fiveCurrentState.mode !== correctMode)
-                    reject(new Error('mode 与预期不符'));
-                /** 检测当前的 current pose 和传入的 pose 是否一致 */
-                const checkPose = () => {
-                    const correctPose = changeModeParams[1];
-                    if (!correctPose)
+export default async function changeMode(five, changeModeParams) {
+    await new Promise((resolve, reject) => {
+        // 虽然 changeMode 是异步函数，但不代表异步流程结束代表切换 Mode 动画结束
+        five.changeMode(...changeModeParams).catch((error) => reject(error));
+        five.once('initAnimationEnded', () => {
+            const fiveCurrentState = five.getCurrentState();
+            const correctMode = changeModeParams[0];
+            if (fiveCurrentState.mode !== correctMode)
+                reject(new Error('mode 与预期不符'));
+            /** 检测当前的 current pose 和传入的 pose 是否一致 */
+            const checkPose = () => {
+                const correctPose = changeModeParams[1];
+                if (!correctPose)
+                    return true;
+                return Object.keys(correctPose).every((key) => {
+                    const fivePoseItem = fiveCurrentState[key];
+                    if (fivePoseItem === undefined)
                         return true;
-                    return Object.keys(correctPose).every((key) => {
-                        const fivePoseItem = fiveCurrentState[key];
-                        if (fivePoseItem === undefined)
-                            return true;
-                        const correctPoseItem = correctPose[key];
-                        if (typeof fivePoseItem === 'number' && typeof correctPoseItem === 'number') {
-                            return nearlyEqual(fivePoseItem, correctPoseItem, 2);
-                        }
-                        return fivePoseItem === correctPoseItem;
-                    });
-                };
-                const checkPoseResult = checkPose();
-                if (!checkPoseResult)
-                    reject(new Error('five pose 与预期不符'));
-                resolve();
-            });
+                    const correctPoseItem = correctPose[key];
+                    if (typeof fivePoseItem === 'number' && typeof correctPoseItem === 'number') {
+                        return nearlyEqual(fivePoseItem, correctPoseItem, 2);
+                    }
+                    return fivePoseItem === correctPoseItem;
+                });
+            };
+            const checkPoseResult = checkPose();
+            if (!checkPoseResult)
+                reject(new Error('five pose 与预期不符'));
+            resolve();
         });
     });
 }

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

@@ -1,24 +1,13 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { FBXLoader } from 'three/examples/jsm/loaders/FBXLoader';
 const loader = new FBXLoader();
-export function loadFbxObj(url) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return new Promise((resolve, reject) => {
-            function onLoad(object) {
-                resolve(object);
-            }
-            function onError(error) {
-                reject(error);
-            }
-            loader.load(url, onLoad, undefined, onError);
-        });
+export async function loadFbxObj(url) {
+    return new Promise((resolve, reject) => {
+        function onLoad(object) {
+            resolve(object);
+        }
+        function onError(error) {
+            reject(error);
+        }
+        loader.load(url, onLoad, undefined, onError);
     });
 }

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

@@ -1,21 +1,10 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import * as THREE from 'three';
 const textureLoader = new THREE.TextureLoader();
-export function loadTexture(url) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return new Promise((resolve, reject) => {
-            textureLoader.load(url, resolve, undefined, reject);
-        }).then((texture) => {
-            texture.encoding = THREE.sRGBEncoding;
-            return texture;
-        });
+export async function loadTexture(url) {
+    return new Promise((resolve, reject) => {
+        textureLoader.load(url, resolve, undefined, reject);
+    }).then((texture) => {
+        texture.encoding = THREE.sRGBEncoding;
+        return texture;
     });
 }

package/libs/shared-utils/to.js

@@ -1,29 +1,18 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 /**
  * 传入一个 Promise
  * 无异常，返回 [null, data]
  * 有异常，则返回 [Error, undefined]
  * 用于替代 try&catch 处理 await 异常的方案
  */
-export function to(promise) {
-    return __awaiter(this, void 0, void 0, function* () {
-        try {
-            const data = yield promise;
-            return [null, data];
-        }
-        catch (error) {
-            if (error instanceof Error)
-                return [error, null];
-            return [new Error(''), null];
-        }
-    });
+export async function to(promise) {
+    try {
+        const data = await promise;
+        return [null, data];
+    }
+    catch (error) {
+        if (error instanceof Error)
+            return [error, null];
+        return [new Error(''), null];
+    }
 }
 export default to;

package/package.json

@@ -8,20 +8,8 @@
   "repository": "https://github.com/realsee-developer/dnalogel.git",
   "description": "如视 VR 看房插件合集",
   "private": false,
-  "version": "2.0.0-alpha.42",
+  "version": "2.0.0-alpha.43",
   "license": "SEE LICENSE IN TERMS.txt",
-  "scripts": {
-    "build": "yarn run tsb && yarn run build:rollup && yarn run build:components && yarn build:docs",
-    "build:dev": "yarn build:svelte && tsc --watch",
-    "build:rollup": " rollup --config rollup.config.js",
-    "build:rollup:dev": " rollup --config rollup.config.js --watch",
-    "build:components": "vite build",
-    "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",
@@ -65,5 +53,17 @@
     "@tweenjs/tween.js": "^18.6.4",
     "hammerjs": "^2.0.8",
     "svelte": "^3.47.0"
+  },
+  "scripts": {
+    "build": "yarn run tsb && yarn run build:rollup && yarn run build:components && yarn build:docs",
+    "build:dev": "yarn build:svelte && tsc --watch",
+    "build:rollup": " rollup --config rollup.config.js",
+    "build:rollup:dev": " rollup --config rollup.config.js --watch",
+    "build:components": "vite build",
+    "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"
   }
-}
+}