diff --git a/.gitignore b/.gitignore index e03e791..6a5633b 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,5 @@ assets/disk0/*.mov assets/diskMediabin/* video_encoder/* + +assets/disk0/tvdos/bin/tautfont.png diff --git a/TAUD_NOTE_EFFECTS.md b/TAUD_NOTE_EFFECTS.md index bbf9402..fcb8a88 100644 --- a/TAUD_NOTE_EFFECTS.md +++ b/TAUD_NOTE_EFFECTS.md @@ -487,7 +487,7 @@ A tempo slide's memory slot is separate from the set-tempo path and is private t **Plain.** Sets the global mix bus volume (0..$FF). $00 is silence; $FF is full. The default is $80. -**Compatibility.** ST3's global volume is 0..$40; convert with `taud_v = st3_v × 4`, clamped at $FF. On export, `st3_v = taud_v >> 2`, clamped at $40. +**Compatibility.** ST3's global volume is 0..$40; convert with `taud_v = st3_v × 4`, clamped at $FF. On export, `st3_v = taud_v >> 2`, clamped at $40. IT's global volume is 0..$80; convert with `taud_v = it_v × 2`, clamped at $FF. **Implementation.** Write the high byte to `global_volume` on the row the command appears. The low byte is reserved. ST3's `kST3NoMutedChannels` rule applies: V on a muted channel is ignored by ST3; for strict-compatible playback Taud follows suit, but new Taud compositions should avoid muting channels that carry global effects. @@ -517,6 +517,16 @@ Peak at maximum settings: $7F × $FF >> 9 = $3F — the full panning range. Retr --- +## X $xx00 — Set Panning + +**Plain.** **Unimplemented**. On IT, sets the panning position of the current channel, $00 being full-left and $FF being full-right. + +**Compatibility.** Convert directly into panning effect `0.$xx`, rounded down to nearest 6-bit value. + +**Implementation.** Not applicable. + +--- + # The S subcommand family S is a multiplexing opcode; the **high nibble of the high byte** selects the sub-effect, and the remainder is the sub-argument. diff --git a/assets/disk0/tvdos/bin/taut.js b/assets/disk0/tvdos/bin/taut.js index 43a571f..63a6b49 100644 --- a/assets/disk0/tvdos/bin/taut.js +++ b/assets/disk0/tvdos/bin/taut.js @@ -70,7 +70,7 @@ middot:MIDDOT } const fxNames = { -A:"Set tick speed", +A:"Tick speed", B:"Jump to order", C:"Break pattern", D:"Volume slide", @@ -89,8 +89,8 @@ R:"Tremolo", T:"Tempo", V:"Global volume", S:"Special", -S1:"Glissando ctrl", -S2:"Sample finetune", +S1:"Gliss. ctrl", +S2:"Sample tune", S3:"Vibrato LFO", S4:"Tremolo LFO", S8:"Channel pan", @@ -629,18 +629,20 @@ function drawVoiceDetail() { const effop = ptnDat[5] const effarg = ptnDat[6] | (ptnDat[7] << 8) + // TODO draw cumulative internal status in the very time play cursor is on + con.move(6,1) print(`Pitch $${note.hex04()}\tInst $${inst.hex02()}\tVolEff ${voleffop}.$${voleffarg.hex02()}\t`+ `PanEff ${paneffop}.$${paneffarg.hex02()}`) con.move(7,1) let fx = effop.toString(36).toUpperCase() if (fx == '0') { - print(`Fx`+' '.repeat(32)) + print(`\u00F8`+' '.repeat(32)) } else { if (fx == 'S') fx += (effarg >>> 12).hex1() let fxName = fxNames[fx] - print(`Fx ${fxName} $${effarg.hex04()} `) + print(`\u00F8 ${fxName}\t$${effarg.hex04()} `) } } diff --git a/assets/disk0/tvdos/bin/tautfont.kra b/assets/disk0/tvdos/bin/tautfont.kra index 71ae4c8..5c0ca3c 100644 --- a/assets/disk0/tvdos/bin/tautfont.kra +++ b/assets/disk0/tvdos/bin/tautfont.kra @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1118e0700290985c61bfb7b45ec46190c3ad1511362d619582195a000c9be3f -size 89431 +oid sha256:949811c18c96b615e96982bb4386437b3b4725ccefdd9d28a8e9dde4777cdf92 +size 89865 diff --git a/assets/disk0/tvdos/bin/tautfont_high.chr b/assets/disk0/tvdos/bin/tautfont_high.chr index 36eb13d..5547d46 100644 Binary files a/assets/disk0/tvdos/bin/tautfont_high.chr and b/assets/disk0/tvdos/bin/tautfont_high.chr differ diff --git a/assets/disk0/tvdos/bin/tautfont_low.chr b/assets/disk0/tvdos/bin/tautfont_low.chr index 6119180..d03fe81 100644 Binary files a/assets/disk0/tvdos/bin/tautfont_low.chr and b/assets/disk0/tvdos/bin/tautfont_low.chr differ diff --git a/tsvm_core/src/net/torvald/tsvm/rom/FontROM7x14.png b/tsvm_core/src/net/torvald/tsvm/rom/FontROM7x14.png index 2cafa42..15f0171 100644 Binary files a/tsvm_core/src/net/torvald/tsvm/rom/FontROM7x14.png and b/tsvm_core/src/net/torvald/tsvm/rom/FontROM7x14.png differ