@realsee/dnalogel 2.0.0-alpha.53 → 2.0.0-alpha.54

package/dist/index.js

@@ -18308,10 +18308,10 @@ const AXIS_NUMBER_OF_VERTEX = 3; // 每个顶点有三个轴坐标
 const UV_NUMBER_OF_VERTEX = 2; // 每个顶点有两个 UV 轴坐标
 function getLineGeometry(positionList) {
     if (positionList.length < 2)
-        return;
-    const lineWidth = 1;
-    const halfLineWidth = 1 / 2;
-    const aspect = 1;
+        return console.warn('positionList length must be greater than 1');
+    const lineWidth = 0.6;
+    const halfLineWidth = lineWidth / 2;
+    const aspect = 0.67; // 纵横比 width / height
     // 点位向量数组
     const keyPoints = positionList;
     // 点位组成的平滑曲线
@@ -18366,7 +18366,12 @@ function getLineGeometry(positionList) {
 
 function getArrowMaterial(params) {
     var _a;
-    const texture = new THREE__namespace.TextureLoader().load((_a = params === null || params === void 0 ? void 0 : params.textureUtl) !== null && _a !== void 0 ? _a : '//vrlab-static.ljcdn.com/release/web/arrow.c5d028e4.png');
+    // const texture = new THREE.TextureLoader().load(params?.textureUrl ?? '//vrlab-static.ljcdn.com/release/web/arrow.c5d028e4.png')
+    // const texture = new THREE.TextureLoader().load(params?.textureUrl ?? '//vrlab-static.ljcdn.com/release/web/arrow2.aa1762e4.png')
+    // const texture = new THREE.TextureLoader().load(params?.textureUrl ?? '//vrlab-static.ljcdn.com/release/web/arrow3.06c5b657.png')
+    // const texture = new THREE.TextureLoader().load(params?.textureUrl ?? '//vrlab-static.ljcdn.com/release/web/arrow4.b1427685.png')
+    // const texture = new THREE.TextureLoader().load(params?.textureUrl ?? '//vrlab-static.ljcdn.com/release/web/arrow5.ae49f3c8.png')
+    const texture = new THREE__namespace.TextureLoader().load((_a = params === null || params === void 0 ? void 0 : params.textureUrl) !== null && _a !== void 0 ? _a : '//vrlab-static.ljcdn.com/release/web/arrow6.b6ce0c62.png');
     texture.wrapS = texture.wrapT = THREE__namespace.RepeatWrapping;
     texture.encoding = THREE__namespace.sRGBEncoding;
     const arrowMaterial = new THREE__namespace.MeshBasicMaterial({
@@ -18449,7 +18454,7 @@ class Controller extends Controller$6 {
             this.five.scene.remove(this.linesGroup);
         const linesGroup = this.getLinesGroup(data.routes);
         if (!linesGroup)
-            return Promise.reject(new Error('no line'));
+            return;
         this.linesGroup = linesGroup;
         this.five.scene.add(linesGroup);
         this.handleVisible(this.state.visible);
@@ -18553,10 +18558,10 @@ class Controller extends Controller$6 {
         const geometry = getLineGeometry(positions);
         if (!geometry)
             return;
-        const material = getArrowMaterial({ textureUtl: data.arrowTextureUrl });
+        const material = getArrowMaterial({ textureUrl: data.arrowTextureUrl });
         const mesh = new THREE__namespace.Mesh(geometry, material);
         mesh.name = pluginFlag('route-line-mesh');
-        mesh.renderOrder = 3;
+        // mesh.renderOrder = 3
         return mesh;
     }
 }
@@ -18624,7 +18629,15 @@ function linerValue(x0, v0, t1, t) {
     return a * t + d;
 }
 
-const VERSION = 'v1.0.5';
+function sleep(duration) {
+    return new Promise((resolve) => {
+        setTimeout(() => {
+            resolve();
+        }, duration);
+    });
+}
+
+const VERSION = 'v1.0.6';
 const PLUGIN_NAME = 'CruisePlugin';
 const PLUGIN = `${PLUGIN_NAME}@${VERSION}`;
 const disposedErrorLog = () => {
@@ -18654,7 +18667,7 @@ class CruisePluginController extends Controller$6 {
                     speedConfig: {
                         rotateSpeed: 0.001,
                         rotateSpeedUnit: 'rad/ms',
-                        moveSpeed: 0.003,
+                        moveSpeed: 0.002,
                         moveSpeedUnit: 'm/ms',
                     },
                 },
@@ -18870,12 +18883,24 @@ class CruisePluginController extends Controller$6 {
         if (data.keyframes) {
             return {
                 keyframesId: uuid(),
-                keyframes: data.keyframes.map((keyframe, index) => { var _a; return (Object.assign({ id: (_a = keyframe.uuid) !== null && _a !== void 0 ? _a : uuid(), index }, keyframe)); }),
+                keyframes: data.keyframes.map((keyframe, index) => {
+                    var _a;
+                    const nextKeyframe = data.keyframes[index + 1];
+                    const stay = (() => {
+                        if (!nextKeyframe)
+                            return 0;
+                        if (nextKeyframe.start === undefined || keyframe.end === undefined)
+                            return 0;
+                        return nextKeyframe.start - keyframe.end;
+                    })();
+                    return Object.assign({ id: (_a = keyframe.uuid) !== null && _a !== void 0 ? _a : uuid(), moveIndex: index, stay, index }, keyframe);
+                }),
             };
         }
         else if (data.panoIndexList) {
             let keyframes = [];
-            const moveEffect = data.moveEffect;
+            const { moveEffect, moveToFirstPanoEffect } = data;
+            this.privateState.moveToFirstPanoEffect = moveToFirstPanoEffect;
             data.panoIndexList
                 .filter((panoIndex, index) => panoIndex !== data.panoIndexList[index - 1])
                 .forEach((panoIndex, index) => {
@@ -18896,13 +18921,17 @@ class CruisePluginController extends Controller$6 {
                 })();
                 if (data.moveType === undefined || data.moveType === 'justMove') {
                     // move to panoIndex, latitude, longitude
-                    keyframes.push({ data: Object.assign({ effect: 'Move', panoIndex, moveEffect }, (lookatNextPanoIndex !== null && lookatNextPanoIndex !== void 0 ? lookatNextPanoIndex : {})) });
+                    keyframes.push({
+                        moveIndex: index,
+                        stay: data.stay,
+                        data: Object.assign({ effect: 'Move', panoIndex, moveEffect }, (lookatNextPanoIndex !== null && lookatNextPanoIndex !== void 0 ? lookatNextPanoIndex : {})),
+                    });
                 }
                 else if (data.moveType === 'moveAndRotate') {
                     // move to panoIndex, then rotate to latitude and longitude
-                    keyframes.push({ data: { effect: 'Move', panoIndex, moveEffect } });
+                    keyframes.push({ moveIndex: index, stay: data.stay, data: { effect: 'Move', panoIndex, moveEffect } });
                     if (lookatNextPanoIndex)
-                        keyframes.push({ data: Object.assign({ effect: 'Rotate', panoIndex }, lookatNextPanoIndex) });
+                        keyframes.push({ moveIndex: index, stay: data.stay, data: Object.assign({ effect: 'Rotate', panoIndex }, lookatNextPanoIndex) });
                 }
             });
             return { keyframesId: uuid(), keyframes: keyframes.map((keyframe, index) => (Object.assign({ id: uuid(), index }, keyframe))) };
@@ -18967,6 +18996,7 @@ class CruisePluginController extends Controller$6 {
         if ((options === null || options === void 0 ? void 0 : options.notEmitEvent) !== true) {
             hooks.emit('play', { userAction: (_a = options === null || options === void 0 ? void 0 : options.userAction) !== null && _a !== void 0 ? _a : true });
         }
+        let playedFirstKeyframe = false;
         const getPlayFromIndex = async () => {
             var _a, _b;
             // play from index
@@ -18980,13 +19010,14 @@ class CruisePluginController extends Controller$6 {
                 const pausedKeyframe = (_b = this.data) === null || _b === void 0 ? void 0 : _b.keyframes.find((keyframe) => keyframe.id === pauseData.keyframeId);
                 // restore paused state
                 if (pauseData === null || pauseData === void 0 ? void 0 : pauseData.fiveState)
-                    await this.move(pauseData.fiveState);
+                    await this.move(pauseData.fiveState, { moveEffect: privateState.moveToFirstPanoEffect });
                 if (pausedKeyframe) {
                     if (pausedKeyframe.data.effect === 'Move')
                         return pausedKeyframe.index;
                     else if (pausedKeyframe.data.effect === 'Rotate') {
                         const duration = pauseData.duration !== undefined ? pauseData.duration * (1 - pauseData.playedProgress) : undefined;
-                        await this.playKeyframe(pausedKeyframe, duration);
+                        await this.playKeyframe(pausedKeyframe, { duration });
+                        playedFirstKeyframe = true;
                         // playFromIndex += 1 cause played last part of paused keyframe
                         return pausedKeyframe.index + 1;
                     }
@@ -19008,11 +19039,19 @@ class CruisePluginController extends Controller$6 {
             try {
                 console.log('playIndexChange', keyframe.index);
                 hooks.emit('playIndexChange', keyframe.index, keyframe);
-                await this.playKeyframe(keyframe);
+                console.log({ playFromIndex });
+                await this.playKeyframe(keyframe, {
+                    moveEffect: playedFirstKeyframe === false ? privateState.moveToFirstPanoEffect : undefined,
+                    duration: 800,
+                });
+                if (keyframe.stay)
+                    await sleep(keyframe.stay);
+                if (playedFirstKeyframe === false)
+                    playedFirstKeyframe = true;
             }
             catch (error) {
                 return Promise.resolve('broke');
-                // if think play be interupted by five gesture is an error, return Promise.reject(error)
+                // if think the play be interupted by five gesture is an error, return Promise.reject(error)
                 // return Promise.reject(error)
             }
         }
@@ -19044,12 +19083,12 @@ class CruisePluginController extends Controller$6 {
     /**
      * @description Play single keyframe
      */
-    async playKeyframe(keyframe, duration) {
+    async playKeyframe(keyframe, params) {
         var _a;
         const { privateState } = this;
         if (((_a = this.privateState.currentPlayKeyframe) === null || _a === void 0 ? void 0 : _a.keyframe.id) !== keyframe.id)
             this.privateState.currentPlayKeyframe = { keyframe };
-        privateState.currentPlayQueue.push(this.getPlayPromise(keyframe, duration));
+        privateState.currentPlayQueue.push(this.getPlayPromise(keyframe, params));
         return this.actionPromiseQueue();
     }
     /**
@@ -19066,9 +19105,10 @@ class CruisePluginController extends Controller$6 {
     /**
      * @description: getPlayPromise
      */
-    async getPlayPromise(keyframe, paramsDuration) {
+    async getPlayPromise(keyframe, params) {
+        var _a;
         const data = keyframe.data;
-        const duration = paramsDuration !== null && paramsDuration !== void 0 ? paramsDuration : (keyframe.start !== undefined && keyframe.end !== undefined ? keyframe.end - keyframe.start : undefined);
+        (_a = params === null || params === void 0 ? void 0 : params.duration) !== null && _a !== void 0 ? _a : (keyframe.start !== undefined && keyframe.end !== undefined ? keyframe.end - keyframe.start : undefined);
         if (!data)
             return;
         return new Promise((resolve, reject) => {
@@ -19092,13 +19132,13 @@ class CruisePluginController extends Controller$6 {
                 };
                 switch (data.effect) {
                     case 'Move':
-                        this.move(data, duration).then(res);
+                        this.move(data, params).then(res);
                         break;
                     case 'Rotate':
-                        this.rotate(data, duration).then(res);
+                        this.rotate(data, params).then(res);
                         break;
                     default:
-                        this.rotate(data, duration).then(res);
+                        this.rotate(data, params).then(res);
                 }
             }
             catch (e) { }
@@ -19129,13 +19169,13 @@ class CruisePluginController extends Controller$6 {
     /**
      * @description Action move keyframe
      */
-    async move(data, duration) {
+    async move(data, params) {
         console.log('--move--', data.panoIndex);
         if (data.mode && data.mode !== this.five.currentMode) {
             await this.changeMode(data);
         }
         else if (data.panoIndex !== this.five.panoIndex) {
-            await this.changePano(data, duration);
+            await this.changePano(data, params);
         }
         else {
             return Promise.resolve();
@@ -19145,15 +19185,15 @@ class CruisePluginController extends Controller$6 {
     /**
      * @description Action rotate keyframe
      */
-    async rotate(data, duration) {
+    async rotate(data, params) {
         console.log('--rotate--', data);
         if (data.mode && data.mode !== this.five.currentMode) {
             await this.changeMode({ mode: data.mode, panoIndex: data.panoIndex });
         }
         else if (data.panoIndex && data.panoIndex !== this.five.panoIndex) {
-            return await this.changePano(data, duration);
+            return await this.changePano(data, params);
         }
-        await this.updateCamera(data, duration);
+        await this.updateCamera(data, params === null || params === void 0 ? void 0 : params.duration);
     }
     /**
      * @description Update five camera
@@ -19188,13 +19228,14 @@ class CruisePluginController extends Controller$6 {
     /**
      * @description: Change five pano
      */
-    async changePano(data, paramsDuration = 800) {
+    async changePano(data, params) {
+        var _a;
         const { five, privateState, state } = this;
         if (typeof data.panoIndex !== 'number')
             return;
         if (data.panoIndex === five.panoIndex)
             return;
-        let originDuration = paramsDuration;
+        let originDuration = (_a = params === null || params === void 0 ? void 0 : params.duration) !== null && _a !== void 0 ? _a : 800;
         const speed = (() => {
             var _a, _b;
             const speedConfig = (_a = state.config) === null || _a === void 0 ? void 0 : _a.speedConfig;
@@ -19215,13 +19256,13 @@ class CruisePluginController extends Controller$6 {
             privateState.currentPlayKeyframe.originDuration = originDuration;
         const duration = this.getSpeededDuration(originDuration);
         return new Promise((resolve) => {
-            var _a, _b;
+            var _a, _b, _c;
             five.moveToPano(data.panoIndex, {
                 latitude: data.latitude,
                 longitude: data.longitude,
                 fov: data.fov,
                 duration,
-                effect: (_b = (_a = this.state.config) === null || _a === void 0 ? void 0 : _a.moveEffect) !== null && _b !== void 0 ? _b : data.moveEffect,
+                effect: (_c = (_a = params === null || params === void 0 ? void 0 : params.moveEffect) !== null && _a !== void 0 ? _a : (_b = this.state.config) === null || _b === void 0 ? void 0 : _b.moveEffect) !== null && _c !== void 0 ? _c : data.moveEffect,
                 moveCancelCallback: () => resolve(),
                 moveEndCallback: () => resolve(),
             });
@@ -19238,7 +19279,7 @@ class CruisePluginController extends Controller$6 {
             try {
                 const duration = currentPlayKeyframe.originDuration !== undefined ? currentPlayKeyframe.originDuration * (1 - this.getProgress()) : undefined;
                 console.log('--speedChange--', speed, { duration });
-                const promise = this.playKeyframe(currentPlayKeyframe.keyframe, duration);
+                const promise = this.playKeyframe(currentPlayKeyframe.keyframe, { duration });
                 privateState.currentPlayQueue.push(promise);
             }
             catch (e) { }

package/dist/index.umd.js

@@ -18296,10 +18296,10 @@ void main() {
     const UV_NUMBER_OF_VERTEX = 2; // 每个顶点有两个 UV 轴坐标
     function getLineGeometry(positionList) {
         if (positionList.length < 2)
-            return;
-        const lineWidth = 1;
-        const halfLineWidth = 1 / 2;
-        const aspect = 1;
+            return console.warn('positionList length must be greater than 1');
+        const lineWidth = 0.6;
+        const halfLineWidth = lineWidth / 2;
+        const aspect = 0.67; // 纵横比 width / height
         // 点位向量数组
         const keyPoints = positionList;
         // 点位组成的平滑曲线
@@ -18354,7 +18354,12 @@ void main() {
 
     function getArrowMaterial(params) {
         var _a;
-        const texture = new THREE__namespace.TextureLoader().load((_a = params === null || params === void 0 ? void 0 : params.textureUtl) !== null && _a !== void 0 ? _a : '//vrlab-static.ljcdn.com/release/web/arrow.c5d028e4.png');
+        // const texture = new THREE.TextureLoader().load(params?.textureUrl ?? '//vrlab-static.ljcdn.com/release/web/arrow.c5d028e4.png')
+        // const texture = new THREE.TextureLoader().load(params?.textureUrl ?? '//vrlab-static.ljcdn.com/release/web/arrow2.aa1762e4.png')
+        // const texture = new THREE.TextureLoader().load(params?.textureUrl ?? '//vrlab-static.ljcdn.com/release/web/arrow3.06c5b657.png')
+        // const texture = new THREE.TextureLoader().load(params?.textureUrl ?? '//vrlab-static.ljcdn.com/release/web/arrow4.b1427685.png')
+        // const texture = new THREE.TextureLoader().load(params?.textureUrl ?? '//vrlab-static.ljcdn.com/release/web/arrow5.ae49f3c8.png')
+        const texture = new THREE__namespace.TextureLoader().load((_a = params === null || params === void 0 ? void 0 : params.textureUrl) !== null && _a !== void 0 ? _a : '//vrlab-static.ljcdn.com/release/web/arrow6.b6ce0c62.png');
         texture.wrapS = texture.wrapT = THREE__namespace.RepeatWrapping;
         texture.encoding = THREE__namespace.sRGBEncoding;
         const arrowMaterial = new THREE__namespace.MeshBasicMaterial({
@@ -18437,7 +18442,7 @@ void main() {
                 this.five.scene.remove(this.linesGroup);
             const linesGroup = this.getLinesGroup(data.routes);
             if (!linesGroup)
-                return Promise.reject(new Error('no line'));
+                return;
             this.linesGroup = linesGroup;
             this.five.scene.add(linesGroup);
             this.handleVisible(this.state.visible);
@@ -18541,10 +18546,10 @@ void main() {
             const geometry = getLineGeometry(positions);
             if (!geometry)
                 return;
-            const material = getArrowMaterial({ textureUtl: data.arrowTextureUrl });
+            const material = getArrowMaterial({ textureUrl: data.arrowTextureUrl });
             const mesh = new THREE__namespace.Mesh(geometry, material);
             mesh.name = pluginFlag('route-line-mesh');
-            mesh.renderOrder = 3;
+            // mesh.renderOrder = 3
             return mesh;
         }
     }
@@ -18612,7 +18617,15 @@ void main() {
         return a * t + d;
     }
 
-    const VERSION = 'v1.0.5';
+    function sleep(duration) {
+        return new Promise((resolve) => {
+            setTimeout(() => {
+                resolve();
+            }, duration);
+        });
+    }
+
+    const VERSION = 'v1.0.6';
     const PLUGIN_NAME = 'CruisePlugin';
     const PLUGIN = `${PLUGIN_NAME}@${VERSION}`;
     const disposedErrorLog = () => {
@@ -18642,7 +18655,7 @@ void main() {
                         speedConfig: {
                             rotateSpeed: 0.001,
                             rotateSpeedUnit: 'rad/ms',
-                            moveSpeed: 0.003,
+                            moveSpeed: 0.002,
                             moveSpeedUnit: 'm/ms',
                         },
                     },
@@ -18858,12 +18871,24 @@ void main() {
             if (data.keyframes) {
                 return {
                     keyframesId: uuid(),
-                    keyframes: data.keyframes.map((keyframe, index) => { var _a; return (Object.assign({ id: (_a = keyframe.uuid) !== null && _a !== void 0 ? _a : uuid(), index }, keyframe)); }),
+                    keyframes: data.keyframes.map((keyframe, index) => {
+                        var _a;
+                        const nextKeyframe = data.keyframes[index + 1];
+                        const stay = (() => {
+                            if (!nextKeyframe)
+                                return 0;
+                            if (nextKeyframe.start === undefined || keyframe.end === undefined)
+                                return 0;
+                            return nextKeyframe.start - keyframe.end;
+                        })();
+                        return Object.assign({ id: (_a = keyframe.uuid) !== null && _a !== void 0 ? _a : uuid(), moveIndex: index, stay, index }, keyframe);
+                    }),
                 };
             }
             else if (data.panoIndexList) {
                 let keyframes = [];
-                const moveEffect = data.moveEffect;
+                const { moveEffect, moveToFirstPanoEffect } = data;
+                this.privateState.moveToFirstPanoEffect = moveToFirstPanoEffect;
                 data.panoIndexList
                     .filter((panoIndex, index) => panoIndex !== data.panoIndexList[index - 1])
                     .forEach((panoIndex, index) => {
@@ -18884,13 +18909,17 @@ void main() {
                     })();
                     if (data.moveType === undefined || data.moveType === 'justMove') {
                         // move to panoIndex, latitude, longitude
-                        keyframes.push({ data: Object.assign({ effect: 'Move', panoIndex, moveEffect }, (lookatNextPanoIndex !== null && lookatNextPanoIndex !== void 0 ? lookatNextPanoIndex : {})) });
+                        keyframes.push({
+                            moveIndex: index,
+                            stay: data.stay,
+                            data: Object.assign({ effect: 'Move', panoIndex, moveEffect }, (lookatNextPanoIndex !== null && lookatNextPanoIndex !== void 0 ? lookatNextPanoIndex : {})),
+                        });
                     }
                     else if (data.moveType === 'moveAndRotate') {
                         // move to panoIndex, then rotate to latitude and longitude
-                        keyframes.push({ data: { effect: 'Move', panoIndex, moveEffect } });
+                        keyframes.push({ moveIndex: index, stay: data.stay, data: { effect: 'Move', panoIndex, moveEffect } });
                         if (lookatNextPanoIndex)
-                            keyframes.push({ data: Object.assign({ effect: 'Rotate', panoIndex }, lookatNextPanoIndex) });
+                            keyframes.push({ moveIndex: index, stay: data.stay, data: Object.assign({ effect: 'Rotate', panoIndex }, lookatNextPanoIndex) });
                     }
                 });
                 return { keyframesId: uuid(), keyframes: keyframes.map((keyframe, index) => (Object.assign({ id: uuid(), index }, keyframe))) };
@@ -18955,6 +18984,7 @@ void main() {
             if ((options === null || options === void 0 ? void 0 : options.notEmitEvent) !== true) {
                 hooks.emit('play', { userAction: (_a = options === null || options === void 0 ? void 0 : options.userAction) !== null && _a !== void 0 ? _a : true });
             }
+            let playedFirstKeyframe = false;
             const getPlayFromIndex = async () => {
                 var _a, _b;
                 // play from index
@@ -18968,13 +18998,14 @@ void main() {
                     const pausedKeyframe = (_b = this.data) === null || _b === void 0 ? void 0 : _b.keyframes.find((keyframe) => keyframe.id === pauseData.keyframeId);
                     // restore paused state
                     if (pauseData === null || pauseData === void 0 ? void 0 : pauseData.fiveState)
-                        await this.move(pauseData.fiveState);
+                        await this.move(pauseData.fiveState, { moveEffect: privateState.moveToFirstPanoEffect });
                     if (pausedKeyframe) {
                         if (pausedKeyframe.data.effect === 'Move')
                             return pausedKeyframe.index;
                         else if (pausedKeyframe.data.effect === 'Rotate') {
                             const duration = pauseData.duration !== undefined ? pauseData.duration * (1 - pauseData.playedProgress) : undefined;
-                            await this.playKeyframe(pausedKeyframe, duration);
+                            await this.playKeyframe(pausedKeyframe, { duration });
+                            playedFirstKeyframe = true;
                             // playFromIndex += 1 cause played last part of paused keyframe
                             return pausedKeyframe.index + 1;
                         }
@@ -18996,11 +19027,19 @@ void main() {
                 try {
                     console.log('playIndexChange', keyframe.index);
                     hooks.emit('playIndexChange', keyframe.index, keyframe);
-                    await this.playKeyframe(keyframe);
+                    console.log({ playFromIndex });
+                    await this.playKeyframe(keyframe, {
+                        moveEffect: playedFirstKeyframe === false ? privateState.moveToFirstPanoEffect : undefined,
+                        duration: 800,
+                    });
+                    if (keyframe.stay)
+                        await sleep(keyframe.stay);
+                    if (playedFirstKeyframe === false)
+                        playedFirstKeyframe = true;
                 }
                 catch (error) {
                     return Promise.resolve('broke');
-                    // if think play be interupted by five gesture is an error, return Promise.reject(error)
+                    // if think the play be interupted by five gesture is an error, return Promise.reject(error)
                     // return Promise.reject(error)
                 }
             }
@@ -19032,12 +19071,12 @@ void main() {
         /**
          * @description Play single keyframe
          */
-        async playKeyframe(keyframe, duration) {
+        async playKeyframe(keyframe, params) {
             var _a;
             const { privateState } = this;
             if (((_a = this.privateState.currentPlayKeyframe) === null || _a === void 0 ? void 0 : _a.keyframe.id) !== keyframe.id)
                 this.privateState.currentPlayKeyframe = { keyframe };
-            privateState.currentPlayQueue.push(this.getPlayPromise(keyframe, duration));
+            privateState.currentPlayQueue.push(this.getPlayPromise(keyframe, params));
             return this.actionPromiseQueue();
         }
         /**
@@ -19054,9 +19093,10 @@ void main() {
         /**
          * @description: getPlayPromise
          */
-        async getPlayPromise(keyframe, paramsDuration) {
+        async getPlayPromise(keyframe, params) {
+            var _a;
             const data = keyframe.data;
-            const duration = paramsDuration !== null && paramsDuration !== void 0 ? paramsDuration : (keyframe.start !== undefined && keyframe.end !== undefined ? keyframe.end - keyframe.start : undefined);
+            (_a = params === null || params === void 0 ? void 0 : params.duration) !== null && _a !== void 0 ? _a : (keyframe.start !== undefined && keyframe.end !== undefined ? keyframe.end - keyframe.start : undefined);
             if (!data)
                 return;
             return new Promise((resolve, reject) => {
@@ -19080,13 +19120,13 @@ void main() {
                     };
                     switch (data.effect) {
                         case 'Move':
-                            this.move(data, duration).then(res);
+                            this.move(data, params).then(res);
                             break;
                         case 'Rotate':
-                            this.rotate(data, duration).then(res);
+                            this.rotate(data, params).then(res);
                             break;
                         default:
-                            this.rotate(data, duration).then(res);
+                            this.rotate(data, params).then(res);
                     }
                 }
                 catch (e) { }
@@ -19117,13 +19157,13 @@ void main() {
         /**
          * @description Action move keyframe
          */
-        async move(data, duration) {
+        async move(data, params) {
             console.log('--move--', data.panoIndex);
             if (data.mode && data.mode !== this.five.currentMode) {
                 await this.changeMode(data);
             }
             else if (data.panoIndex !== this.five.panoIndex) {
-                await this.changePano(data, duration);
+                await this.changePano(data, params);
             }
             else {
                 return Promise.resolve();
@@ -19133,15 +19173,15 @@ void main() {
         /**
          * @description Action rotate keyframe
          */
-        async rotate(data, duration) {
+        async rotate(data, params) {
             console.log('--rotate--', data);
             if (data.mode && data.mode !== this.five.currentMode) {
                 await this.changeMode({ mode: data.mode, panoIndex: data.panoIndex });
             }
             else if (data.panoIndex && data.panoIndex !== this.five.panoIndex) {
-                return await this.changePano(data, duration);
+                return await this.changePano(data, params);
             }
-            await this.updateCamera(data, duration);
+            await this.updateCamera(data, params === null || params === void 0 ? void 0 : params.duration);
         }
         /**
          * @description Update five camera
@@ -19176,13 +19216,14 @@ void main() {
         /**
          * @description: Change five pano
          */
-        async changePano(data, paramsDuration = 800) {
+        async changePano(data, params) {
+            var _a;
             const { five, privateState, state } = this;
             if (typeof data.panoIndex !== 'number')
                 return;
             if (data.panoIndex === five.panoIndex)
                 return;
-            let originDuration = paramsDuration;
+            let originDuration = (_a = params === null || params === void 0 ? void 0 : params.duration) !== null && _a !== void 0 ? _a : 800;
             const speed = (() => {
                 var _a, _b;
                 const speedConfig = (_a = state.config) === null || _a === void 0 ? void 0 : _a.speedConfig;
@@ -19203,13 +19244,13 @@ void main() {
                 privateState.currentPlayKeyframe.originDuration = originDuration;
             const duration = this.getSpeededDuration(originDuration);
             return new Promise((resolve) => {
-                var _a, _b;
+                var _a, _b, _c;
                 five.moveToPano(data.panoIndex, {
                     latitude: data.latitude,
                     longitude: data.longitude,
                     fov: data.fov,
                     duration,
-                    effect: (_b = (_a = this.state.config) === null || _a === void 0 ? void 0 : _a.moveEffect) !== null && _b !== void 0 ? _b : data.moveEffect,
+                    effect: (_c = (_a = params === null || params === void 0 ? void 0 : params.moveEffect) !== null && _a !== void 0 ? _a : (_b = this.state.config) === null || _b === void 0 ? void 0 : _b.moveEffect) !== null && _c !== void 0 ? _c : data.moveEffect,
                     moveCancelCallback: () => resolve(),
                     moveEndCallback: () => resolve(),
                 });
@@ -19226,7 +19267,7 @@ void main() {
                 try {
                     const duration = currentPlayKeyframe.originDuration !== undefined ? currentPlayKeyframe.originDuration * (1 - this.getProgress()) : undefined;
                     console.log('--speedChange--', speed, { duration });
-                    const promise = this.playKeyframe(currentPlayKeyframe.keyframe, duration);
+                    const promise = this.playKeyframe(currentPlayKeyframe.keyframe, { duration });
                     privateState.currentPlayQueue.push(promise);
                 }
                 catch (e) { }