@realsee/vreo 0.1.6 → 0.2.0-alpha.3

package/resources/Player/custom/SpatialScenePanel/index.tsx

@@ -0,0 +1,161 @@
+import * as React from 'react'
+import ReactDOM from 'react-dom'
+import { Five } from '@realsee/five'
+import { Raycaster, Vector3 } from 'three'
+import { tweenProgress } from '@realsee/dnalogel/shared-utils/animationFrame/BetterTween'
+import { CSS3DRenderPlugin, CSS3DRenderPluginExportType } from '@realsee/dnalogel/plugins/CSS3DRenderPlugin'
+
+import { VreoKeyframe, VreoKeyframeEnum } from '../../../typings/VreoUnit'
+import { CustomVreoKeyframeProps } from '../../typings'
+
+export interface SpatialScenePanelData {
+  customType: 'SpatialScenePanel'
+  title: string
+  temperature: string
+  stateList: {
+    text: string
+    icon: string
+  }[]
+  position: { x: number; y: number; z: number }
+  quaternion: [number, number, number, number]
+}
+
+interface SearchParams {
+  five: Five
+  position: Vector3
+  rotation?: Vector3
+  quaternion: [number, number, number, number]
+  dom: HTMLDivElement 
+}
+
+const searchV1 = ({ five, position, rotation, dom }: SearchParams) => {
+  const cameraDirection = new Vector3()
+  five.camera.getWorldDirection(cameraDirection)
+  const cameraPosition = five.camera.position
+  const [intersect] = five.model.intersectRaycaster(new Raycaster(cameraPosition, cameraDirection))
+  const point = five.project2d(intersect.point)
+
+  // const width = dom!.clientWidth
+  const height = dom!.clientHeight
+  dom!.style.left = point!.x + 'px'
+  dom!.style.top = point!.y - height / 2 + 'px'
+  const rect = dom!.getBoundingClientRect()
+  const { left, top, bottom, right } = rect
+
+  const leftBottom = new Vector3(left, bottom)
+  const leftTop = new Vector3(left, top)
+  const rightTop = new Vector3(right, top)
+  const rightBottom = new Vector3(right, bottom)
+
+  const points = [leftBottom, rightBottom, rightTop, leftTop].map((point) => {
+    point.setX((point.x / window.innerWidth) * 2 - 1)
+    point.setY(-(point.y / window.innerHeight) * 2 + 1)
+    point.setZ(0.5)
+    return point.unproject(five.camera).addScaledVector(cameraDirection, 0.2)
+  })
+
+  // const colors = [0xdc143c, 0xffff00, 0x0000ff, 0x008000]
+  // points.forEach((p, index) => five.scene.add(getSphere(p, colors[index])))
+
+  const ratio = leftBottom.distanceTo(rightBottom) / 160
+  return { points, ratio }
+}
+
+/**
+ * 空间场景面板
+ * @returns
+ */
+export function SpatialScenePanel(props: CustomVreoKeyframeProps) {
+  const ref = React.useRef<HTMLDivElement>(null)
+  const panelRef = React.useRef<HTMLDivElement | null>(null)
+  const rendererRef = React.useRef<CSS3DRenderPluginExportType>(CSS3DRenderPlugin(props.five))
+
+  React.useEffect(() => {
+
+    if (!ref.current) {
+      return
+    }
+
+    const callback = (keyframe: VreoKeyframe) => {
+      if (keyframe.data.customType !== 'SpatialScenePanel') {
+        return
+      }
+
+      const data = keyframe.data as SpatialScenePanelData
+      // const data = mockData as SpatialScenePanelData
+
+      const { points, ratio } = searchV1({
+        five: props.five,
+        position: new Vector3(data.position.x, data.position.y, data.position.z),
+        quaternion: data.quaternion,
+        dom: ref.current!
+      })
+
+      console.log(points, ratio)
+
+      const { container, dispose, css3DObject, render } =
+        rendererRef.current.create3DDomContainer(points, { ratio, autoRender: false }) || {}
+
+      if (!container) return
+
+
+      ReactDOM.render(<Panel ref={(ref) => (panelRef.current = ref)} data={data} />, container)
+        const startRotateY = -(Math.PI * 2) / 9
+        let lastRotateY = 0
+        tweenProgress(1000)
+          .onUpdate(({ progress }) => {
+            const needRotateY = (Math.PI / 90) * 11 * progress
+            const rotateY = needRotateY - lastRotateY
+            css3DObject?.rotateY(rotateY)
+            lastRotateY = needRotateY
+          })
+          .onStart(() => {
+            css3DObject?.rotateY(startRotateY)
+            render!()
+          })
+          .onDispose(() => {
+            panelRef.current?.classList.add('show')
+          })
+          .play()
+        const { start, end } = keyframe
+        setTimeout(() => {
+          panelRef.current?.classList.add('hide')
+          setTimeout(() => dispose?.(), 1500)
+        }, end - start)
+    }
+
+    Object.assign(window, {$SpatialScenePanelCallback: callback})
+    props.subscribe.on(VreoKeyframeEnum.Custom, callback)
+
+    return () => {
+      props.subscribe.off(VreoKeyframeEnum.Custom, callback)
+    }
+  }, [])
+
+  return <div className="vreo-SpatialScenePanel" ref={ref}></div>
+}
+
+const Panel = React.forwardRef(
+  (props: { data: SpatialScenePanelData }, myRef: React.LegacyRef<HTMLDivElement> | undefined) => (
+    <div className="SpatialScenePanel" ref={myRef}>
+      <div className="SpatialScenePanel-show-area">
+        <div className="SpatialScenePanel-bg"></div>
+        <div className="SpatialScenePanel-header">
+          <div className="SpatialScenePanel-title">{props.data?.title}</div>
+          <div className="SpatialScenePanel-temperature">{props.data?.temperature}℃</div>
+        </div>
+        <div className="SpatialScenePanel-body">
+          {props.data?.stateList?.map((state, index) => (
+            <div key={`scene-${state.text}`} className={`SpatialScenePanel-item index_${index}`}>
+              <img className="SpatialScenePanel-icon" src={state.icon}></img>
+              <div className="SpatialScenePanel-text">{state.text}</div>
+              <div className="SpatialScenePanel-dot"></div>
+            </div>
+          ))}
+        </div>
+      </div>
+
+      <div className="SpatialScenePanel-disappear-area"></div>
+    </div>
+  ),
+)

