etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-11-30 00:13:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

arp fixed mode

Browse source
This commit is contained in:
tildearrow 2021-05-16 12:47:05 -05:00
parent 4662e567c2
commit 5a8e20fcd1
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/engine/macroInt.cpp
View file

@ -66,6 +66,7 @@ void DivMacroInt::init(DivInstrument* which) {
hadArp=false; hadArp=false;
hadDuty=false; hadDuty=false;
hadWave=false; hadWave=false;
arpMode=false;
if (ins==NULL) return; if (ins==NULL) return;
@ -85,4 +86,8 @@ void DivMacroInt::init(DivInstrument* which) {
hadWave=true; hadWave=true;
hasWave=true; hasWave=true;
} }
if (ins->std.arpMacroMode) {
arpMode=true;
}
} }

4
src/engine/macroInt.h
View file

@ -10,6 +10,7 @@ class DivMacroInt {
unsigned char vol, arp, duty, wave; unsigned char vol, arp, duty, wave;
bool hasVol, hasArp, hasDuty, hasWave; bool hasVol, hasArp, hasDuty, hasWave;
bool hadVol, hadArp, hadDuty, hadWave; bool hadVol, hadArp, hadDuty, hadWave;
bool arpMode;
void next(); void next();
void init(DivInstrument* which); void init(DivInstrument* which);
DivMacroInt(): DivMacroInt():
@ -25,7 +26,8 @@ class DivMacroInt {
hadVol(false), hadVol(false),
hadArp(false), hadArp(false),
hadDuty(false), hadDuty(false),
hadWave(false) {} hadWave(false),
arpMode(false) {}
}; };
#endif #endif

6
src/engine/platform/sms.cpp
View file

@ -14,7 +14,11 @@ void DivPlatformSMS::tick() {
chan[i].std.next(); chan[i].std.next();
if (chan[i].std.hadVol) sn->write(0x90|(i<<5)|(15-((chan[i].vol*chan[i].std.vol)>>4))); if (chan[i].std.hadVol) sn->write(0x90|(i<<5)|(15-((chan[i].vol*chan[i].std.vol)>>4)));
if (chan[i].std.hadArp) { if (chan[i].std.hadArp) {
chan[i].baseFreq=round(1712.0f/pow(2.0f,((float)(chan[i].note+chan[i].std.arp-12)/12.0f))); if (chan[i].std.arpMode) {
chan[i].baseFreq=round(1712.0f/pow(2.0f,((float)(chan[i].std.arp-12)/12.0f)));
} else {
chan[i].baseFreq=round(1712.0f/pow(2.0f,((float)(chan[i].note+chan[i].std.arp-12)/12.0f)));
}
chan[i].freqChanged=true; chan[i].freqChanged=true;
} }
} }