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

dear tildearrow are you drunk or what?

Browse source
This commit is contained in:
tildearrow 2022-02-15 17:22:09 -05:00
parent b24c572632
commit 647f2f96b0
4 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/engine/engine.cpp
View file

@ -4017,7 +4017,7 @@ SafeWriter* DivEngine::saveVGM(bool* sysToExport, bool loop) {
} }
} }
if (nextToTouch>=0) { if (nextToTouch>=0) {
double waitTime=totalWait+(loopTimer[nextToTouch]*(44100.0/MIN(1,loopFreq[nextToTouch]))); double waitTime=totalWait+(loopTimer[nextToTouch]*(44100.0/MAX(1,loopFreq[nextToTouch])));
if (waitTime>0) { if (waitTime>0) {
w->writeC(0x61); w->writeC(0x61);
w->writeS(waitTime); w->writeS(waitTime);

4
src/engine/platform/genesis.cpp
View file

@ -385,7 +385,7 @@ void DivPlatformGenesis::tick() {
off=8363.0/(double)s->centerRate; off=8363.0/(double)s->centerRate;
} }
} }
dacRate=(1280000*1.25*off)/MIN(1,chan[i].baseFreq); dacRate=(1280000*1.25*off)/MAX(1,chan[i].baseFreq);
if (dacRate<1) dacRate=1; if (dacRate<1) dacRate=1;
if (dumpWrites) addWrite(0xffff0001,1280000/dacRate); if (dumpWrites) addWrite(0xffff0001,1280000/dacRate);
} }
@ -515,7 +515,7 @@ int DivPlatformGenesis::dispatch(DivCommand c) {
} }
dacPos=0; dacPos=0;
dacPeriod=0; dacPeriod=0;
dacRate=1280000/MIN(1,parent->song.sample[dacSample]->rate); dacRate=1280000/MAX(1,parent->song.sample[dacSample]->rate);
if (dumpWrites) addWrite(0xffff0001,parent->song.sample[dacSample]->rate); if (dumpWrites) addWrite(0xffff0001,parent->song.sample[dacSample]->rate);
chan[c.chan].furnaceDac=false; chan[c.chan].furnaceDac=false;
} }

2
src/engine/platform/pce.cpp
View file

@ -209,7 +209,7 @@ void DivPlatformPCE::tick() {
off=8363.0/(double)s->centerRate; off=8363.0/(double)s->centerRate;
} }
} }
chan[i].dacRate=((double)chipClock/2)/MIN(1,off*chan[i].freq); chan[i].dacRate=((double)chipClock/2)/MAX(1,off*chan[i].freq);
if (dumpWrites) addWrite(0xffff0001+(i<<8),chan[i].dacRate); if (dumpWrites) addWrite(0xffff0001+(i<<8),chan[i].dacRate);
} }
if (chan[i].freq>4095) chan[i].freq=4095; if (chan[i].freq>4095) chan[i].freq=4095;

17
src/gui/gui.cpp
View file

