diff --git a/Makefile b/Makefile index f877125..f895d81 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -all : sample0.xex sample1.xex sample2.xex sample3.xex sample4.xex sample5.xex sample6.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 # sample5.s from sample5.jpg @@ -29,7 +29,8 @@ clean : rm -f sample[0-6].s.[0-9].png rm -f sample[0-6].s.palette.png rm -f sample[0-6].s.gif + rm -f *.xex rm -f chickens.s rm -f chickens.o -.dummy: sample0.s sample1.s sample2.s sample3.s sample4.s sample5.s sample6.s chickens.s \ No newline at end of file +.dummy: sample0.s sample1.s sample2.s sample3.s sample4.s sample5.s sample6.s chickens.s diff --git a/dither-image.js b/dither-image.js index 86a4be0..685d2c2 100644 --- a/dither-image.js +++ b/dither-image.js @@ -740,7 +740,7 @@ async function main() { } let nbits = 2; - let reps = 4; + let reps = 2; let {width, height, lines} = await convert(process.argv[2], nbits, reps); diff --git a/fruit.jpg b/fruit.jpg new file mode 100644 index 0000000..629fcc9 Binary files /dev/null and b/fruit.jpg differ diff --git a/gif.sh b/gif.sh index 3fbffd6..6cf2305 100755 --- a/gif.sh +++ b/gif.sh @@ -1,4 +1,4 @@ -fps=30000/1001 +fps=60000/1001 ffmpeg \ -r $fps -i "$1.%01d.png" \ diff --git a/mapclock.jpg b/mapclock.jpg new file mode 100644 index 0000000..1578172 Binary files /dev/null and b/mapclock.jpg differ diff --git a/mp4.sh b/mp4.sh index db3e494..fe49255 100755 --- a/mp4.sh +++ b/mp4.sh @@ -1,4 +1,4 @@ -fps=30000/1001 +fps=60000/1001 ffmpeg \ -r $fps -i "$1.%01d.png" \ diff --git a/pack-wav.js b/pack-wav.js index 614aefe..79f1ad0 100644 --- a/pack-wav.js +++ b/pack-wav.js @@ -24,19 +24,21 @@ function to4bit(val8) { function pack(audio) { let packed = []; - /* for (let i = 0; i < audio.length; i += 2) { + // little-endian 4-bit samples let low = to4bit(audio[i]); let high = to4bit(audio[i + 1]); let byte = low | (high << 4); packed.push(byte); } - */ + /* + // raw push bytes for (let i = 0; i < audio.length; i += 2) { let val = to4bit(audio[i]); let byte = val | 0x10; packed.push(byte); } + */ return packed; } @@ -62,8 +64,6 @@ let infile = process.argv[2]; let outfile = process.argv[3]; let buffer = readFileSync(infile); -// @FIXME fix -buffer = buffer.slice(0, 262); let asm = wav2assembly(buffer); writeFileSync(outfile, asm, 'utf-8'); diff --git a/sailboat.jpg b/sailboat.jpg new file mode 100644 index 0000000..2fa00c6 Binary files /dev/null and b/sailboat.jpg differ diff --git a/sunset.jpg b/sunset.jpg new file mode 100644 index 0000000..db77463 Binary files /dev/null and b/sunset.jpg differ diff --git a/train404.jpg b/train404.jpg new file mode 100644 index 0000000..1e515e7 Binary files /dev/null and b/train404.jpg differ