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

GUI: really fix wave synth display issues

Browse source 
issue #1417
This commit is contained in:
tildearrow 2023-08-26 03:13:17 -05:00
parent a17f7249d6
commit 29fa249227
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/gui/insEdit.cpp
View file

@ -5318,23 +5318,29 @@ void FurnaceGUI::drawInsEdit() {
wavePreview.init(ins,wavePreviewLen,wavePreviewHeight,true); wavePreview.init(ins,wavePreviewLen,wavePreviewHeight,true);
wavePreviewInit=false; wavePreviewInit=false;
} }
float wavePreview1[256]; float wavePreview1[257];
float wavePreview2[256]; float wavePreview2[257];
float wavePreview3[256]; float wavePreview3[257];
for (int i=0; i<wave1->len+1; i++) { for (int i=0; i<wave1->len; i++) {
if (wave1->data[i]>wave1->max) { if (wave1->data[i]>wave1->max) {
wavePreview1[i]=wave1->max; wavePreview1[i]=wave1->max;
} else { } else {
wavePreview1[i]=wave1->data[i]; wavePreview1[i]=wave1->data[i];
} }
} }
for (int i=0; i<wave2->len+1; i++) { if (wave1->len>0) {
wavePreview1[wave1->len]=wave1->data[wave1->len-1];
}
for (int i=0; i<wave2->len; i++) {
if (wave2->data[i]>wave2->max) { if (wave2->data[i]>wave2->max) {
wavePreview2[i]=wave2->max; wavePreview2[i]=wave2->max;
} else { } else {
wavePreview2[i]=wave2->data[i]; wavePreview2[i]=wave2->data[i];
} }
} }
if (wave2->len>0) {
wavePreview2[wave2->len]=wave2->data[wave2->len-1];
}
if (ins->ws.enabled && (!wavePreviewPaused || wavePreviewInit)) { if (ins->ws.enabled && (!wavePreviewPaused || wavePreviewInit)) {
wavePreview.tick(true); wavePreview.tick(true);
WAKE_UP; WAKE_UP;
@ -5342,6 +5348,9 @@ void FurnaceGUI::drawInsEdit() {
for (int i=0; i<wavePreviewLen; i++) { for (int i=0; i<wavePreviewLen; i++) {
wavePreview3[i]=wavePreview.output[i]; wavePreview3[i]=wavePreview.output[i];
} }
if (wavePreviewLen>0) {
wavePreview3[wavePreviewLen]=wavePreview3[wavePreviewLen-1];
}
float ySize=(isSingleWaveFX?96.0f:128.0f)*dpiScale; float ySize=(isSingleWaveFX?96.0f:128.0f)*dpiScale;
@ -5356,7 +5365,7 @@ void FurnaceGUI::drawInsEdit() {
} }
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImVec2 size3=ImVec2(ImGui::GetContentRegionAvail().x,ySize); ImVec2 size3=ImVec2(ImGui::GetContentRegionAvail().x,ySize);
PlotNoLerp("##WaveformP3",wavePreview3,wavePreviewLen,0,"Result",0,wavePreviewHeight,size3); PlotNoLerp("##WaveformP3",wavePreview3,wavePreviewLen+1,0,"Result",0,wavePreviewHeight,size3);
ImGui::TableNextRow(); ImGui::TableNextRow();
ImGui::TableNextColumn(); ImGui::TableNextColumn();