@realsee/vreo 0.2.0-alpha.5 → 0.2.0-alpha.6

package/lib/typings/VreoUnit.d.ts

@@ -210,11 +210,16 @@ export declare enum InfoPanelTypeEnum {
     Image = "Image",
     Video = "Video"
 }
+export declare enum InfoPanelStyleEnum {
+    Drawer = "Drawer",
+    PopUp = "PopUp"
+}
 /**
  * 信息面板
  */
 export declare type InfoPanelData = {
     type: InfoPanelTypeEnum;
+    style?: InfoPanelStyleEnum;
     url: string;
     title?: string;
     subTitle?: string;

package/lib/typings/VreoUnit.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.VreoKeyframeEnum = exports.PanoTagEnum = exports.PanoEffectEnum = exports.InfoPanelTypeEnum = void 0;
+exports.VreoKeyframeEnum = exports.PanoTagEnum = exports.PanoEffectEnum = exports.InfoPanelTypeEnum = exports.InfoPanelStyleEnum = void 0;
 var VreoKeyframeEnum;
 /**
  * 支持自定义剧本关键帧配置项
@@ -55,13 +55,21 @@ exports.PanoEffectEnum = PanoEffectEnum;
  * 信息面板类型枚举
  */
 var InfoPanelTypeEnum;
-/**
- * 信息面板
- */
-
 exports.InfoPanelTypeEnum = InfoPanelTypeEnum;
 
 (function (InfoPanelTypeEnum) {
   InfoPanelTypeEnum["Image"] = "Image";
   InfoPanelTypeEnum["Video"] = "Video";
-})(InfoPanelTypeEnum || (exports.InfoPanelTypeEnum = InfoPanelTypeEnum = {}));
+})(InfoPanelTypeEnum || (exports.InfoPanelTypeEnum = InfoPanelTypeEnum = {}));
+
+var InfoPanelStyleEnum;
+/**
+ * 信息面板
+ */
+
+exports.InfoPanelStyleEnum = InfoPanelStyleEnum;
+
+(function (InfoPanelStyleEnum) {
+  InfoPanelStyleEnum["Drawer"] = "Drawer";
+  InfoPanelStyleEnum["PopUp"] = "PopUp";
+})(InfoPanelStyleEnum || (exports.InfoPanelStyleEnum = InfoPanelStyleEnum = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/vreo",
-  "version": "0.2.0-alpha.5",
+  "version": "0.2.0-alpha.6",
   "description": "Vreo (VR Video 缩写) 是基于如视三维渲染引擎 Five 和 用户界面构建库 React 实现的如视 3D 空间剧本播放器。",
   "keywords": [
     "realsee",

package/resources/Player/Controller.ts

@@ -24,6 +24,16 @@ export class Controller extends Subscribe<VreoKeyframeEvent> {
     return !this.videoAgentScene?.videoAgentMesh.videoUrl?.endsWith('.mp4')
   }
 
+  popUp: string | JSX.Element | null = null
+
+  openPopUp(popUp: string | JSX.Element | false) {
+    if (!popUp) {
+      this.popUp = null
+      return
+    }
+    this.popUp = popUp
+  }
+
   drawerConfig: {
     content: string | JSX.Element
     height?: number | string
@@ -57,6 +67,8 @@ export class Controller extends Subscribe<VreoKeyframeEvent> {
       setVisible: action,
       playing: observable,
       setPlaying: action,
+      popUp: observable.ref,
+      openPopUp: action,
       drawerConfig: observable.ref,
       openDrawer: action,
     })

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

@@ -8,6 +8,29 @@ import { CSS3DRenderPlugin, CSS3DRenderPluginExportType } from '@realsee/dnaloge
 import { VreoKeyframe, VreoKeyframeEnum } from '../../../typings/VreoUnit'
 import { CustomVreoKeyframeProps } from '../../typings'
 
+// const mockData: SpatialScenePanelData = {
+//   customType: 'SpatialScenePanel',
+//   "stateList": [
+//     {
+//       "icon": "http://vrlab-public.ljcdn.com/release/seesay/tools/___fc42f951076607a22fd5c54f005ba553.png",
+//       "text": "窗帘关闭"
+//     },
+//     {
+//       "icon": "http://vrlab-public.ljcdn.com/release/seesay/tools/___b331e7ad732debc07250a169a3393b13.png",
+//       "text": "摄像头休眠"
+//     },
+//     {
+//       "icon": "http://vrlab-public.ljcdn.com/release/seesay/tools/___2e425a81ac0ad88232d50d4e52a9abfa.png",
+//       "text": "氛围音乐"
+//     },
+//     {
+//       "icon": "http://vrlab-public.ljcdn.com/release/seesay/tools/___bff48bb81cde37aa6a319d6f5d56e3a4.png",
+//       "text": "空调打开"
+//     }
+//   ],
+//   "temperature": "27",
+//   "title": "沉浸式回家"
+// }
 export interface SpatialScenePanelData {
   customType: 'SpatialScenePanel'
   title: string
@@ -16,8 +39,8 @@ export interface SpatialScenePanelData {
     text: string
     icon: string
   }[]
-  position: { x: number; y: number; z: number }
-  quaternion: [number, number, number, number]
+  position?: { x: number; y: number; z: number }
+  quaternion?: [number, number, number, number]
 }
 
 interface SearchParams {
@@ -25,9 +48,17 @@ interface SearchParams {
   // position: Vector3
   // rotation?: Vector3
   // quaternion: [number, number, number, number]
-  dom: HTMLDivElement 
+  dom: HTMLDivElement
 }
 
+// const getSphere = (position: Vector3, color = 0xffff00) => {
+//   const geometry = new SphereGeometry(0.05, 32, 16)
+//   const material = new MeshBasicMaterial({ color })
+//   const sphere = new Mesh(geometry, material)
+//   sphere.position.copy(position)
+//   return sphere
+// }
+
 const searchV1 = ({ five, dom }: SearchParams) => {
   const cameraDirection = new Vector3()
   five.camera.getWorldDirection(cameraDirection)
@@ -48,16 +79,17 @@ const searchV1 = ({ five, dom }: SearchParams) => {
   const rightBottom = new Vector3(right, bottom)
 
   const points = [leftBottom, rightBottom, rightTop, leftTop].map((point) => {
-    point.setX((point.x / window.innerWidth) * 2 - 2)
+    point.setX((point.x / window.innerWidth) * 2 - 1.25)
     point.setY(-(point.y / window.innerHeight) * 2 + 1)
     point.setZ(0.5)
     return point.unproject(five.camera).addScaledVector(cameraDirection, 0.2)
   })
 
+  // __debug__
   // const colors = [0xdc143c, 0xffff00, 0x0000ff, 0x008000]
   // points.forEach((p, index) => five.scene.add(getSphere(p, colors[index])))
 
-  const ratio = leftBottom.distanceTo(rightBottom) / 120
+  const ratio = leftBottom.distanceTo(rightBottom) / 150
   return { points, ratio }
 }
 
@@ -71,7 +103,6 @@ export function SpatialScenePanel(props: CustomVreoKeyframeProps) {
   const rendererRef = React.useRef<CSS3DRenderPluginExportType>(CSS3DRenderPlugin(props.five))
 
   React.useEffect(() => {
-
     if (!ref.current) {
       return
     }
@@ -83,9 +114,10 @@ export function SpatialScenePanel(props: CustomVreoKeyframeProps) {
 
       const data = keyframe.data as SpatialScenePanelData
 
+      // const data = mockData
       const { points, ratio } = searchV1({
         five: props.five,
-        dom: ref.current!
+        dom: ref.current!,
       })
 
       const { container, dispose, css3DObject, render } =
@@ -93,32 +125,33 @@ export function SpatialScenePanel(props: CustomVreoKeyframeProps) {
 
       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)
+      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, { $callback: callback })
     props.subscribe.on(VreoKeyframeEnum.Custom, callback)
 
     return () => {
@@ -151,5 +184,5 @@ const Panel = React.forwardRef(
 
       <div className="SpatialScenePanel-disappear-area"></div>
     </div>
-  ),
+  )
 )

package/resources/Player/index.tsx

@@ -8,6 +8,7 @@ import { VreoKeyframeEvent, VreoUnit } from '../typings/VreoUnit'
 import { reaction } from 'mobx'
 import { Drawer } from './modules/Drawer'
 import { PlayerConfigs } from './typings'
+import { PopUp } from './modules/PopUp'
 
 export class Player extends Subscribe<VreoKeyframeEvent> {
   $five: Five
@@ -42,6 +43,7 @@ export class Player extends Subscribe<VreoKeyframeEvent> {
       <ControllerContext.Provider value={this.controller}>
         <App></App>
         <Drawer />
+        <PopUp />
         {this.configs.customKeyframes &&
           this.configs.customKeyframes.map((CustomCmpt, key) => (
             <CustomCmpt

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

@@ -0,0 +1,26 @@
+import * as React from 'react'
+import classNames from 'classnames'
+import { observer } from 'mobx-react'
+import { Controller } from '../../Controller'
+import { useController } from '../../hooks'
+
+const PopUpView = observer(({ controller }: { controller: Controller }) => {
+
+  return (
+    <div
+      className={classNames('vreo-PopUp', {
+        'vreo-PopUp-visible': controller.popUp,
+      })}
+      onClick={() => controller.openPopUp(false)}
+    >
+      <div className="vreo-PopUp-inner">
+        {controller.popUp ||  ''}
+      </div>
+    </div>
+  )
+})
+
+export function PopUp() {
+  const controller = useController()
+  return <PopUpView controller={controller} />
+}

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

@@ -1,6 +1,12 @@
 import * as React from 'react'
 import { ReactNode } from 'react'
-import { InfoPanelData, InfoPanelTypeEnum, VreoKeyframe, VreoKeyframeEnum } from '../../../../typings/VreoUnit'
+import {
+  InfoPanelData,
+  InfoPanelStyleEnum,
+  InfoPanelTypeEnum,
+  VreoKeyframe,
+  VreoKeyframeEnum,
+} from '../../../../typings/VreoUnit'
 import { useController } from '../../../hooks'
 
 function InfoPanelImg({ url, children }: { url: string; children?: ReactNode }) {
@@ -16,7 +22,9 @@ function InfoPanelVideo({ url, children }: { url: string; children?: ReactNode }
   return (
     <div className="vreo-infoPanel vreo-infoPanel--video">
       {children}
-      <div className="vreo-infoPanelWrapper"><video playsInline autoPlay className="vreo-infoPanelVideo" src={url} /></div>
+      <div className="vreo-infoPanelWrapper">
+        <video playsInline autoPlay className="vreo-infoPanelVideo" src={url} />
+      </div>
     </div>
   )
 }
@@ -47,49 +55,86 @@ export function InfoPanel() {
     if (controller.configs?.keyframeMap.InfoPanel === false) {
       return
     }
+
     const callback = (keyframe: VreoKeyframe) => {
       const { start, end, data } = keyframe
 
       const infoPanelData = data as InfoPanelData
 
-      const { title, subTitle } = infoPanelData
-      if (infoPanelData.type === InfoPanelTypeEnum.Image) {
-        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}>
-              <Title title={title} subTitle={subTitle} />
-            </InfoPanelVideo>
-          ),
-          height: '60vh',
-        })
-      }
-      timeoutRef.current = setTimeout(() => controller.openDrawer(false), end - start)
+      const { title, subTitle, style } = infoPanelData
+      do {
+        if (style === InfoPanelStyleEnum.PopUp) {
+          if (infoPanelData.type === InfoPanelTypeEnum.Image) {
+            controller.openPopUp(
+              <InfoPanelImg url={infoPanelData.url}>
+                <Title title={title} subTitle={subTitle} />
+              </InfoPanelImg>
+            )
+          } else if (infoPanelData.type === InfoPanelTypeEnum.Video) {
+            controller.openPopUp(
+              <InfoPanelVideo url={infoPanelData.url}>
+                <Title title={title} subTitle={subTitle} />
+              </InfoPanelVideo>
+            )
+          }
+          break
+        }
+        if (infoPanelData.type === InfoPanelTypeEnum.Image) {
+          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}>
+                <Title title={title} subTitle={subTitle} />
+              </InfoPanelVideo>
+            ),
+            height: '60vh',
+          })
+        }
+      } while (false)
+
+      timeoutRef.current = setTimeout(() => {
+        controller.openDrawer(false)
+        controller.openPopUp(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">
+    //     controller.openPopUp(
+    //       // <InfoPanelImg url='//vrlab-static.ljcdn.com/release/web/psq/a.8e868cb2.gif' />
+    //       // <InfoPanelImg url='//vrlab-public.ljcdn.com/release/web/psq/b.f9a1ed52.png' />
+    //       // <InfoPanelImg url='//vrlab-public.ljcdn.com/release/web/psq/c.4f88c112.png' />
+    //       // <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'} />
-    //       </InfoPanelVideo>
-    //       ),
-    //       height: '60vh',
-    //     })
+    //       </InfoPanelImg>
+    //       // <InfoPanelVideo url="//vrlab-public.ljcdn.com/release/seesay/tools/2022011713142___b320f74a5e1b5ad4bb46b4dc69d73ecc.mp4">
+    //       //   <Title title="场景联动抓拍图片" subTitle={'2022.02.17 14:00'} />
+    //       // </InfoPanelVideo>
+    //     )
+    //   },
+    //   $setInfoPanel2: () => {
+    //     controller.openPopUp(
+    //       <InfoPanelImg url='//vrlab-static.ljcdn.com/release/web/psq/a.8e868cb2.gif' />
+    //       // <InfoPanelImg url='//vrlab-public.ljcdn.com/release/web/psq/b.f9a1ed52.png' />
+    //       // <InfoPanelImg url='//vrlab-public.ljcdn.com/release/web/psq/c.4f88c112.png' />
+    //       // <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>
+    //     )
     //   },
     // })
 

package/resources/typings/VreoUnit.ts

@@ -235,11 +235,17 @@ export enum InfoPanelTypeEnum {
   Video = 'Video',
 }
 
+export enum InfoPanelStyleEnum {
+  Drawer = 'Drawer',
+  PopUp = 'PopUp',
+}
+
 /**
  * 信息面板
  */
 export type InfoPanelData = {
   type: InfoPanelTypeEnum
+  style?: InfoPanelStyleEnum
   url: string
   // 标题
   title?: string

package/stylesheets/default.css

@@ -547,3 +547,69 @@
   opacity: 0;
   transition: opacity 0.45s;
 }
+
+.vreo-PopUp {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  pointer-events: none;
+  background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.7) 65%);
+  opacity: 0;
+  transition: opacity .45s;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.vreo-PopUp.vreo-PopUp-visible {
+  opacity: 1;
+  pointer-events: all;
+}
+
+.vreo-PopUp-inner {
+  width: 339px;
+  height: 425px;
+  position: relative;
+}
+
+@media only screen and (min-width: 960px) {
+  .vreo-PopUp-inner {
+    width: 678px;
+    height: 620px;
+    position: relative;
+  }
+  .vreo-infoPanelVideo {
+    max-width: 100%;
+  }
+}
+
+.vreo-PopUp-inner .vreo-infoPanel {
+  background-color: initial;
+  justify-content: center;
+}
+
+.vreo-PopUp-inner .vreo-infoPanel-title {
+  position: absolute;
+  bottom: 32px;
+  left: 0;
+  z-index: 1;
+  flex-direction: column;
+  justify-content: end;
+  height: 200px;
+  background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.8));
+}
+
+.vreo-PopUp-inner .vreo-infoPanel-title .vreo-infoPanel-t1 {
+  padding-left: 0;
+  font-size: 20px;
+  font-weight: 600;
+  padding-bottom: 14px;
+}
+
+.vreo-PopUp-inner .vreo-infoPanel-title .vreo-infoPanel-t2 {
+  padding: 0 0 24px 0;
+  font-size: 14px;
+  opacity: 0.85;
+}