Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix (web): panorama / 360 view - partial panorama: use photo-sphere-viewer #6992

Merged
merged 3 commits into from
Feb 9, 2024
Merged

fix (web): panorama / 360 view - partial panorama: use photo-sphere-viewer #6992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0bf3b83
panorama viewer fixes
dmitry-brazhenko Feb 9, 2024
ebe3836
prettifier
dmitry-brazhenko Feb 9, 2024
d014e06
fix
dmitry-brazhenko Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
61 changes: 14 additions & 47 deletions web/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@
},
"type": "module",
"dependencies": {
"@egjs/svelte-view360": "^4.0.0-beta.7",
"@immich/sdk": "file:../open-api/typescript-sdk",
"@mdi/js": "^7.3.67",
"@photo-sphere-viewer/core": "^5.7.0",
"@zoom-image/svelte": "^0.2.0",
"axios": "^1.6.7",
"buffer": "^6.0.3",
Expand Down
5 changes: 2 additions & 3 deletions web/src/lib/components/asset-viewer/panorama-viewer.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
import { fade } from 'svelte/transition';
import LoadingSpinner from '../shared-components/loading-spinner.svelte';
import { api, type AssetResponseDto } from '@api';
import View360, { EquirectProjection } from '@egjs/svelte-view360';
import './panorama-viewer.css';
import PhotoSphere from './photo-sphere-viewer-adapter.svelte';

export let asset: AssetResponseDto;

Expand Down Expand Up @@ -34,7 +33,7 @@
<LoadingSpinner />
{:then assetData}
{#if assetData}
<View360 autoResize={true} initialZoom={0.5} projection={new EquirectProjection({ src: assetData })} />
<PhotoSphere panorama={assetData} />
{:else}
<p>{errorMessage}</p>
{/if}
Expand Down
27 changes: 27 additions & 0 deletions web/src/lib/components/asset-viewer/photo-sphere-viewer-adapter.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<script lang="ts">
import { Viewer } from '@photo-sphere-viewer/core';
import '@photo-sphere-viewer/core/index.css';
import { onDestroy, onMount } from 'svelte';

export let panorama: string;
let container: HTMLDivElement;
let viewer: Viewer;

onMount(() => {
viewer = new Viewer({
container,
panorama,
touchmoveTwoFingers: true,
mousewheelCtrlKey: false,
navbar: false,
});
});

onDestroy(() => {
if (viewer) {
viewer.destroy();
}
});
</script>

<div class="h-full w-full mb-0" bind:this={container} />