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

prepare for new arp strategy

Browse source
This commit is contained in:
tildearrow 2022-12-17 01:21:08 -05:00
parent 905329e1e4
commit 3eb3d8a6f1
54 changed files with 209 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/engine/chipUtils.h
View file

@ -28,23 +28,44 @@
// common shared channel struct
template<typename T> struct SharedChannel {
int freq, baseFreq, baseFreqOverride, pitch, pitch2, arpOff;
int freq, baseFreq, baseNoteOverride, pitch, pitch2, arpOff;
int ins, note;
bool active, insChanged, freqChanged, keyOn, keyOff, portaPause, inPorta;
bool active, insChanged, freqChanged, fixedArp, keyOn, keyOff, portaPause, inPorta;
T vol, outVol;
DivMacroInt std;
void handleArp() {
void handleArp(int offset=0) {
if (std.arp.had) {
if (std.arp.val<0) {
if (!(std.arp.val&0x40000000)) {
baseNoteOverride=(std.arp.val|0x40000000)+offset;
fixedArp=true;
} else {
arpOff=std.arp.val;
fixedArp=false;
}
} else {
if (std.arp.val&0x40000000) {
baseNoteOverride=(std.arp.val&(~0x40000000))+offset;
fixedArp=true;
} else {
arpOff=std.arp.val;
fixedArp=false;
}
}
freqChanged=true;
}
}
void macroInit(DivInstrument* which) {
std.init(which);
pitch2=0;
arpOff=0;
baseFreqOverride=-1;
baseNoteOverride=0;
fixedArp=false;
}
SharedChannel(T initVol):
freq(0),
baseFreq(0),
baseFreqOverride(-1),
baseNoteOverride(0),
pitch(0),
pitch2(0),
arpOff(0),
@ -53,6 +74,7 @@ template<typename T> struct SharedChannel {
active(false),
insChanged(true),
freqChanged(false),
fixedArp(false),
keyOn(false),
keyOff(false),
portaPause(false),