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

I did it

Browse source
This commit is contained in:
tildearrow 2024-02-04 03:02:12 -05:00
parent 9a2b19630e
commit 4330e27436
10 changed files with 169 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/engine/dispatch.h
View file

@ -252,6 +252,12 @@ enum DivDispatchCmds {
DIV_CMD_POWERNOISE_COUNTER_LOAD, // (which, val)
DIV_CMD_POWERNOISE_IO_WRITE, // (port, value)
DIV_CMD_DAVE_HIGH_PASS,
DIV_CMD_DAVE_RING_MOD,
DIV_CMD_DAVE_SWAP_COUNTERS,
DIV_CMD_DAVE_LOW_PASS,
DIV_CMD_DAVE_CLOCK_DIV,
DIV_CMD_MAX
};

82
src/engine/platform/dave.cpp
View file

@ -19,7 +19,6 @@
#include "dave.h"
#include "../engine.h"
#include "furIcons.h"
#include <math.h>
//#define rWrite(a,v) pendingWrites[a]=v;
@ -106,6 +105,36 @@ void DivPlatformDave::acquire(short** buf, size_t len) {
unsigned short nextL=next&0xffff;
unsigned short nextR=next>>16;
if ((regPool[7]&0x18)==0x18) {
oscBuf[0]->data[oscBuf[0]->needle++]=0;
oscBuf[1]->data[oscBuf[1]->needle++]=0;
oscBuf[2]->data[oscBuf[2]->needle++]=0;
oscBuf[3]->data[oscBuf[3]->needle++]=0;
oscBuf[4]->data[oscBuf[4]->needle++]=dave->chn0_left<<9;
oscBuf[5]->data[oscBuf[5]->needle++]=dave->chn0_right<<9;
} else if (regPool[7]&0x08) {
oscBuf[0]->data[oscBuf[0]->needle++]=dave->chn0_state?(dave->chn0_right<<8):0;
oscBuf[1]->data[oscBuf[1]->needle++]=dave->chn1_state?(dave->chn1_right<<8):0;
oscBuf[2]->data[oscBuf[2]->needle++]=dave->chn2_state?(dave->chn2_right<<8):0;
oscBuf[3]->data[oscBuf[3]->needle++]=dave->chn3_state?(dave->chn3_right<<8):0;
oscBuf[4]->data[oscBuf[4]->needle++]=dave->chn0_left<<9;
oscBuf[5]->data[oscBuf[5]->needle++]=0;
} else if (regPool[7]&0x10) {
oscBuf[0]->data[oscBuf[0]->needle++]=dave->chn0_state?(dave->chn0_left<<8):0;
oscBuf[1]->data[oscBuf[1]->needle++]=dave->chn1_state?(dave->chn1_left<<8):0;
oscBuf[2]->data[oscBuf[2]->needle++]=dave->chn2_state?(dave->chn2_left<<8):0;
oscBuf[3]->data[oscBuf[3]->needle++]=dave->chn3_state?(dave->chn3_left<<8):0;
oscBuf[4]->data[oscBuf[4]->needle++]=0;
oscBuf[5]->data[oscBuf[5]->needle++]=dave->chn0_right<<9;
} else {
oscBuf[0]->data[oscBuf[0]->needle++]=dave->chn0_state?((dave->chn0_left+dave->chn0_right)<<8):0;
oscBuf[1]->data[oscBuf[1]->needle++]=dave->chn1_state?((dave->chn1_left+dave->chn1_right)<<8):0;
oscBuf[2]->data[oscBuf[2]->needle++]=dave->chn2_state?((dave->chn2_left+dave->chn2_right)<<8):0;
oscBuf[3]->data[oscBuf[3]->needle++]=dave->chn3_state?((dave->chn3_left+dave->chn3_right)<<8):0;
oscBuf[4]->data[oscBuf[4]->needle++]=0;
oscBuf[5]->data[oscBuf[5]->needle++]=0;
}
buf[0][h]=(short)nextL;
buf[1][h]=(short)nextR;
}
@ -180,17 +209,17 @@ void DivPlatformDave::tick(bool sysTick) {
if (chan[i].writeVol) {
if (i<4) {
if (chan[i].active && !isMuted[i]) {
if (i!=0 || chan[4].dacSample<0) {
if (i!=0 || chan[4].dacSample<0 || isMuted[4]) {
rWrite(8+i,(63+chan[i].outVol*chan[i].panL)>>6);
}
if (i!=0 || chan[5].dacSample<0) {
if (i!=0 || chan[5].dacSample<0 || isMuted[5]) {
rWrite(12+i,(63+chan[i].outVol*chan[i].panR)>>6);
}
} else {
if (i!=0 || chan[4].dacSample<0) {
if (i!=0 || chan[4].dacSample<0 || isMuted[4]) {
rWrite(8+i,0);
}
if (i!=0 || chan[5].dacSample<0) {
if (i!=0 || chan[5].dacSample<0 || isMuted[5]) {
rWrite(12+i,0);
}
}
@ -253,8 +282,8 @@ void DivPlatformDave::tick(bool sysTick) {
}
if (writeControl) {
rWrite(7,(chan[0].resetPhase?1:0)|(chan[1].resetPhase?2:0)|(chan[2].resetPhase?4:0)|((chan[4].dacSample>=0)?8:0)|((chan[5].dacSample>=0)?16:0));
rWrite(7,((chan[4].dacSample>=0)?8:0)|((chan[5].dacSample>=0)?16:0));
rWrite(7,(chan[0].resetPhase?1:0)|(chan[1].resetPhase?2:0)|(chan[2].resetPhase?4:0)|((chan[4].dacSample>=0 && !isMuted[4])?8:0)|((chan[5].dacSample>=0 && !isMuted[5])?16:0));
rWrite(7,((chan[4].dacSample>=0 && !isMuted[4])?8:0)|((chan[5].dacSample>=0 && !isMuted[5])?16:0));
chan[0].resetPhase=false;
chan[1].resetPhase=false;
chan[2].resetPhase=false;
@ -355,8 +384,34 @@ int DivPlatformDave::dispatch(DivCommand c) {
break;
case DIV_CMD_WAVE:
chan[c.chan].wave=c.value;
if (chan[c.chan].wave>4) chan[c.chan].wave=4;
if (c.chan==3 && chan[c.chan].wave>3) chan[c.chan].wave=3;
chan[c.chan].freqChanged=true;
break;
case DIV_CMD_STD_NOISE_MODE:
chan[c.chan].noiseFreq=c.value&3;
chan[c.chan].freqChanged=true;
break;
case DIV_CMD_DAVE_HIGH_PASS:
chan[c.chan].highPass=c.value;
chan[c.chan].freqChanged=true;
break;
case DIV_CMD_DAVE_RING_MOD:
chan[c.chan].ringMod=c.value;
chan[c.chan].freqChanged=true;
break;
case DIV_CMD_DAVE_SWAP_COUNTERS:
chan[c.chan].swapCounters=c.value;
chan[c.chan].freqChanged=true;
break;
case DIV_CMD_DAVE_LOW_PASS:
chan[c.chan].lowPass=c.value;
chan[c.chan].freqChanged=true;
break;
case DIV_CMD_DAVE_CLOCK_DIV:
clockDiv=c.value;
rWrite(31,clockDiv?2:0);
break;
case DIV_CMD_NOTE_PORTA: {
int destFreq=NOTE_PERIODIC(c.value2+chan[c.chan].sampleNoteDelta);
bool return2=false;
@ -418,6 +473,10 @@ int DivPlatformDave::dispatch(DivCommand c) {
void DivPlatformDave::muteChannel(int ch, bool mute) {
isMuted[ch]=mute;
chan[ch].writeVol=true;
if (ch>=4) {
chan[0].writeVol=true;
writeControl=true;
}
}
void DivPlatformDave::forceIns() {
@ -427,6 +486,7 @@ void DivPlatformDave::forceIns() {
chan[i].writeVol=true;
}
writeControl=true;
rWrite(31,clockDiv?2:0);
}
void* DivPlatformDave::getChanState(int ch) {
@ -441,7 +501,11 @@ unsigned short DivPlatformDave::getPan(int ch) {
return (chan[ch].panL<<2)|chan[ch].panR;
}
// TODO: the rest
DivChannelPair DivPlatformDave::getPaired(int ch) {
if (chan[ch].highPass) {
DivChannelPair("high",(ch+1)&3);
}
return DivChannelPair();
}
@ -463,10 +527,6 @@ DivDispatchOscBuffer* DivPlatformDave::getOscBuffer(int ch) {
return oscBuf[ch];
}
int DivPlatformDave::mapVelocity(int ch, float vel) {
return round(31.0*pow(vel,0.22));
}
unsigned char* DivPlatformDave::getRegisterPool() {
return regPool;
}

2
src/engine/platform/dave.h
View file

@ -63,6 +63,7 @@ class DivPlatformDave: public DivDispatch {
};
FixedQueue<QueuedWrite,512> writes;
bool writeControl;
bool clockDiv;
Ep128::Dave* dave;
unsigned char regPool[32];
@ -78,7 +79,6 @@ class DivPlatformDave: public DivDispatch {
DivChannelModeHints getModeHints(int chan);
DivSamplePos getSamplePos(int ch);
DivDispatchOscBuffer* getOscBuffer(int chan);
int mapVelocity(int ch, float vel);
unsigned char* getRegisterPool();
int getRegisterPoolSize();
void reset();

2
src/engine/platform/sound/dave/dave.hpp
View file

@ -41,7 +41,7 @@ namespace Ep128 {
};
class Dave {
private:
public:
DaveTables t;
int clockDiv; // 2 if bit 1 of port 0xBF is 0, 3 otherwise
int clockCnt; // counts from 'clockDiv' towards zero

6
src/engine/playback.cpp
View file

@ -250,6 +250,12 @@ const char* cmdName[]={
"POWERNOISE_COUNTER_LOAD",
"POWERNOISE_IO_WRITE",
"DAVE_HIGH_PASS",
"DAVE_RING_MOD",
"DAVE_SWAP_COUNTERS",
"DAVE_LOW_PASS",
"DAVE_CLOCK_DIV",
"MACRO_RESTART",
};

10
src/engine/sysDef.cpp
View file

@ -2011,9 +2011,13 @@ void DivEngine::registerSystems() {
{DIV_INS_DAVE, DIV_INS_DAVE, DIV_INS_DAVE, DIV_INS_DAVE, DIV_INS_AMIGA, DIV_INS_AMIGA},
{},
{
{0x10, {DIV_CMD_WAVE, "10xx: Set waveform (0 to 7)"}},
{0x11, {DIV_CMD_STD_NOISE_MODE, "11xx: Set AUDCTL"}},
{0x12, {DIV_CMD_STD_NOISE_FREQ, "12xx: Toggle two-tone mode"}},
{0x10, {DIV_CMD_WAVE, "10xx: Set waveform (0 to 4; 0 to 3 on noise)"}},
{0x11, {DIV_CMD_STD_NOISE_MODE, "11xx: Set noise frequency source (0: fixed; 1-3: channels 1 to 3)"}},
{0x12, {DIV_CMD_DAVE_HIGH_PASS, "12xx: Toggle high-pass with next channel"}},
{0x13, {DIV_CMD_DAVE_RING_MOD, "13xx: Toggle ring modulation with channel+2"}},
{0x14, {DIV_CMD_DAVE_SWAP_COUNTERS, "14xx: Toggle swap counters (noise only)"}},
{0x15, {DIV_CMD_DAVE_LOW_PASS, "15xx: Toggle low pass (noise only)"}},
{0x16, {DIV_CMD_DAVE_CLOCK_DIV, "16xx: Set clock divider (0: /2; 1: /3)"}},
}
);