otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

.ftm import: N163 wave conversion improvements

Browse source 
better local to global wave mapping
issue #2476
This commit is contained in:
tildearrow 2025-06-21 21:19:18 -05:00
parent 42a2e2c933
commit 1ee703a158
1 changed files with 45 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/engine/fileOps/ftm.cpp
View file

@ -436,6 +436,7 @@ bool DivEngine::loadFTM(unsigned char* file, size_t len, bool dnft, bool dnft_si
unsigned int expansions = 0;
unsigned int tchans = 0;
unsigned int n163Chans = 0;
int n163WaveOff[128];
bool hasSequence[256][8];
unsigned char sequenceIndex[256][8];
unsigned char macro_types[256][8];
@ -459,6 +460,7 @@ bool DivEngine::loadFTM(unsigned char* file, size_t len, bool dnft, bool dnft_si
int total_chans = 0;
memset(n163WaveOff,0,128*sizeof(int));
memset(hasSequence, 0, 256 * 8 * sizeof(bool));
memset(sequenceIndex, 0, 256 * 8);
memset(macro_types, 0, 256 * 8);
@ -1187,7 +1189,8 @@ bool DivEngine::loadFTM(unsigned char* file, size_t len, bool dnft, bool dnft_si
}
unsigned int wave_count = reader.readI();
size_t waveOff = ds.wave.size();
n163WaveOff[insIndex] = ds.wave.size();
ins->n163.wave = n163WaveOff[insIndex];
if (wave_size>256) {
logE("wave size %d out of range",wave_size);
@ -1214,17 +1217,6 @@ bool DivEngine::loadFTM(unsigned char* file, size_t len, bool dnft, bool dnft_si
}
}
// offset wave macro
if (ins->std.waveMacro.len == 0) // empty wave macro
{
ins->std.waveMacro.len = 1;
ins->std.waveMacro.val[0] = waveOff;
} else {
for (int p=0; p<ins->std.waveMacro.len; p++) {
ins->std.waveMacro.val[p] += waveOff;
}
}
break;
}
@ -1945,7 +1937,7 @@ bool DivEngine::loadFTM(unsigned char* file, size_t len, bool dnft, bool dnft_si
for (int v = 0; v < 8; v++) {
if (map_channels[ch] == n163_chans[v]) {
if (pat->data[row][4 + (j * 2)] == 0x12) {
pat->data[row][4 + (j * 2)] = 0x10; // TODO: map wave
pat->data[row][4 + (j * 2)] = 0x110; // N163 wave change (we'll map this later)
}
}
}
@ -2773,6 +2765,46 @@ bool DivEngine::loadFTM(unsigned char* file, size_t len, bool dnft, bool dnft_si
if (i->virtualTempoD<1) i->virtualTempoD=1;
}
// offset N163 wave macros (local -> global wave conversion)
for (size_t i=0; i<ds.ins.size(); i++) {
DivInstrument* ins=ds.ins[i];
int waveOff=n163WaveOff[i];
if (ins->type==DIV_INS_N163) {
for (int j=0; j<ins->std.waveMacro.len; j++) {
ins->std.waveMacro.val[j]+=waveOff;
}
}
}
// offset N163 wave change effects whether possible
for (DivSubSong* i: ds.subsong) {
for (int j=0; j<total_chans; j++) {
int curWaveOff=0;
for (int k=0; k<i->ordersLen; k++) {
DivPattern* p=i->pat[j].getPattern(i->orders.ord[j][k],true);
for (int l=0; l<i->patLen; l++) {
// check for instrument change
if (p->data[l][2]!=-1) {
curWaveOff=n163WaveOff[p->data[l][2]&127];
}
// check effect columns for 0x110 (dummy wave change)
for (int m=0; m<i->pat[j].effectCols; m++) {
if (p->data[l][4+(m<<1)]==0x110) {
// map wave
p->data[l][4+(m<<1)]=0x10;
if (p->data[l][5+(m<<1)]==-1) {
p->data[l][5+(m<<1)]=curWaveOff&0xff;
} else {
p->data[l][5+(m<<1)]=(p->data[l][5+(m<<1)]+curWaveOff)&0xff;
}
}
}
}
}
}
}
if (active) quitDispatch();
BUSY_BEGIN_SOFT;
saveLock.lock();