Mirrors/webamp
1
0
Fork 0
mirror of https://github.com/captbaritone/webamp.git synced 2026-07-25 19:13:54 +00:00
Code Issues Projects Releases Wiki Activity

Fix image lookups for animated layers (#928)

Browse source
This commit is contained in:
jberg 2019-09-14 19:41:46 -07:00 • committed by Jordan Eldredge
parent 59281e056f
commit baa83eed61
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modern/src/App.js
View file

@ -354,7 +354,7 @@ function animatedLayerOffsetAndSize(
function AnimatedLayer({
node,
id,
image,
js_assets,
x,
y,
w,
@ -362,12 +362,12 @@ function AnimatedLayer({
framewidth,
frameheight,
}) {
if (image == null) {
const img = js_assets.image;
if (img == null) {
console.warn("Got an AnimatedLayer without an image. Rendering null", id);
return null;
}
const img = node.js_imageLookup(image.toLowerCase());
const frameNum = node.getcurframe();
let style = {};

3
modern/src/initialize.js
View file

@ -44,7 +44,8 @@ async function prepareMakiImage(node, zip, file) {
function imageAttributesFromNode(node) {
if (!node.name) return [];
switch (node.name.toLowerCase()) {
case "layer": {
case "layer":
case "animatedlayer": {
return ["image"];
}
case "layout": {

2
modern/src/runtime/AnimatedLayer.ts
View file

@ -55,7 +55,7 @@ class AnimatedLayer extends Layer {
return;
}
const image = this.js_imageLookup(attributes.image);
const image = attributes.js_assets.image;
if (!image) {
console.warn("Could not find image: ", attributes.image);
return;