@realsee/vreo 0.2.0-alpha.1 → 0.2.0-alpha.12

package/resources/Player/modules/keyframes/ModelVideo/index.tsx

@@ -1,7 +1,9 @@
 import * as React from 'react'
+import * as THREE from 'three'
+import { useController, useFiveInstance } from '../../../hooks'
 import { ModelTVVideoPlugin } from '../../../../fivePlugins/ModelTVVideoPlugin'
+import { createTransMatrix } from '../../../../shared-utils/createTransMatrix'
 import { ModelVideoData, VreoKeyframe, VreoKeyframeEnum } from '../../../../typings/VreoUnit'
-import { useController, useFiveInstance } from '../../../hooks'
 
 export function ModelVideo() {
   const controller = useController()
@@ -15,14 +17,45 @@ export function ModelVideo() {
         ref.current = ModelTVVideoPlugin(five, {})
       }
       const { start, end } = keyframe
-      const { videoSrc, videoPosterSrc, vertexs } = keyframe.data as ModelVideoData
+      const { videoSrc, videoPosterSrc, vertexs, matrixWorld } = keyframe.data as ModelVideoData
+
+      const position = (() => {
+        if (vertexs.length < 4) {
+          throw new Error('ModelVideo: 顶点数据集合不够，无法组成矩形 ....')
+        }
+        if (vertexs.length === 4) {
+          return vertexs
+        }
+
+        const box = new THREE.Box3()
+        vertexs.forEach((v) => box.expandByPoint(new THREE.Vector3(v.x, v.y, v.z)))
+        return [
+          new THREE.Vector3(box.min.x, box.max.y, box.max.z),
+          new THREE.Vector3(box.min.x, box.min.y, box.max.z),
+          new THREE.Vector3(box.max.x, box.min.y, box.max.z),
+          new THREE.Vector3(box.max.x, box.max.y, box.max.z),
+        ]
+      })()
+
+      const points = (() => {
+        if (matrixWorld) {
+          const transMatrix = createTransMatrix(matrixWorld)
+          return [
+            position.map((p) => {
+              const res = transMatrix([p.x, p.y, p.z])
+              return { x: res[0], y: res[1], z: res[2] }
+            }),
+          ]
+        }
+        return [position]
+      })()
 
       ref.current.disable()
       await ref.current.load(
         {
           video_src: videoSrc,
           video_poster_src: videoPosterSrc,
-          points: [vertexs],
+          points,
         },
         controller.configs?.videos?.modelTVVideo
       )

package/resources/Player/modules/keyframes/PanoTag/index.tsx

@@ -2,13 +2,21 @@ import classNames from 'classnames'
 import * as React from 'react'
 import { Vector3 } from 'three'
 import { useController, useFiveInstance, useFiveProject2d } from '../../../hooks'
-import { PanoTagData, PanoTagEnum, Vertex, VreoKeyframe, VreoKeyframeEnum } from '../../../../typings/VreoUnit'
+import {
+  PanoTagData,
+  PanoTagEnum,
+  PanoTagStyleEnum,
+  Vertex,
+  VreoKeyframe,
+  VreoKeyframeEnum,
+} from '../../../../typings/VreoUnit'
 
 export function PanoTag() {
   const [state, setState] = React.useState<{
     vertex: Vertex
     text?: string
     type: PanoTagEnum
+    style?: PanoTagStyleEnum
     imgUrl?: string
   } | null>(null)
 
@@ -30,6 +38,7 @@ export function PanoTag() {
       const vertex = panoTagData.vertex
       const { x, y, z } = panoTagData.vertex
       const res = project2d(new Vector3(x, y, z))
+
       if (!res) return
       const { x: left, y: top } = res
       setState({
@@ -37,6 +46,7 @@ export function PanoTag() {
         text: panoTagData.text || PanoTagEnum.Text,
         type: panoTagData.type,
         imgUrl: panoTagData.imgUrl,
+        style: panoTagData.style || PanoTagStyleEnum.Growth,
       })
       setPos({ left, top })
       timeoutRef.current = setTimeout(() => {
@@ -92,6 +102,25 @@ export function PanoTag() {
     return undefined
   })()
 
+  if (state?.style === PanoTagStyleEnum.Expand) {
+    return (
+      <>
+        <div
+          className={classNames('PanoTag', {
+            'PanoTag--expand': true,
+            'PanoTag--notHidden': state,
+          })}
+          style={{
+            left: (pos?.left || 0) + 'px',
+            top: (pos?.top || 0) + 'px',
+          }}
+        >
+          <div className={'PanoTag-box PanoTag-box--' + (state?.type || '')}>{boxContent}</div>
+          <div className="PanoTag-guideline"></div>
+        </div>
+      </>
+    )
+  }
   return (
     <>
       <div
@@ -109,17 +138,7 @@ export function PanoTag() {
             <span className="PanoTag-slashline"></span>
             <span className="PanoTag-straightline"></span>
           </span>
-          <div
-            onClick={() => {
-              if (state?.imgUrl) {
-                // @TODO
-                // setDrawerVisible(true)
-              }
-            }}
-            className={'PanoTag-box PanoTag-box--' + (state?.type || '')}
-          >
-            {boxContent}
-          </div>
+          <div className={'PanoTag-box PanoTag-box--' + (state?.type || '')}>{boxContent}</div>
         </div>
       </div>
     </>

package/resources/Player/modules/keyframes/PanoTextLabel/index.tsx

@@ -30,13 +30,13 @@ export function PanoTextLabel() {
       if (!res) return
       const { x: left, y: top } = res
 
-      Object.assign(window, { $PanoTextLabel: { setState } })
+      // Object.assign(window, { $PanoTextLabel: { setState } })
       setState({ left, top, text: data.text || '', fontSize: data.fontSize || 16 })
       timeoutRef.current = setTimeout(() => setState(null), end - start)
     }
     controller.on(VreoKeyframeEnum.PanoTextLabel, callback)
 
-    Object.assign(window, { $panoTextLabel: { setState } })
+    // Object.assign(window, { $panoTextLabel: { setState } })
     return () => {
       controller.off(VreoKeyframeEnum.PanoTextLabel, callback)
       if (timeoutRef.current) {

package/resources/Player/modules/keyframes/Prompter/index.tsx

@@ -2,7 +2,6 @@ import * as React from 'react'
 import classNames from 'classnames'
 import { useController } from '../../../hooks'
 
-import { CSSTransition, TransitionGroup } from 'react-transition-group'
 import { VreoKeyframe, VreoKeyframeEnum } from '../../../../typings/VreoUnit'
 
 export function Prompter() {
@@ -27,7 +26,8 @@ export function Prompter() {
 
       ref.current = setTimeout(() => {
         setHidden(true)
-        setTimeout(() => setText(''), 500)
+        setText('')
+        // setTimeout(() => setText(''), 500)
 
         if (ref.current) clearTimeout(ref.current)
         ref.current = null
@@ -48,19 +48,9 @@ export function Prompter() {
         'vreo-prompter--audio': controller.isAudio,
       })}
     >
-      {text ? (
-        /* @warning "index.js:1 Warning: findDOMNode is deprecated in StrictMode." */
-        <TransitionGroup className="vreo-prompter-text">
-          <CSSTransition
-            key={text}
-            classNames="vreo-prompter-text-transition"
-            timeout={500}
-            addEndListener={(node, done) => node.addEventListener('transitionend', done, false)}
-          >
-            <div className="vreo-prompter-innerText">{text}</div>
-          </CSSTransition>
-        </TransitionGroup>
-      ) : undefined}
+      <div className="vreo-prompter-text">
+        <div className="vreo-prompter-innerText">{text}</div>
+      </div>
     </div>
   )
 }

package/resources/Player/modules/keyframes/UpdateVRPanorama/index.tsx

@@ -6,49 +6,56 @@ import { UpdateVRPanoramaData, VreoKeyframe, VreoKeyframeEnum } from '../../../.
 export function UpdateVRPanorama() {
   const controller = useController()
   const five = useFiveInstance()
-  const rawRef = React.useRef<string[] | null>(null)
-  const workRef = React.useRef<Work | null>(null)
+  const deafultWorkRef = React.useRef<string[] | null>(null)
+  const updateWorkRef = React.useRef<Work | null>(null)
 
+  // 恢复默认 VR
   const restoreCallback = React.useCallback(() => {
-    if (rawRef.current) {
-      const work = parseWork(rawRef.current)
+    // 先清理掉 之前的 VR 数据备份
+    updateWorkRef.current = null
+
+    if (deafultWorkRef.current) {
+      const work = parseWork(deafultWorkRef.current)
       five.load(work)
     }
    
-    workRef.current = null
   }, [])
 
+  // 暂停时： 恢复默认 VR 
   const pausedCallback = React.useCallback(() => {
-    if (rawRef.current) {
-      const work = parseWork(rawRef.current)
+    if (deafultWorkRef.current) {
+      const work = parseWork(deafultWorkRef.current)
+      Object.assign(window, {$rawWork: work})
       five.load(work)
     }
   }, [])
 
+  // 播放时：如果暂停前有更新 VR 需要还原
   const playingCallback = React.useCallback(() => {
-    if (!workRef.current) {
+    if (!updateWorkRef.current) {
       return
     }
-    five.load(workRef.current)
+    five.load(updateWorkRef.current)
   }, [])
 
   React.useEffect(() => {
     const callback = (keyframe: VreoKeyframe) => {
-      if (!rawRef.current) {
-        rawRef.current = five.work.raw.works
+      if (!deafultWorkRef.current) {
+        deafultWorkRef.current = five.work.raw.works
       }
 
       const data = keyframe.data as UpdateVRPanoramaData
 
       // 如果数据中有新 work 数据，则直接载入
       if (data.work) {
-        workRef.current = parseWork(data.work)
-        five.load(workRef.current)
+        updateWorkRef.current = parseWork(data.work)
+        five.load(updateWorkRef.current)
         return
       }
 
       const lastRawWork = five.work?.raw.works[0]
 
+
       // 动态场景：不提供完成的签名数据，需重新整理
       if (data.dynamic_scene && !data.panorama) {
         const lastWork = JSON.parse(lastRawWork)
@@ -59,8 +66,10 @@ export function UpdateVRPanorama() {
         delete data.dynamic_scene
       }
 
-      workRef.current = parseWork([lastRawWork, data])
-      five.load(workRef.current)
+      Object.assign(window, {$work1: JSON.parse(lastRawWork), $work2: data, parseWork: parseWork})
+
+      updateWorkRef.current = parseWork([lastRawWork, data])
+      five.load(updateWorkRef.current)
     }
 
     controller.on(VreoKeyframeEnum.UpdateVRPanorama, callback)
@@ -84,7 +93,7 @@ export function UpdateVRPanorama() {
       controller.off('paused', pausedCallback)
       controller.off('playing', playingCallback)
     }
-  }, [controller])
+  }, [])
 
   return <></>
 }

package/resources/Player/typings.ts

@@ -1,5 +1,8 @@
-import { ReactNode } from 'react';
-import { VreoKeyframeConfigMap } from '../typings/VreoUnit'
+import React, { ReactNode } from 'react';
+import { Subscribe, Five } from '@realsee/five';
+
+import { VreoKeyframeConfigMap, VreoKeyframeEvent } from '../typings/VreoUnit'
+import { VideoAgentMeshOptions } from './modules/VideoAgent/VideoAgentMesh';
 
 export interface PlayerConfigs {
   containter?: ReactDOM.Container
@@ -13,8 +16,20 @@ export interface PlayerConfigs {
     videoEffect?: HTMLVideoElement
     modelTVVideo?: HTMLVideoElement
   }
+
+  videoAgentMeshOptions?: VideoAgentMeshOptions
   /**
    * 如果需要在 底部面板添加自定义内容，可以传递个 React 组件。
    */
   customPanelChildren?: ReactNode
+  customKeyframes?: React.FC<CustomVreoKeyframeProps>[]
+  imageOptions?: { size: number }
+  autoPreload?: boolean
+}
+
+export type VreoSubscribe = Pick<Subscribe<VreoKeyframeEvent>, 'on' | 'once' | 'off'>
+
+export interface CustomVreoKeyframeProps {
+  subscribe: VreoSubscribe
+  five: Five
 }

package/resources/fivePlugins/CameraMovementPlugin/index.ts

@@ -1,4 +1,4 @@
-import { Five } from '@realsee/five'
+import { Five, MovePanoOptions } from '@realsee/five'
 import type { FivePlugin } from '@realsee/five'
 import * as TWEEN from '@tweenjs/tween.js'
 
@@ -50,63 +50,73 @@ function progressNumber(from: number, to: number, pst: number) {
 export const CameraMovementPlugin: FivePlugin<CameraMovementPluginParameterType, CameraMovementPluginExportType> = (
   five: Five,
 ) => {
-  const move = async (args: Partial<MoveArgs>, duration: number, opts: MoveOpts = { preload: true }) => {
-    if (opts.asyncStartCallback) {
-      opts.asyncStartCallback()
-    }
+  const move = (args: Partial<MoveArgs>, duration: number, opts: MoveOpts = { preload: true }) => {
+    return new Promise<boolean>(async (resolve, reject) => {
+
+      if (opts.asyncStartCallback) {
+        opts.asyncStartCallback()
+      }
+
+      if (five.panoIndex === undefined) {
+        return reject(false)
+      }
 
-    if (args.mode && args.mode !== five.currentMode) {
-      await new Promise((resolve) => {
-        if (!args.mode) return
-        five.once('modeChange', (mode) => {
-          five.once('initAnimationEnded', () => {
-            if (mode === args.mode) {
-              resolve(true)
-            }
+      if (args.mode && args.mode !== five.currentMode) {
+        await new Promise((resolve) => {
+          if (!args.mode) return
+          five.once('modeChange', (mode) => {
+            five.once('initAnimationEnded', () => {
+              if (mode === args.mode) {
+                resolve(true)
+              }
+            })
+          })
+          five.changeMode(args.mode, {
+            fov: args.fov || undefined,
+            latitude: args.latitude || undefined,
+            longitude: args.longitude || undefined,
+            panoIndex: args.panoIndex || undefined,
           })
         })
-        five.changeMode(args.mode, {
-          fov: args.fov || undefined,
-          latitude: args.latitude || undefined,
-          longitude: args.longitude || undefined,
-          panoIndex: args.panoIndex || undefined,
-        })
-      })
-    }
+      }
 
-    if (args.mode === Five.Mode.Floorplan) {
-      return true
-    }
+      if (args.mode === Five.Mode.Floorplan) {
+        return resolve(true)
+      }
 
-    if (opts.preload && args.panoIndex !== undefined && args.panoIndex !== five.panoIndex) {
-      await five.preloadPano(args.panoIndex)
-    }
+      if (opts.preload && args.panoIndex !== undefined && args.panoIndex !== five.panoIndex) {
+        await five.preloadPano(args.panoIndex)
+      }
+
+      if (opts.asyncEndCallback) {
+        opts.asyncEndCallback()
+      }
+
+      if (
+        args.panoIndex === undefined &&
+        args.fov === undefined &&
+        args.latitude === undefined &&
+        args.longitude === undefined
+      ) {
+        return resolve(true)
+      }
 
-    if (opts.asyncEndCallback) {
-      opts.asyncEndCallback()
-    }
 
-    if (
-      args.panoIndex === undefined &&
-      args.fov === undefined &&
-      args.latitude === undefined &&
-      args.longitude === undefined
-    ) {
-      return true
-    }
-    return await new Promise<boolean>((resolve, reject) => {
       const panoIndex = args.panoIndex !== undefined ? args.panoIndex : five.panoIndex
+
       if (panoIndex !== undefined) {
-        five.moveToPano(
+        const movePanoOptions: MovePanoOptions = Object.assign(args, {
+          duration, // 移动耗时
+          moveEndCallback: () => resolve(true), // 移动结束
+          moveCancelCallback: () => {
+            resolve(true)
+          }, // 移动开始
+          // effect: args.transEffect || 'fade',
+        })
+
+        await five.moveToPano(
           panoIndex,
-          Object.assign(
-            {
-              duration, // 移动耗时
-              moveEndCallback: () => resolve(true), // 移动结束
-              moveCancelCallback: () => reject(false), // 移动开始
-            },
-            args,
-          ),
+          movePanoOptions,
         )
       } else {
         reject(false)
@@ -154,6 +164,7 @@ export const CameraMovementPlugin: FivePlugin<CameraMovementPluginParameterType,
         five.moveToPano(args.panoIndex, {
           moveEndCallback: () => resolve(true), // 移动结束
           moveCancelCallback: () => reject(false), // 移动开始
+          effect: 'fade',
         })
       })
     }

package/resources/fivePlugins/CameraMovementPlugin/typings.ts

@@ -1,5 +1,5 @@
 /* eslint-disable prettier/prettier */
-import { Mode, Pose } from '@realsee/five'
+import { Mode, MovePanoOptions, Pose } from '@realsee/five'
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface CameraMovementPluginParameterType { }
@@ -39,6 +39,7 @@ export interface CameraMovementOptsCallback {
 export type MoveArgs = {
   mode: Mode
   panoIndex: number
+  transEffect?: "fly" | "fade" | "instant"
 } & Pose
 
 export type MoveOpts = {

package/resources/react/index.tsx

@@ -1,18 +1,23 @@
 import { unsafe__useFiveInstance } from '@realsee/five/react'
 import * as React from 'react'
 import { Player } from '../Player'
+import { PlayerConfigs } from '../Player/typings'
 import { VreoKeyframeEvent, VreoUnit } from '../typings/VreoUnit'
 
 const VreoContext = React.createContext<Player | null>(null)
 
-export const VreoProvider: React.FC = (props) => {
+export interface VreoProviderProps {
+  configs?: Partial<PlayerConfigs>
+} 
+
+export const VreoProvider: React.FC<VreoProviderProps> = (props ) => {
   const five = unsafe__useFiveInstance()
 
   const [player, setPlayer] = React.useState<Player | null>(null)
   const playerRef = React.useRef<Player | null>(null)
 
   React.useEffect(() => {
-    playerRef.current = new Player(five)
+    playerRef.current = new Player(five, props.configs || {})
     setPlayer(playerRef.current)
 
     return () => {
@@ -40,12 +45,16 @@ function useVreoInstance() {
 export interface VreoActionCallbacks {
   /**
    * 载入剧本数据。
+   * @param vreoUnit 剧本数据
+   * @param currentTime 开始时间戳
+   * @param preload 是否开启预载
+   * @param force 是否强制载入
    */
-  load: (vreoUnit: VreoUnit, currentTime?: number) => Promise<boolean>
+  load: (vreoUnit: VreoUnit, currentTime?: number, preload?: boolean, force?: boolean) => Promise<boolean>
   /**
    * 播放。
    */
-  play: () => void
+  play: (currentTime?: number) => void
   /**
    * 暂停。
    */
@@ -72,7 +81,7 @@ export function useVreoAction() {
     [player]
   )
 
-  const play = React.useCallback(() => player.play(), [player])
+  const play = React.useCallback((currentTime?: number) => player.play(currentTime || 0), [player])
   const pause = React.useCallback(() => player.pause(), [player])
   const show = React.useCallback(() => player.show(), [player])
   const hide = React.useCallback(() => player.hide(), [player])

package/resources/shared-utils/createTransMatrix.ts

@@ -0,0 +1,12 @@
+import * as THREE from 'three'
+
+export function createTransMatrix(arr1: number[]) {
+  const matrix4 = new THREE.Matrix4()
+  matrix4.fromArray(arr1)
+
+  return (arr2: number[]) => {
+    const vector3 = new THREE.Vector3(...arr2)
+    vector3.applyMatrix4(matrix4)
+    return vector3.toArray()
+  }
+}

package/resources/typings/VreoUnit.ts

@@ -1,4 +1,4 @@
-import { Mode, Pose, WorkCubeImage, Work } from '@realsee/five'
+import { Mode, MovePanoOptions, Pose } from '@realsee/five'
 import { CameraMovementEffect, Rotation } from '../fivePlugins/CameraMovementPlugin/typings'
 
 export enum VreoKeyframeEnum {
@@ -65,7 +65,7 @@ export type VreoKeyframeConfigMap = {
  * 剧本关键帧
  */
 export interface VreoKeyframe {
-  uuid: string
+  uuid?: string
   type: VreoKeyframeEnum
   start: number
   end: number
@@ -101,16 +101,22 @@ export interface VreoUnit {
  * 剧本事件
  */
 export type VreoKeyframeEvent = { [key in VreoKeyframeEnum]: (keyframe: VreoKeyframe) => void } & {
+  // 新数据载入完成
   loaded: (vreoUnit: VreoUnit) => void
-  paused: () => void
+  // 语音状态 播放 -> 暂停
+  paused: (ended?: boolean) => void
+  // 语音状态 暂停 -> 播放
   playing: () => void
+  // 未知的 剧本帧类型
+  unknownKeyframeType: (keyframe: Record<string, any>) => void
 }
 
 /**
  * 相机运动
  */
 export type CameraMovementData = {
-  effect: CameraMovementEffect
+  effect?: CameraMovementEffect
+  transEffect?: "fly" | "fade" | "instant"
   mode: Mode
   panoIndex: number
   loop?: boolean
@@ -133,6 +139,7 @@ export type UpdateVRPanoramaData = {
   allow_hosts: string[]
   certificate: string
   expire_at: string
+  // 动态场景
   dynamic_scene?: {
     images: {
       index: number
@@ -157,9 +164,13 @@ export interface Vertex {
 }
 
 /**
- * 四个顶点元组
+ * 矩形顶点
  */
 export type QuadrangleVertexs = [Vertex, Vertex, Vertex, Vertex]
+/**
+ * 顶点数组
+ */
+export type Vertexs = Vertex[]
 
 /**
  * 视频广告
@@ -176,7 +187,8 @@ export type ModelVideoData = {
   /**
    * 视频映射在模型中的顶点
    */
-  vertexs: QuadrangleVertexs
+  vertexs: QuadrangleVertexs | Vertexs
+  matrixWorld?: number[]
 }
 
 /**
@@ -196,8 +208,23 @@ export enum PanoTagEnum {
   Image = 'Image',
 }
 
+/**
+ * 标签样式种类
+ */
+export enum PanoTagStyleEnum {
+  /**
+   * 生长动画：默认值
+   */
+  Growth = 'Growth',
+  /**
+   * 展开动画
+   */
+  Expand = 'Expand',
+}
+
 export type PanoTagData = {
   type: PanoTagEnum
+  style: PanoTagStyleEnum
   text: string
   vertex: Vertex
   imgUrl?: string
@@ -229,13 +256,21 @@ export enum InfoPanelTypeEnum {
   Video = 'Video',
 }
 
+export enum InfoPanelStyleEnum {
+  Drawer = 'Drawer',
+  PopUp = 'PopUp',
+}
+
 /**
  * 信息面板
  */
 export type InfoPanelData = {
   type: InfoPanelTypeEnum
+  style?: InfoPanelStyleEnum
   url: string
-  tilte?: string
+  // 标题
+  title?: string
+  // 副标题
   subTitle?: string
 }