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

IT import: envelopes, part 2

Browse source
This commit is contained in:
tildearrow 2024-06-26 00:25:33 -05:00
parent a796a82ebb
commit 24f214aac1
1 changed files with 35 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/engine/fileOps/it.cpp
View file

@ -42,16 +42,13 @@ void readEnvelope(SafeReader& reader, DivInstrument* ins, int env) {
pointTime[i]=reader.readS(); pointTime[i]=reader.readS();
} }
// x
reader.readC();
// don't process if there aren't any points or if the envelope is disabled // don't process if there aren't any points or if the envelope is disabled
if (numPoints<1) return; if (numPoints<1) return;
if (!(flags&1)) return; if (!(flags&1)) return;
logV("env points for %d: %d",env,numPoints);
for (int i=0; i<numPoints; i++) {
logV("- %d: %d",pointTime[i],pointVal[i]);
}
// convert into macro, or try to // convert into macro, or try to
DivInstrumentMacro* target=NULL; DivInstrumentMacro* target=NULL;
switch (env) { switch (env) {
@ -111,8 +108,8 @@ void readEnvelope(SafeReader& reader, DivInstrument* ins, int env) {
} }
} }
if ((point+1)>=numPoints) { if ((point+1)>=numPoints) {
target->len=i+1; target->len=i;
target->val[i]=p0; //target->val[i]=p0;
break; break;
} }
int timeDiff=pointTime[nextPoint]-pointTime[curPoint]; int timeDiff=pointTime[nextPoint]-pointTime[curPoint];
@ -121,12 +118,40 @@ void readEnvelope(SafeReader& reader, DivInstrument* ins, int env) {
if (curTime<0) curTime=0; if (curTime<0) curTime=0;
if (env==2) { if (env==2) {
p0*=2; if (flags&128) {
p0+=32;
p1+=32;
p0*=512;
p1*=512;
} else {
p0*=64;
p1*=64;
}
} }
target->len=i+1; target->len=i+1;
target->val[i]=p0+(((p1-p0)*curTime)/timeDiff); target->val[i]=p0+(((p1-p0)*curTime)/timeDiff);
} }
// split L/R
if (env==1) {
for (int i=0; i<ins->std.panLMacro.len; i++) {
int val=ins->std.panLMacro.val[i];
if (val==0) {
ins->std.panLMacro.val[i]=4095;
ins->std.panRMacro.val[i]=4095;
} else if (val>0) { // pan right
ins->std.panLMacro.val[i]=4095-val*16;
ins->std.panRMacro.val[i]=4095;
} else { // pan left
ins->std.panLMacro.val[i]=4095;
ins->std.panRMacro.val[i]=4095+val*16;
}
}
ins->std.panRMacro.len=ins->std.panLMacro.len;
ins->std.panRMacro.loop=ins->std.panLMacro.loop;
ins->std.panRMacro.rel=ins->std.panLMacro.rel;
}
} }
bool DivEngine::loadIT(unsigned char* file, size_t len) { bool DivEngine::loadIT(unsigned char* file, size_t len) {
@ -853,7 +878,7 @@ bool DivEngine::loadIT(unsigned char* file, size_t len) {
p->data[curRow][0]=12; p->data[curRow][0]=12;
p->data[curRow][1]--; p->data[curRow][1]--;
} }
} else { // note fade, but Furnace does not have that } else { // note fade, but Furnace does not support that
p->data[curRow][0]=102; p->data[curRow][0]=102;
p->data[curRow][1]=0; p->data[curRow][1]=0;
} }