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

fix the chan osc

Browse source
This commit is contained in:
tildearrow 2023-06-11 14:33:58 -05:00
parent 8264449c7a
commit d6f986abb1
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/gui/chanOsc.cpp
View file

@ -346,14 +346,18 @@ void FurnaceGUI::drawChanOsc() {
ImRect rect=ImRect(minArea,maxArea); ImRect rect=ImRect(minArea,maxArea);
ImRect inRect=rect; ImRect inRect=rect;
inRect.Min.x+=dpiScale; inRect.Min.x+=dpiScale;
inRect.Min.y+=dpiScale; inRect.Min.y+=3.0*dpiScale;
inRect.Max.x-=dpiScale; inRect.Max.x-=dpiScale;
inRect.Max.y-=dpiScale; inRect.Max.y-=3.0*dpiScale;
int precision=inRect.Max.x-inRect.Min.x;
if (precision>512) precision=512;
ImGui::ItemSize(size,style.FramePadding.y); ImGui::ItemSize(size,style.FramePadding.y);
if (ImGui::ItemAdd(rect,ImGui::GetID("chOscDisplay"))) { if (ImGui::ItemAdd(rect,ImGui::GetID("chOscDisplay"))) {
if (!e->isRunning()) { if (!e->isRunning()) {
for (unsigned short i=0; i<512; i++) { for (unsigned short i=0; i<precision; i++) {
float x=(float)i/512.0f; float x=(float)i/(float)precision;
waveform[i]=ImLerp(inRect.Min,inRect.Max,ImVec2(x,0.5f)); waveform[i]=ImLerp(inRect.Min,inRect.Max,ImVec2(x,0.5f));
} }
} else { } else {
@ -394,15 +398,15 @@ void FurnaceGUI::drawChanOsc() {
*/ */
needlePos-=displaySize; needlePos-=displaySize;
for (unsigned short i=0; i<512; i++) { for (unsigned short i=0; i<precision; i++) {
float y=(float)buf->data[(unsigned short)(needlePos+(i*displaySize/512))]/65536.0f; float y=(float)buf->data[(unsigned short)(needlePos+(i*displaySize/precision))]/65536.0f;
if (minLevel>y) minLevel=y; if (minLevel>y) minLevel=y;
if (maxLevel<y) maxLevel=y; if (maxLevel<y) maxLevel=y;
} }
dcOff=(minLevel+maxLevel)*0.5f; dcOff=(minLevel+maxLevel)*0.5f;
for (unsigned short i=0; i<512; i++) { for (unsigned short i=0; i<precision; i++) {
float x=(float)i/512.0f; float x=(float)i/(float)precision;
float y=(float)buf->data[(unsigned short)(needlePos+(i*displaySize/512))]/65536.0f; float y=(float)buf->data[(unsigned short)(needlePos+(i*displaySize/precision))]/65536.0f;
y-=dcOff; y-=dcOff;
if (y<-0.5f) y=-0.5f; if (y<-0.5f) y=-0.5f;
if (y>0.5f) y=0.5f; if (y>0.5f) y=0.5f;
@ -419,7 +423,7 @@ void FurnaceGUI::drawChanOsc() {
color=chanOscGrad.get(xVal,1.0f-yVal); color=chanOscGrad.get(xVal,1.0f-yVal);
} }
dl->AddPolyline(waveform,512,color,ImDrawFlags_None,dpiScale); dl->AddPolyline(waveform,precision,color,ImDrawFlags_None,dpiScale);
} }
} }
} }