package/resources/Player/index.tsx

@@ -4,7 +4,7 @@ import { Five, Subscribe } from '@realsee/five'
 
 import { App } from './App'
 import { Controller, ControllerContext } from './Controller'
-import { VreoKeyframeEvent, VreoKeyframeConfigMap, VreoUnit } from '../typings/VreoUnit'
+import { VreoKeyframeEvent, VreoUnit } from '../typings/VreoUnit'
 import { reaction } from 'mobx'
 import { Drawer } from './modules/Drawer'
 import { PlayerConfigs } from './typings'
@@ -42,6 +42,18 @@ export class Player extends Subscribe<VreoKeyframeEvent> {
       <ControllerContext.Provider value={this.controller}>
         <App></App>
         <Drawer />
+        {this.configs.customKeyframes &&
+          this.configs.customKeyframes.map((CustomCmpt, key) => (
+            <CustomCmpt
+              key={key}
+              subscribe={{
+                on: (name, callback) => this.on(name, callback),
+                once: (name, callback) => this.once(name, callback),
+                off: (name, callback) => this.off(name, callback),
+              }}
+              five={five}
+            />
+          ))}
       </ControllerContext.Provider>,
       configs.containter
     )
@@ -58,6 +70,7 @@ export class Player extends Subscribe<VreoKeyframeEvent> {
   async load(vreoUnit: VreoUnit, currentTime = 0) {
     if (!this.controller.visible) {
       this.controller.setVisible(true)
+      // 延迟 500ms 规避跟 DOM 动画冲突
       await new Promise((resolve) => {
         setTimeout(() => resolve(true), 500)
       })
@@ -71,6 +84,8 @@ export class Player extends Subscribe<VreoKeyframeEvent> {
     this.controller.vreoUnit = vreoUnit
     this.controller.videoInstance?.pause()
 
+    // 新数据载入就绪
+    this.emit('loaded', vreoUnit)
     if (vreoUnit.video.url) {
       if (this.controller.videoAgentScene?.videoAgentMesh.videoInstance) {
         this.controller.videoAgentScene.videoAgentMesh.videoInstance.currentTime = currentTime / 1000

package/resources/Player/modules/Drawer/index.tsx

@@ -5,7 +5,7 @@ import { Controller } from '../../Controller'
 import { useController } from '../../hooks'
 
 const DrawerView = observer(({ controller }: { controller: Controller }) => {
-  const maxHeight = '540px'
+  const maxHeight = '400px'
   const height = (() => {
     const height = controller.drawerConfig?.height
     if (!height) {

package/resources/Player/modules/VideoAgent/VideoAgentMesh.ts

@@ -196,7 +196,7 @@ export class VideoAgentMesh extends THREE.Mesh {
   }
 
   async play(videoUrl = '') {
-    videoUrl = (videoUrl || '').replace(/https*:/, '')
+    videoUrl = videoUrl || ''
     if (!videoUrl) {
       if (this.videoUrl) await this.videoInstance.play()
       else console.warn('警告：视频资源未初始化。')

package/resources/Player/modules/VideoAgent/VideoAgentScene.ts

@@ -31,10 +31,19 @@ export class VideoAgentScene {
   }
 
   run = () => {
+    const domElement = this.renderer.domElement
+
     // 视频开始 1s 不渲染：规避某些设备黑屏闪烁问题。视频前 2s 是最好是静默的。
     if (!(this.videoAgentMesh.paused || this.videoAgentMesh.freeze) && this.videoAgentMesh.currentTime > 1000) {
       this.renderer.render(this.scene, this.camera)
     }
+
+    // 兼容非视频场景
+    if (!this.videoAgentMesh.videoUrl?.endsWith('.mp4')) {
+      if (domElement.style.display !== 'none') domElement.style.display = 'none'
+    } else {
+      if (domElement.style.display !== 'block') domElement.style.display = 'block'
+    }
     requestAnimationFrame(this.run)
   }
 

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

@@ -0,0 +1,66 @@
+import * as React from 'react'
+import { BgMusicData, VreoKeyframe, VreoKeyframeEnum } from '../../../../typings/VreoUnit'
+import { useController } from '../../../hooks'
+
+export function BgMusic() {
+  const controller = useController()
+  const timeoutIdRef = React.useRef<NodeJS.Timeout | null>(null)
+  const cleanTimeout = React.useCallback( () => {
+    if (timeoutIdRef.current) {
+      clearTimeout(timeoutIdRef.current)
+      timeoutIdRef.current = null
+    }
+  }, [])
+
+  React.useEffect(() => {
+    const audio = new Audio()
+    audio.setAttribute('id', 'vreo-singleton-bgmusic')
+    audio.style.display = 'none'
+
+    audio.setAttribute('playsinline', 'true')
+    audio.loop = true
+    document.body.append(audio)
+
+    const callback = (keyframe: VreoKeyframe) => {
+      const { start, end } = keyframe
+      const { url } = keyframe.data as BgMusicData
+      audio.src = url
+      const playCallback = () => {
+        audio.play()
+      }
+  
+      audio.addEventListener('canplaythrough', playCallback)
+
+      cleanTimeout()
+    
+      const cleanAudio = () => {
+        audio.pause()
+        audio.currentTime = 0
+        audio.src = ''
+        cleanTimeout()
+        audio.removeEventListener('canplaythrough', playCallback)
+      }
+  
+      const duration = (end - start) || 5000
+    
+      timeoutIdRef.current = setTimeout(() => {
+        cleanAudio()
+      }, duration)
+
+      controller.once('paused', () => {
+        cleanAudio()
+      })
+
+    }
+
+    controller.on(VreoKeyframeEnum.BgMusic, callback)
+
+    return () => {
+      controller.off(VreoKeyframeEnum.BgMusic, callback)
+      document.body.removeChild(audio)
+      cleanTimeout()
+    }
+  })
+
+  return <></>
+}

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

@@ -1,19 +1,40 @@
 import * as React from 'react'
+import { ReactNode } from 'react'
 import { InfoPanelData, InfoPanelTypeEnum, VreoKeyframe, VreoKeyframeEnum } from '../../../../typings/VreoUnit'
 import { useController } from '../../../hooks'
 
-function InfoPanelImg({ url }: { url: string }) {
+function InfoPanelImg({ url, children }: { url: string; children?: ReactNode }) {
   return (
     <div className="vreo-infoPanel vreo-infoPanel--img">
-      <img className="vreo-infoPanelImg" src={url} />
+      {children}
+      <div className="vreo-infoPanelImg" style={{ backgroundImage: `url(${url})` }}></div>
     </div>
   )
 }
 
-function InfoPanelVideo({ url }: { url: string }) {
+function InfoPanelVideo({ url, children }: { url: string; children?: ReactNode }) {
   return (
     <div className="vreo-infoPanel vreo-infoPanel--video">
-      <video playsInline autoPlay className="vreo-infoPanelVideo" src={url} />
+      {children}
+      <div className="vreo-infoPanelWrapper"><video playsInline autoPlay className="vreo-infoPanelVideo" src={url} /></div>
+    </div>
+  )
+}
+
+interface TitleProps {
+  title?: string
+  subTitle?: string
+}
+
+const Title = (props: TitleProps) => {
+  if (!props.title && !props.subTitle) {
+    return null
+  }
+
+  return (
+    <div className="vreo-infoPanel-title">
+      <div className="vreo-infoPanel-t1">{props.title}</div>
+      <div className="vreo-infoPanel-t2">{props.subTitle}</div>
     </div>
   )
 }
@@ -31,15 +52,47 @@ export function InfoPanel() {
 
       const infoPanelData = data as InfoPanelData
 
+      const { title, subTitle } = infoPanelData
       if (infoPanelData.type === InfoPanelTypeEnum.Image) {
-        controller.openDrawer({ content: <InfoPanelImg url={infoPanelData.url} />, height: '60vh' })
+        controller.openDrawer({
+          content: (
+            <InfoPanelImg url={infoPanelData.url}>
+              <Title title={title} subTitle={subTitle} />
+            </InfoPanelImg>
+          ),
+          height: '60vh',
+        })
       } else if (infoPanelData.type === InfoPanelTypeEnum.Video) {
-        controller.openDrawer({ content: <InfoPanelVideo url={infoPanelData.url} />, height: '60vh' })
+        controller.openDrawer({
+          content: (
+            <InfoPanelVideo url={infoPanelData.url}>
+              <Title title={title} subTitle={subTitle} />
+            </InfoPanelVideo>
+          ),
+          height: '60vh',
+        })
       }
       timeoutRef.current = setTimeout(() => controller.openDrawer(false), end - start)
     }
     controller.on(VreoKeyframeEnum.InfoPanel, callback)
 
+    // Object.assign(window, {
+    //   $setInfoPanel: () => {
+    //     controller.openDrawer({
+    //       content: (
+    //         // <InfoPanelImg url='//vrlab-public.ljcdn.com/release/seesay/tools/cat_music___f68fb9bbe1f7cd6d00a16456dd0b09ad.gif'>
+    //         // <InfoPanelImg url="http://vrlab-public.ljcdn.com/common/images/web/d94e1bd7-0311-4b20-9c41-a1294fe43554.png">
+    //         //   <Title title="场景联动抓拍图片" subTitle={'2022.02.17 14:00'} />
+    //         // </InfoPanelImg>
+    //         <InfoPanelVideo url="//vrlab-public.ljcdn.com/release/seesay/tools/2022011713142___b320f74a5e1b5ad4bb46b4dc69d73ecc.mp4">
+    //         <Title title="场景联动抓拍图片" subTitle={'2022.02.17 14:00'} />
+    //       </InfoPanelVideo>
+    //       ),
+    //       height: '60vh',
+    //     })
+    //   },
+    // })
+
     return () => {
       controller.off(VreoKeyframeEnum.InfoPanel, callback)
       if (timeoutRef.current) {

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

@@ -20,8 +20,8 @@ export function ModelVideo() {
       ref.current.disable()
       await ref.current.load(
         {
-          video_src: videoSrc.replace(/https*:/, ''),
-          video_poster_src: videoPosterSrc.replace(/https*:/, ''),
+          video_src: videoSrc,
+          video_poster_src: videoPosterSrc,
           points: [vertexs],
         },
         controller.configs?.videos?.modelTVVideo

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

@@ -1,34 +1,88 @@
 import * as React from 'react'
-import { parseWork } from '@realsee/five'
+import { parseWork, Work } from '@realsee/five'
 import { useController, useFiveInstance } from '../../../hooks'
 import { UpdateVRPanoramaData, VreoKeyframe, VreoKeyframeEnum } from '../../../../typings/VreoUnit'
 
 export function UpdateVRPanorama() {
   const controller = useController()
   const five = useFiveInstance()
+  const rawRef = React.useRef<string[] | null>(null)
+  const workRef = React.useRef<Work | null>(null)
+
+  const restoreCallback = React.useCallback(() => {
+    if (rawRef.current) {
+      const work = parseWork(rawRef.current)
+      five.load(work)
+    }
+   
+    workRef.current = null
+  }, [])
+
+  const pausedCallback = React.useCallback(() => {
+    if (rawRef.current) {
+      const work = parseWork(rawRef.current)
+      five.load(work)
+    }
+  }, [])
+
+  const playingCallback = React.useCallback(() => {
+    if (!workRef.current) {
+      return
+    }
+    five.load(workRef.current)
+  }, [])
 
   React.useEffect(() => {
     const callback = (keyframe: VreoKeyframe) => {
-      const { panoIndex, images } = keyframe.data as UpdateVRPanoramaData
+      if (!rawRef.current) {
+        rawRef.current = five.work.raw.works
+      }
 
-      const newWorkJSON = JSON.parse(JSON.stringify(five.work?.raw.work))
+      const data = keyframe.data as UpdateVRPanoramaData
 
-      // // 原Work数据不能被修改
-      if (newWorkJSON.panorama && newWorkJSON.panorama.list && newWorkJSON.panorama.list[panoIndex]) {
-        Object.assign(newWorkJSON.panorama.list[panoIndex], images)
-      } else if (newWorkJSON.observers && newWorkJSON.observers[panoIndex] && newWorkJSON.observers[panoIndex].images) {
-        Object.assign(newWorkJSON.observers[panoIndex].images, images)
+      // 如果数据中有新 work 数据，则直接载入
+      if (data.work) {
+        workRef.current = parseWork(data.work)
+        five.load(workRef.current)
+        return
       }
 
-      const newWork = parseWork(newWorkJSON)
+      const lastRawWork = five.work?.raw.works[0]
+
+      // 动态场景：不提供完成的签名数据，需重新整理
+      if (data.dynamic_scene && !data.panorama) {
+        const lastWork = JSON.parse(lastRawWork)
+        const panorama = lastWork.panorama
+        const index = data.dynamic_scene.images.index
+        panorama.list[index] = data.dynamic_scene.images
+        data.panorama = panorama
+        delete data.dynamic_scene
+      }
 
-      // // 需要还原么？待定 ...
-      five.load(newWork)
+      workRef.current = parseWork([lastRawWork, data])
+      five.load(workRef.current)
     }
 
     controller.on(VreoKeyframeEnum.UpdateVRPanorama, callback)
+
+    // 离开 将之前的内容清空
+    controller.on(VreoKeyframeEnum.Exit, restoreCallback)
+  
+    // 新载入数据 将之前的内容清空
+    controller.on('loaded', restoreCallback)
+
+    // 暂停 回到默认状态
+    controller.on('paused', pausedCallback)
+    // 播放 回归暂停前状态
+    controller.on('playing', playingCallback)
+
     return () => {
+      // 清理事件监听
       controller.off(VreoKeyframeEnum.UpdateVRPanorama, callback)
+      controller.off(VreoKeyframeEnum.Exit, restoreCallback)
+      controller.off('loaded', restoreCallback)
+      controller.off('paused', pausedCallback)
+      controller.off('playing', playingCallback)
     }
   }, [controller])
 

package/resources/Player/typings.ts

@@ -1,4 +1,7 @@
-import { VreoKeyframeConfigMap } from '../typings/VreoUnit'
+import React, { ReactNode } from 'react';
+import { Subscribe, Five } from '@realsee/five';
+
+import { VreoKeyframeConfigMap, VreoKeyframeEvent } from '../typings/VreoUnit'
 
 export interface PlayerConfigs {
   containter?: ReactDOM.Container
@@ -12,4 +15,16 @@ export interface PlayerConfigs {
     videoEffect?: HTMLVideoElement
     modelTVVideo?: HTMLVideoElement
   }
+  /**
+   * 如果需要在 底部面板添加自定义内容，可以传递个 React 组件。
+   */
+  customPanelChildren?: ReactNode
+  customKeyframes?: React.FC<CustomVreoKeyframeProps>[]
+}
+
+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'
 
@@ -97,14 +97,16 @@ export const CameraMovementPlugin: FivePlugin<CameraMovementPluginParameterType,
     return await new Promise<boolean>((resolve, reject) => {
       const panoIndex = args.panoIndex !== undefined ? args.panoIndex : five.panoIndex
       if (panoIndex !== undefined) {
+        const movePanoOptions: MovePanoOptions = {
+          duration, // 移动耗时
+          moveEndCallback: () => resolve(true), // 移动结束
+          moveCancelCallback: () => reject(false), // 移动开始
+          effect: 'fade',
+        }
         five.moveToPano(
           panoIndex,
           Object.assign(
-            {
-              duration, // 移动耗时
-              moveEndCallback: () => resolve(true), // 移动结束
-              moveCancelCallback: () => reject(false), // 移动开始
-            },
+            movePanoOptions,
             args,
           ),
         )

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,7 +39,7 @@ export interface CameraMovementOptsCallback {
 export type MoveArgs = {
   mode: Mode
   panoIndex: number
-} & Pose
+} & Pose & Pick<MovePanoOptions, 'effect'>
 
 export type MoveOpts = {
   preload?: boolean

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 () => {