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

game boy progress, part 2

Browse source
This commit is contained in:
tildearrow 2021-05-27 16:47:09 -05:00
parent a1ab7c5d57
commit d6398ac10e
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/engine/platform/gb.cpp
View file

@ -47,8 +47,13 @@ void DivPlatformGB::tick() {
} }
} }
if (chan[i].std.hadWave) { if (chan[i].std.hadWave) {
if (chan[i].wave!=chan[i].std.wave) {
chan[i].wave=chan[i].std.wave; chan[i].wave=chan[i].std.wave;
if (i==2) updateWave(); if (i==2) {
updateWave();
if (!chan[i].keyOff) chan[i].keyOn=true;
}
}
} }
if (chan[i].freqChanged || chan[i].keyOn || chan[i].keyOff) { if (chan[i].freqChanged || chan[i].keyOn || chan[i].keyOff) {
chan[i].freq=(chan[i].baseFreq*(ONE_SEMITONE-chan[i].pitch))/ONE_SEMITONE; chan[i].freq=(chan[i].baseFreq*(ONE_SEMITONE-chan[i].pitch))/ONE_SEMITONE;
@ -56,6 +61,10 @@ void DivPlatformGB::tick() {
if (chan[i].keyOn) { if (chan[i].keyOn) {
DivInstrument* ins=parent->getIns(chan[i].ins); DivInstrument* ins=parent->getIns(chan[i].ins);
if (i==2) { // wave if (i==2) { // wave
if (chan[i].wave<0) {
chan[i].wave=0;
updateWave();
}
rWrite(16+i*5,0x80); rWrite(16+i*5,0x80);
rWrite(16+i*5+2,gbVolMap[chan[i].vol]); rWrite(16+i*5+2,gbVolMap[chan[i].vol]);
} else { } else {
@ -94,7 +103,6 @@ int DivPlatformGB::dispatch(DivCommand c) {
chan[c.chan].note=c.value; chan[c.chan].note=c.value;
chan[c.chan].active=true; chan[c.chan].active=true;
chan[c.chan].keyOn=true; chan[c.chan].keyOn=true;
if (c.chan==2) updateWave();
chan[c.chan].std.init(parent->getIns(chan[c.chan].ins)); chan[c.chan].std.init(parent->getIns(chan[c.chan].ins));
break; break;
case DIV_CMD_NOTE_OFF: case DIV_CMD_NOTE_OFF:

6
src/engine/platform/gb.h
View file

@ -8,9 +8,9 @@
class DivPlatformGB: public DivDispatch { class DivPlatformGB: public DivDispatch {
struct Channel { struct Channel {
int freq, baseFreq, pitch; int freq, baseFreq, pitch;
unsigned char ins, note, duty, wave; unsigned char ins, note, duty;
bool active, insChanged, freqChanged, keyOn, keyOff; bool active, insChanged, freqChanged, keyOn, keyOff;
signed char vol, outVol; signed char vol, outVol, wave;
DivMacroInt std; DivMacroInt std;
Channel(): Channel():
freq(0), freq(0),
@ -19,7 +19,7 @@ class DivPlatformGB: public DivDispatch {
ins(-1), ins(-1),
note(0), note(0),
duty(0), duty(0),
wave(0), wave(-1),
active(false), active(false),
insChanged(true), insChanged(true),
freqChanged(false), freqChanged(false),