From 54461aa1401719c840e96a2eb563b0ef80cb0082 Mon Sep 17 00:00:00 2001 From: vt-idiot <81622808+vt-idiot@users.noreply.github.com> Date: Tue, 28 Nov 2023 23:01:35 -0500 Subject: [PATCH] Update vrmode.ts (#3799) * Update vrmode.ts Enabling the most common VR projection (180_LR) and an older but no longer used one (360_TB) in the UI. * Downgrade videojs-vr --------- Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com> --- ui/v2.5/package.json | 2 +- ui/v2.5/src/components/ScenePlayer/vrmode.ts | 8 ++++++-- ui/v2.5/yarn.lock | 18 +++++++++--------- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/ui/v2.5/package.json b/ui/v2.5/package.json index 090541a25..31b49ad35 100644 --- a/ui/v2.5/package.json +++ b/ui/v2.5/package.json @@ -72,7 +72,7 @@ "videojs-contrib-dash": "^5.1.1", "videojs-mobile-ui": "^0.8.0", "videojs-seek-buttons": "^3.0.1", - "videojs-vr": "^2.0.0", + "videojs-vr": "1.8.0", "videojs-vtt.js": "^0.15.4", "yup": "^1.3.2" }, diff --git a/ui/v2.5/src/components/ScenePlayer/vrmode.ts b/ui/v2.5/src/components/ScenePlayer/vrmode.ts index b11be3364..cad442c4b 100644 --- a/ui/v2.5/src/components/ScenePlayer/vrmode.ts +++ b/ui/v2.5/src/components/ScenePlayer/vrmode.ts @@ -14,12 +14,16 @@ export interface VRMenuOptions { } enum VRType { - Spherical = "360", + LR180 = "180 LR", + TB360 = "360 TB", + Mono360 = "360 Mono", Off = "Off", } const vrTypeProjection: Record = { - [VRType.Spherical]: "360", + [VRType.LR180]: "180_LR", + [VRType.TB360]: "360_TB", + [VRType.Mono360]: "360", [VRType.Off]: "NONE", }; diff --git a/ui/v2.5/yarn.lock b/ui/v2.5/yarn.lock index 25b6b891b..3a62a642b 100644 --- a/ui/v2.5/yarn.lock +++ b/ui/v2.5/yarn.lock @@ -7666,10 +7666,10 @@ thehandy@^1.0.3: resolved "https://registry.yarnpkg.com/thehandy/-/thehandy-1.0.3.tgz#51c5e9bae5932a6e5c563203711d78610b99d402" integrity sha512-zuuyWKBx/jqku9+MZkdkoK2oLM2mS8byWVR/vkQYq/ygAT6gPAXwiT94rfGuqv+1BLmsyJxm69nhVIzOZjfyIg== -three@0.125.2: - version "0.125.2" - resolved "https://registry.yarnpkg.com/three/-/three-0.125.2.tgz#dcba12749a2eb41522e15212b919cd3fbf729b12" - integrity sha512-7rIRO23jVKWcAPFdW/HREU2NZMGWPBZ4XwEMt0Ak0jwLUKVJhcKM55eCBWyGZq/KiQbeo1IeuAoo/9l2dzhTXA== +three@0.93.0: + version "0.93.0" + resolved "https://registry.yarnpkg.com/three/-/three-0.93.0.tgz#3fd6c367ef4554abbb6e16ad69936283e895c123" + integrity sha512-Ys9+UBBsd6FxTZZl4BH7B4b2F+B2uR0cOwY7OQ/aCzU/VgO4Wmmr1LbWPH1fsTvSVik9KAuwxwOHlSC4IMGOLA== throttle-debounce@^5.0.0: version "5.0.0" @@ -8180,14 +8180,14 @@ videojs-seek-buttons@^3.0.1: dependencies: global "^4.4.0" -videojs-vr@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/videojs-vr/-/videojs-vr-2.0.0.tgz#3d86e3fececf7373cfb89b950ed6ab77ca783d2b" - integrity sha512-ix4iN8XHaDSEe89Jqybj9DuLKYuK33EIzcSI0IEdnv1KJuH8bd0PYlQEgqIZTOmWruFpW/+rjYFCVUQ9PTypJw== +videojs-vr@1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/videojs-vr/-/videojs-vr-1.8.0.tgz#7f2f07f760d8a329c615acd316e49da6ee8edd34" + integrity sha512-776gXqt8g6/rLeV56nn/aUcO0sRy+mgFITCw8cIqzTzl93SE1PEK/QE3YNqtppUfU5igayrx7WKsWhDOpsXMpw== dependencies: "@babel/runtime" "^7.14.5" global "^4.4.0" - three "0.125.2" + three "0.93.0" video.js "^6 || ^7" webvr-polyfill "0.10.12"