@ -3162,6 +3162,9 @@ void FurnaceGUI::drawPattern() {
if (ImGui::Selectable(extraChannelButtons?" --##ExtraChannelButtons":" ++##ExtraChannelButtons",false,ImGuiSelectableFlags_NoPadWithHalfSpacing,ImVec2(0.0f,lineHeight+1.0f*dpiScale))) { if (ImGui::Selectable(extraChannelButtons?" --##ExtraChannelButtons":" ++##ExtraChannelButtons",false,ImGuiSelectableFlags_NoPadWithHalfSpacing,ImVec2(0.0f,lineHeight+1.0f*dpiScale))) {
extraChannelButtons=!extraChannelButtons; extraChannelButtons=!extraChannelButtons;
} }
if (ImGui::IsItemClicked(ImGuiMouseButton_Right)) {
fancyPattern=!fancyPattern;
}
for (int i=0; i<chans; i++) { for (int i=0; i<chans; i++) {
if (!e->song.chanShow[i]) continue; if (!e->song.chanShow[i]) continue;
ImGui::TableNextColumn(); ImGui::TableNextColumn();
@ -3888,7 +3891,7 @@ void FurnaceGUI::drawSettings() {
ImGui::Text("Buffer size"); ImGui::Text("Buffer size");
ImGui::SameLine(); ImGui::SameLine();
String bs=fmt::sprintf("%d (latency: ~%.1fms)",settings.audioBufSize,2000.0*(double)settings.audioBufSize/(double)MIN(1,settings.audioRate)); String bs=fmt::sprintf("%d (latency: ~%.1fms)",settings.audioBufSize,2000.0*(double)settings.audioBufSize/(double)MAX(1,settings.audioRate));
if (ImGui::BeginCombo("##BufferSize",bs.c_str())) { if (ImGui::BeginCombo("##BufferSize",bs.c_str())) {
BUFFER_SIZE_SELECTABLE(64); BUFFER_SIZE_SELECTABLE(64);
BUFFER_SIZE_SELECTABLE(128); BUFFER_SIZE_SELECTABLE(128);
@ -7230,15 +7233,15 @@ void FurnaceGUI::showError(String what) {
void FurnaceGUI::processDrags(int dragX, int dragY) { void FurnaceGUI::processDrags(int dragX, int dragY) {
if (macroDragActive) { if (macroDragActive) {
if (macroDragLen>0) { if (macroDragLen>0) {
int x=((dragX-macroDragStart.x)*macroDragLen/MIN(1,macroDragAreaSize.x)); int x=((dragX-macroDragStart.x)*macroDragLen/MAX(1,macroDragAreaSize.x));
if (x<0) x=0; if (x<0) x=0;
if (x>=macroDragLen) x=macroDragLen-1; if (x>=macroDragLen) x=macroDragLen-1;
x+=macroDragScroll; x+=macroDragScroll;
int y; int y;
if (macroDragBitMode) { if (macroDragBitMode) {
y=(int)(macroDragMax-((dragY-macroDragStart.y)*(double(macroDragMax-macroDragMin)/(double)MIN(1,macroDragAreaSize.y)))); y=(int)(macroDragMax-((dragY-macroDragStart.y)*(double(macroDragMax-macroDragMin)/(double)MAX(1,macroDragAreaSize.y))));
} else { } else {
y=round(macroDragMax-((dragY-macroDragStart.y)*(double(macroDragMax-macroDragMin)/(double)MIN(1,macroDragAreaSize.y)))); y=round(macroDragMax-((dragY-macroDragStart.y)*(double(macroDragMax-macroDragMin)/(double)MAX(1,macroDragAreaSize.y))));
} }
if (y>macroDragMax) y=macroDragMax; if (y>macroDragMax) y=macroDragMax;
if (y<macroDragMin) y=macroDragMin; if (y<macroDragMin) y=macroDragMin;
@ -7251,7 +7254,7 @@ void FurnaceGUI::processDrags(int dragX, int dragY) {
} }
if (macroLoopDragActive) { if (macroLoopDragActive) {
if (macroLoopDragLen>0) { if (macroLoopDragLen>0) {
int x=(dragX-macroLoopDragStart.x)*macroLoopDragLen/MIN(1,macroLoopDragAreaSize.x); int x=(dragX-macroLoopDragStart.x)*macroLoopDragLen/MAX(1,macroLoopDragAreaSize.x);
if (x<0) x=0; if (x<0) x=0;
if (x>=macroLoopDragLen) x=-1; if (x>=macroLoopDragLen) x=-1;
x+=macroDragScroll; x+=macroDragScroll;
@ -7260,10 +7263,10 @@ void FurnaceGUI::processDrags(int dragX, int dragY) {
} }
if (waveDragActive) { if (waveDragActive) {
if (waveDragLen>0) { if (waveDragLen>0) {
int x=(dragX-waveDragStart.x)*waveDragLen/MIN(1,waveDragAreaSize.x); int x=(dragX-waveDragStart.x)*waveDragLen/MAX(1,waveDragAreaSize.x);
if (x<0) x=0; if (x<0) x=0;
if (x>=waveDragLen) x=waveDragLen-1; if (x>=waveDragLen) x=waveDragLen-1;
int y=round(waveDragMax-((dragY-waveDragStart.y)*(double(waveDragMax-waveDragMin)/(double)MIN(1,waveDragAreaSize.y)))); int y=round(waveDragMax-((dragY-waveDragStart.y)*(double(waveDragMax-waveDragMin)/(double)MAX(1,waveDragAreaSize.y))));
if (y>waveDragMax) y=waveDragMax; if (y>waveDragMax) y=waveDragMax;
if (y<waveDragMin) y=waveDragMin; if (y<waveDragMin) y=waveDragMin;
waveDragTarget[x]=y; waveDragTarget[x]=y;