Demos/jsxm
Watch
1
0
Fork
You've already forked jsxm
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

implement E5x finetune override

Browse source 
nf_chill.xm just needs EDx now
This commit is contained in:
Andy Sloane 2015-11-14 09:29:08 -08:00
commit 05216f5ce0
3 changed files with 38 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

39
test/effects.js vendored
View file

@ -1,11 +1,14 @@
var XMPlayer = window.XMPlayer; var XMPlayer = window.XMPlayer;
// TODO: // tests TODO:
// - portamento 3xx // - bxx: song jump
// - vibrato 4xy // - dxx: pattern jump
// - volume slide Axy // - rxy: retrigger w/ volume changes
// - porta+vol 5xy // low priority TODO (trivial or already covered by other tests):
// - etc etc // - 5xy: porta+vol
// - 6xy: vibrato+vol
// - 8xx: panning
// - 9xx: sample offset
exports['test 0xy arpeggio'] = function(assert) { exports['test 0xy arpeggio'] = function(assert) {
var xm = testdata.resetXMData(); var xm = testdata.resetXMData();
@ -204,7 +207,6 @@ exports['test Axy volume slide'] = function(assert) {
exports['test Gxx global volume'] = function(assert) { exports['test Gxx global volume'] = function(assert) {
var xm = testdata.resetXMData(); var xm = testdata.resetXMData();
// [pat][row][channel] // [pat][row][channel]
// 1 channel, 3 row blank pattern
xm.patterns = [ xm.patterns = [
[ [
[[48, 1, -1, 16, 0x40]], // C-4 1 -- G40 [[48, 1, -1, 16, 0x40]], // C-4 1 -- G40
@ -223,3 +225,26 @@ exports['test Gxx global volume'] = function(assert) {
XMPlayer.nextTick(); XMPlayer.nextTick();
assert.equal(XMPlayer.xm.global_volume, 0x40*2, 'global volume set to 0x40'); assert.equal(XMPlayer.xm.global_volume, 0x40*2, 'global volume set to 0x40');
}; };
exports['test E5x finetune override'] = function(assert) {
var xm = testdata.resetXMData();
// [pat][row][channel]
xm.instruments[0].samples[0].fine = -4;
xm.patterns = [
[
[[48, 1, -1, 0, 0x00]], // C-4 1 -- 000 (sample finetune -4)
[[48, 1, -1, 14, 0x50]], // C-4 1 -- E50 (finetune -128)
[[48, 1, -1, 14, 0x5f]] // C-4 1 -- E5f (finetune +127)
]
];
xm.tempo = 1;
var ch = xm.channelinfo[0];
XMPlayer.nextTick();
var f0 = ch.doff;
XMPlayer.nextTick();
var f1 = 12 * 128 * Math.log(ch.doff / f0) / Math.log(2);
assert.equal(f1.toFixed(2), "-124.00", "E50 finetune -128");
XMPlayer.nextTick();
var f2 = 12 * 128 * Math.log(ch.doff / f0) / Math.log(2);
assert.equal(f2.toFixed(2), "131.00", "E50 finetune +127");
};

4
xm.js
View file

@ -105,7 +105,7 @@ function updateChannelPeriod(ch, period) {
} }
function periodForNote(ch, note) { function periodForNote(ch, note) {
return 1920 - (note + ch.samp.note)*16 - ch.samp.fine / 8.0; return 1920 - (note + ch.samp.note)*16 - ch.fine / 8.0;
} }
function setCurrentPattern() { function setCurrentPattern() {
@ -158,6 +158,7 @@ function nextRow() {
ch.samp = inst.samples[inst.samplemap[ch.note]]; ch.samp = inst.samples[inst.samplemap[ch.note]];
ch.vol = ch.samp.vol; ch.vol = ch.samp.vol;
ch.pan = ch.samp.pan; ch.pan = ch.samp.pan;
ch.fine = ch.samp.fine;
} }
} else { } else {
// console.log("invalid inst", r[i][1], instruments.length); // console.log("invalid inst", r[i][1], instruments.length);
@ -179,6 +180,7 @@ function nextRow() {
// (potentially) new sample // (potentially) new sample
ch.pan = ch.samp.pan; ch.pan = ch.samp.pan;
ch.vol = ch.samp.vol; ch.vol = ch.samp.vol;
ch.fine = ch.samp.fine;
} }
triggernote = true; triggernote = true;
} }

3
xmeffects.js
View file

@ -134,6 +134,9 @@ function eff_t0_e(ch, data) { // extended effects!
case 2: // fine porta down case 2: // fine porta down
ch.period += data; ch.period += data;
break; break;
case 5: // finetune
ch.fine = (data<<4) + data - 128;
break;
case 8: // panning case 8: // panning
ch.pan = data * 0x11; ch.pan = data * 0x11;
break; break;