etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-12-01 00:43:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

VRC6: period tuning fixes

Browse source 
now it is identical to the NES channels
This commit is contained in:
tildearrow 2022-03-27 22:30:29 -05:00
parent 56786d96d1
commit 13a8873050
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/engine/platform/vrc6.cpp
View file

@ -22,8 +22,6 @@
#include <cstddef> #include <cstddef>
#include <math.h> #include <math.h>
#define CHIP_DIVIDER 1 // 16 for pulse, 14 for sawtooth
#define rWrite(a,v) if (!skipRegisterWrites) {writes.emplace(a,v); if (dumpWrites) {addWrite(a,v);} } #define rWrite(a,v) if (!skipRegisterWrites) {writes.emplace(a,v); if (dumpWrites) {addWrite(a,v);} }
#define chWrite(c,a,v) rWrite(0x9000+(c<<12)+(a&3),v) #define chWrite(c,a,v) rWrite(0x9000+(c<<12)+(a&3),v)
@ -139,6 +137,8 @@ void DivPlatformVRC6::acquire(short* bufL, short* bufR, size_t start, size_t len
void DivPlatformVRC6::tick() { void DivPlatformVRC6::tick() {
for (int i=0; i<3; i++) { for (int i=0; i<3; i++) {
// 16 for pulse; 14 for saw
int CHIP_DIVIDER=(i==2)?14:16;
chan[i].std.next(); chan[i].std.next();
if (chan[i].std.hadVol) { if (chan[i].std.hadVol) {
if (i==2) { // sawtooth if (i==2) { // sawtooth
@ -180,9 +180,9 @@ void DivPlatformVRC6::tick() {
} }
if (chan[i].freqChanged || chan[i].keyOn || chan[i].keyOff) { if (chan[i].freqChanged || chan[i].keyOn || chan[i].keyOff) {
if (i==2) { // sawtooth if (i==2) { // sawtooth
chan[i].freq=parent->calcFreq(chan[i].baseFreq/14,chan[i].pitch,true)-1; chan[i].freq=parent->calcFreq(chan[i].baseFreq,chan[i].pitch,true)-1;
} else { // pulse } else { // pulse
chan[i].freq=parent->calcFreq(chan[i].baseFreq/16,chan[i].pitch,true)-1; chan[i].freq=parent->calcFreq(chan[i].baseFreq,chan[i].pitch,true)-1;
if (chan[i].furnaceDac) { if (chan[i].furnaceDac) {
double off=1.0; double off=1.0;
if (chan[i].dacSample>=0 && chan[i].dacSample<parent->song.sampleLen) { if (chan[i].dacSample>=0 && chan[i].dacSample<parent->song.sampleLen) {
@ -199,10 +199,6 @@ void DivPlatformVRC6::tick() {
} }
if (chan[i].freq>4095) chan[i].freq=4095; if (chan[i].freq>4095) chan[i].freq=4095;
if (chan[i].freq<0) chan[i].freq=0; if (chan[i].freq<0) chan[i].freq=0;
if (chan[i].keyOn) {
//rWrite(16+i*5+1,((chan[i].duty&3)<<6)|(63-(ins->gb.soundLen&63)));
//rWrite(16+i*5+2,((chan[i].vol<<4))|(ins->gb.envLen&7)|((ins->gb.envDir&1)<<3));
}
if (chan[i].keyOff) { if (chan[i].keyOff) {
chWrite(i,2,0); chWrite(i,2,0);
} else { } else {
@ -217,6 +213,7 @@ void DivPlatformVRC6::tick() {
} }
int DivPlatformVRC6::dispatch(DivCommand c) { int DivPlatformVRC6::dispatch(DivCommand c) {
int CHIP_DIVIDER=(c.chan==2)?14:16;
switch (c.cmd) { switch (c.cmd) {
case DIV_CMD_NOTE_ON: case DIV_CMD_NOTE_ON:
if (c.chan!=2) { // pulse wave if (c.chan!=2) { // pulse wave