From 965725327beba17914b52601ca6cd471a5ca8be9 Mon Sep 17 00:00:00 2001 From: tildearrow Date: Mon, 28 Nov 2022 03:05:14 -0500 Subject: [PATCH] T6W28: now implement easy noise here --- src/engine/platform/sms.cpp | 2 +- src/engine/platform/t6w28.cpp | 39 +++++++++++++++++++++++++---------- src/engine/platform/t6w28.h | 4 ++++ src/gui/sysConf.cpp | 15 +++++++++++++- 4 files changed, 47 insertions(+), 13 deletions(-) diff --git a/src/engine/platform/sms.cpp b/src/engine/platform/sms.cpp index eb680b6d8..24c4a3301 100644 --- a/src/engine/platform/sms.cpp +++ b/src/engine/platform/sms.cpp @@ -137,7 +137,7 @@ int DivPlatformSMS::snCalcFreq(int ch) { if (ret<0) ret=0; return ret; } - return parent->calcFreq(chan[ch].baseFreq,chan[ch].pitch,true,0,chan[ch].pitch2,chipClock,toneDivider); + return parent->calcFreq(chan[ch].baseFreq,chan[ch].pitch,true,0,chan[ch].pitch2,chipClock,ch==3?noiseDivider:toneDivider); } void DivPlatformSMS::tick(bool sysTick) { diff --git a/src/engine/platform/t6w28.cpp b/src/engine/platform/t6w28.cpp index 033bf10af..75daa6e44 100644 --- a/src/engine/platform/t6w28.cpp +++ b/src/engine/platform/t6w28.cpp @@ -81,10 +81,29 @@ void DivPlatformT6W28::writeOutVol(int ch) { } } +double DivPlatformT6W28::NOTE_SN(int ch, int note) { + double CHIP_DIVIDER=16; + if (ch==3) CHIP_DIVIDER=15; + if (parent->song.linearPitch==2 || !easyNoise) { + return NOTE_PERIODIC(note); + } + if (note>107) { + return MAX(0,13-107); + } + return NOTE_PERIODIC(note); +} + +int DivPlatformT6W28::snCalcFreq(int ch) { + if (parent->song.linearPitch==2 && easyNoise && chan[ch].baseFreq+chan[ch].pitch+chan[ch].pitch2>(107<<7)) { + int ret=(((13<<7)+0x40)-(chan[ch].baseFreq+chan[ch].pitch+chan[ch].pitch2-(107<<7)))>>7; + if (ret<0) ret=0; + return ret; + } + return parent->calcFreq(chan[ch].baseFreq,chan[ch].pitch,true,0,chan[ch].pitch2,chipClock,ch==3?15:16); +} + void DivPlatformT6W28::tick(bool sysTick) { for (int i=0; i<4; i++) { - double CHIP_DIVIDER=16; - if (i==3) CHIP_DIVIDER=15; chan[i].std.next(); if (chan[i].std.vol.had) { chan[i].outVol=VOL_SCALE_LOG_BROKEN(chan[i].vol&15,MIN(15,chan[i].std.vol.val),15); @@ -92,7 +111,7 @@ void DivPlatformT6W28::tick(bool sysTick) { if (chan[i].std.arp.had) { if (!chan[i].inPorta) { int noiseSeek=parent->calcArp(chan[i].note,chan[i].std.arp.val); - chan[i].baseFreq=NOTE_PERIODIC(noiseSeek); + chan[i].baseFreq=NOTE_SN(i,noiseSeek); } chan[i].freqChanged=true; } @@ -124,7 +143,7 @@ void DivPlatformT6W28::tick(bool sysTick) { rWrite(1,0xe0+chan[i].duty); } if (chan[i].freqChanged || chan[i].keyOn || chan[i].keyOff) { - chan[i].freq=parent->calcFreq(chan[i].baseFreq,chan[i].pitch,true,0,chan[i].pitch2,chipClock,CHIP_DIVIDER); + chan[i].freq=snCalcFreq(i); if (chan[i].freq>1023) chan[i].freq=1023; if (i==3) { rWrite(1,0x80|(2<<5)|(chan[3].freq&15)); @@ -141,13 +160,11 @@ void DivPlatformT6W28::tick(bool sysTick) { } int DivPlatformT6W28::dispatch(DivCommand c) { - double CHIP_DIVIDER=16; - if (c.chan==3) CHIP_DIVIDER=15; switch (c.cmd) { case DIV_CMD_NOTE_ON: { DivInstrument* ins=parent->getIns(chan[c.chan].ins,DIV_INS_PCE); if (c.value!=DIV_NOTE_NULL) { - chan[c.chan].baseFreq=NOTE_PERIODIC(c.value); + chan[c.chan].baseFreq=NOTE_SN(c.chan,c.value); chan[c.chan].freqChanged=true; chan[c.chan].note=c.value; } @@ -197,7 +214,7 @@ int DivPlatformT6W28::dispatch(DivCommand c) { chan[c.chan].freqChanged=true; break; case DIV_CMD_NOTE_PORTA: { - int destFreq=NOTE_PERIODIC(c.value2); + int destFreq=NOTE_SN(c.chan,c.value2); bool return2=false; if (destFreq>chan[c.chan].baseFreq) { chan[c.chan].baseFreq+=c.value; @@ -231,15 +248,15 @@ int DivPlatformT6W28::dispatch(DivCommand c) { break; } case DIV_CMD_LEGATO: - chan[c.chan].baseFreq=NOTE_PERIODIC(c.value+((chan[c.chan].std.arp.will && !chan[c.chan].std.arp.mode)?(chan[c.chan].std.arp.val):(0))); + chan[c.chan].baseFreq=NOTE_SN(c.chan,c.value+((chan[c.chan].std.arp.will && !chan[c.chan].std.arp.mode)?(chan[c.chan].std.arp.val):(0))); chan[c.chan].freqChanged=true; chan[c.chan].note=c.value; break; case DIV_CMD_PRE_PORTA: if (chan[c.chan].active && c.value2) { - if (parent->song.resetMacroOnPorta) chan[c.chan].macroInit(parent->getIns(chan[c.chan].ins,DIV_INS_PCE)); + if (parent->song.resetMacroOnPorta) chan[c.chan].macroInit(parent->getIns(chan[c.chan].ins,DIV_INS_T6W28)); } - if (!chan[c.chan].inPorta && c.value && !parent->song.brokenPortaArp && chan[c.chan].std.arp.will) chan[c.chan].baseFreq=NOTE_PERIODIC(chan[c.chan].note); + if (!chan[c.chan].inPorta && c.value && !parent->song.brokenPortaArp && chan[c.chan].std.arp.will) chan[c.chan].baseFreq=NOTE_SN(c.chan,chan[c.chan].note); chan[c.chan].inPorta=c.value; break; case DIV_CMD_GET_VOLMAX: diff --git a/src/engine/platform/t6w28.h b/src/engine/platform/t6w28.h index c95850d04..2cd66f9fd 100644 --- a/src/engine/platform/t6w28.h +++ b/src/engine/platform/t6w28.h @@ -76,6 +76,10 @@ class DivPlatformT6W28: public DivDispatch { unsigned char regPool[128]; friend void putDispatchChip(void*,int); friend void putDispatchChan(void*,int,int); + + double NOTE_SN(int ch, int note); + int snCalcFreq(int ch); + void writeOutVol(int ch); public: void acquire(short* bufL, short* bufR, size_t start, size_t len); diff --git a/src/gui/sysConf.cpp b/src/gui/sysConf.cpp index eb4f06544..326c39a99 100644 --- a/src/gui/sysConf.cpp +++ b/src/gui/sysConf.cpp @@ -1527,12 +1527,25 @@ bool FurnaceGUI::drawSysConf(int chan, DivSystem type, DivConfig& flags, bool mo } break; } + case DIV_SYSTEM_T6W28: { + bool noEasyNoise=flags.getBool("noEasyNoise",false); + + if (ImGui::Checkbox("Disable easy period to note mapping on upper octaves",&noEasyNoise)) { + altered=true; + } + + if (altered) { + e->lockSave([&]() { + flags.set("noEasyNoise",noEasyNoise); + }); + } + break; + } case DIV_SYSTEM_SWAN: case DIV_SYSTEM_VERA: case DIV_SYSTEM_BUBSYS_WSG: case DIV_SYSTEM_YMU759: case DIV_SYSTEM_PET: - case DIV_SYSTEM_T6W28: case DIV_SYSTEM_VBOY: ImGui::Text("nothing to configure"); break;