Skip to content

Commit

Permalink
fixed: Ozeaneum and Kolding Living Images (#54)
Browse files Browse the repository at this point in the history 
Co-authored-by: Tjorben Schiller <tjorben.schiller@dataport.de>
  • Loading branch information
@nigina23 @tjorbo
nigina23 and tjorbo authored Jan 21, 2025
1 parent ccb093f commit 2d7a9cd
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 61 deletions.
128 changes: 68 additions & 60 deletions src/store/modules/institution.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,14 @@ export default {
new LIMarker(
'mediendom-rundgang',
'Mediendom-Rundgang',
baseUrl + 'mediendom-rundgang_nft.jpg',
baseUrl + 'mediendom-rundgang_nft',
baseUrl + 'mediendomrundgang800.jpg',
baseUrl + 'mediendomrundgang800',
baseUrl + 'video_mediendom-rundgang.mp4',
800,
450,
0.084
0.335,
3,
3
)
)

Expand All @@ -129,47 +131,53 @@ export default {
new LIMarker(
'bunker-d-buehne',
'Bunker-D Bühne',
baseUrl + 'Marker_Bunker-D_Buehne_400.jpg',
baseUrl + 'Marker_Bunker-D_Buehne_400',
baseUrl + 'Bunker-D_Buehne_3mbit_480p.mp4',
400, // 800
225, // 450
0.264
baseUrl + 'Marker_Bunker-D_Buehne_800.jpg',
baseUrl + 'Marker_Bunker-D_Buehne_800',
baseUrl + 'Buehne3mbit480p.mp4',
852, // 800
480, // 450
0.320,
3,
3
),
new LIMarker(
'bunker-d-rundgang',
'Bunker-D Rundgang',
baseUrl + 'Marker_Bunker-D_Rundgang_400.jpg',
baseUrl + 'Marker_Bunker-D_Rundgang_800',
baseUrl + 'Bunker-D_Rundgang_480p_3bit.mp4',
baseUrl + 'MarkerBunkerDRundgang400thresh',
baseUrl + 'BunkerDRundgang480p3bit.mp4',
800,
450,
0.264
0.435,
3,
3
)
)

/* Computermuseum */
} else if (institution.id === 'act001610') {
institution.livingImages.push(
new LIMarker(
'bunker-d-buehne',
'Bunker-D Bühne',
'computermuseum-rechner',
'Computermuseum Rechner',
baseUrl + 'Marker_Computermuseum_Markus-Rechner_400.jpg',
baseUrl + 'Marker_Computermuseum_Markus-Rechner_400', // _800
baseUrl + 'MarkerComputermuseumMarkusRechner400thresh', // _800
baseUrl + 'Computermuseum_Markus_Rechner_480_3bit.mp4',
400, // 800
225, // 450
0.264
854, // 800
480, // 450
0.325
),
new LIMarker(
'bunker-d-rundgang',
'Bunker-D Rundgang',
'computermuseum-rundgang',
'Computermuseum Rundgang',
baseUrl + 'Marker_Computermuseum_Rundgang_400.jpg',
baseUrl + 'Marker_Computermuseum_Rundgang_400', // _800
baseUrl + 'MarkerComputermuseumRundgang400thresh', // _800
baseUrl + 'Computermuseum_Rundgang_480_3bit.mp4',
400, // 800
225, // 450
0.264
0.680,
3,
3
)
)

Expand All @@ -179,12 +187,12 @@ export default {
new LIMarker(
'weihnachtsgruss2020',
'Frohe Weihnachten!',
baseUrl + 'weihnachtsgruss2020.jpg',
baseUrl + 'WeihnachtshausMarker400x227',
baseUrl + 'WeihnachtsHausSmall.mp4',
baseUrl + 'weihnachtsgruss800.jpg',
baseUrl + 'weihnachtsgruss800',
baseUrl + 'Weihnachtshaus_720p_2MBIT.mp4',
400,
227,
0.345
0.330
)
)

Expand All @@ -194,7 +202,7 @@ export default {
new LIMarker(
'weihnachtsgruss2021',
'Frohe Weihnachten! - 2021',
baseUrl + 'Weihnachtskarte2021_400.jpg',
baseUrl + 'Weihnachtskarte2021_400.jpg', // die Dateien fehlen sowohl im Dropbox als auch auf dem Server
baseUrl + 'Weihnachtskarte2021_400',
baseUrl + 'weihnachtskarte2021.mp4',
854,
Expand All @@ -203,61 +211,61 @@ export default {
)
)

/* Focke Museum */
} else if (institution.id === 'act0002598') {
institution.livingImages.push(
new LIMarker(
'pagos-erster-wurf',
'Pagos erster Wurf',
baseUrl + 'pagos-erster-wurf_400.jpg',
baseUrl + 'pagos-erster-wurf_400',
baseUrl + 'pagos-erster-wurf_3bit_480p.mp4',
854,
480,
0.164
)
)
/* Focke Museum
} else if (institution.id === 'act0002598') {
institution.livingImages.push(
new LIMarker(
'pagos-erster-wurf',
'Pagos erster Wurf',
baseUrl + 'pagos-erster-wurf_400.jpg',
baseUrl + 'pagos-erster-wurf_400',
baseUrl + 'pagos-erster-wurf_3bit_480p.mp4',
854,
480,
0.164
)
) */
/* Ozeaneum */
} else if (institution.id === 'act0002741') {
institution.livingImages.push(
new LIMarker(
'ozeaneum-marker',
'Ozeaneum Marker',
baseUrl + 'OzeaneumMarkerLI.jpg',
baseUrl + 'OzeaneumMarkerLI',
baseUrl + 'OzeaneumMarkerLI_400_thresh',
baseUrl + 'OzeaneumFilmLI.mp4',
1920,
1080,
0.454,
30,
30
0.075,
1,
1
)
)
} else if (institution.id === 'act0002644') { /* Staldgarden Museum Kolding */
institution.livingImages.push(
new LIMarker(
'jenny',
'Jenny ENG',
baseUrl + 'Living Images Jenny ENG - Cover photo.jpg',
baseUrl + 'Living Images Jenny ENG - Cover photo',
baseUrl + 'Living Images Jenny ENG.mp4',
1920,
1080,
0.454,
30,
30
baseUrl + 'jenny.jpeg', // LivingImagesJennyENGCoverphoto400.jpg
baseUrl + 'jenny', // LivingImagesJennyENGCoverphoto400_thresh
baseUrl + 'jenny.mov',
1080, // 1920
1080, // 1080 // 0.454
0.180,
8,
8
),
new LIMarker(
'walther',
'Walther ENG',
baseUrl + 'Living Images Walther ENG - Cover photo 2.jpg',
baseUrl + 'Living Images Walther ENG - Cover photo 2',
baseUrl + 'Living Images Walther ENG.mp4',
1920,
baseUrl + 'walther.jpeg', // LivingImagesWaltherENGCoverphoto2_400
baseUrl + 'walther', // LivingImagesWaltherENGCoverphoto2_400thresh
baseUrl + 'walther.mov', // LivingImagesWaltherENG.mp4
1080,
1080,
0.454,
30,
30
0.122,
4,
4
)
)
}
Expand Down
2 changes: 1 addition & 1 deletion src/views/ARViewer.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ export default {
// set locale
this.$i18n.locale = this.params.locale
// if no id, set default
if (!this.params.id) this.params.id = 'act0002741'
if (!this.params.id) this.params.id = 'act001610'
},
async mounted() {
// fetch living images
Expand Down

0 comments on commit 2d7a9cd

Please sign in to comment.