diff --git a/Makefile b/Makefile index 9a00152..06fde2d 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,11 @@ -all : sample0.xex sample1.xex sample2.xex sample3.xex sample4.xex sample5.xex sample6.xex fruit.xex mapclock.xex sailboat.xex sunset.xex train404.xex +all : sample0.xex sample1.xex sample2.xex sample3.xex sample4.xex sample5.xex sample6.xex fruit.xex mapclock.xex sailboat.xex sunset.xex train404.xex potato.xex # sample5.s from sample5.jpg # reminder: $< is input # $@ is output -%.s : %.jpg dither-image.js +%.s : %.jpg dither-image.js gif.sh mp4.sh node dither-image.js $< $@ ./gif.sh $@ ./mp4.sh $@ @@ -16,7 +16,7 @@ chickens.s : chickens.wav pack-wav.js %.o : %.s ca65 -v -t atari -o $@ $< -%.xex : %.o dither4.o chickens.o +%.xex : %.o dither4.o chickens.o atari-asm-xex.cfg ld65 -v -C ./atari-asm-xex.cfg -o $@ dither4.o chickens.o $< clean : diff --git a/gif.sh b/gif.sh index f735379..10f35e4 100755 --- a/gif.sh +++ b/gif.sh @@ -8,5 +8,6 @@ ffmpeg \ ffmpeg \ -r $fps -i "$1.%01d.png" \ -i "$1.palette.png" \ - -lavfi "paletteuse[1],[1]scale=w=640:h=384:sws_flags=neighbor" \ + -lavfi "[0]scale=w=800:h=480:sws_flags=neighbor[scaled];\ + [scaled][1]paletteuse=dither=none" \ -y "$1.gif" diff --git a/mp4.sh b/mp4.sh index fe49255..452f050 100755 --- a/mp4.sh +++ b/mp4.sh @@ -2,6 +2,6 @@ fps=60000/1001 ffmpeg \ -r $fps -i "$1.%01d.png" \ - -vf scale=w=640:h=384:sws_flags=neighbor,format=yuv420p \ + -vf scale=w=800:h=480:sws_flags=neighbor,format=yuv420p \ -g 480 \ -y "$1.mp4" diff --git a/potato.jpg b/potato.jpg new file mode 100644 index 0000000..2ff6d6b Binary files /dev/null and b/potato.jpg differ