mirror of
https://github.com/UiO-Gaming/infoscreen3.git
synced 2026-11-05 13:56:52 +01:00
Fix webgl transition from video to slide
This commit is contained in:
1 parent
1fef8a85af
commit
862d45f621
4 files changed
+6
-2
No files matched your search
@@ -442,6 +442,9 @@ export default class admin {
|
||||
}
|
||||
|
||||
bundle.save();
|
||||
// Adds empty slide render for smooth transitions
|
||||
// Could be enhanced with the actual last video frame
|
||||
fs.copyFileSync("./templates/bundle/render/empty.png","./data/bundles/" + data.bundleName + "/render/" + filename + ".png")
|
||||
|
||||
cli.success("save video link");
|
||||
socket.emit("callback.saveVideo", {});
|
||||
|
||||
+1
-1
@@ -115,7 +115,7 @@ export default class bundleClass {
|
||||
x++;
|
||||
}
|
||||
if (slide.uuid === uuid) {
|
||||
if (slide.type === "slide") {
|
||||
if (slide.type === "slide" || slide.type === "video") {
|
||||
let path = process.cwd() + "/data/bundles/" + this.name;
|
||||
try {
|
||||
uuid = checkAndSanitizeFilePathName(uuid)
|
||||
|
||||
@@ -300,6 +300,7 @@ function nextSlide(data) {
|
||||
displayWebPage(serverOptions.currentMeta.webUrl);
|
||||
break;
|
||||
case "video":
|
||||
sketch.showSlide(serverOptions.currentFile, serverOptions.transition);
|
||||
displayVideo(serverOptions.currentMeta.url, serverOptions.currentMeta.loop, serverOptions.currentMeta.mute);
|
||||
setTimeout(function () {
|
||||
clearIFrame(getWebLayer());
|
||||
@@ -446,7 +447,7 @@ async function preloadImages(data) {
|
||||
|
||||
for (let i in allSlides) {
|
||||
try {
|
||||
if (allSlides[i].type === "slide") {
|
||||
if (allSlides[i].type === "slide" || allSlides[i].type === "video") {
|
||||
await sketch.loadImage("/render/" + serverOptions.currentBundle + "/" + allSlides[i].uuid + ".png", allSlides[i].uuid);
|
||||
}
|
||||
} catch (err) {
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 38 KiB |
Reference in new issue
Block a user