From 3836756115fd3ddc5201df2bf98510a5e5b4a201 Mon Sep 17 00:00:00 2001
From: tildearrow <me@tildearrow.org>
Date: Sat, 10 Feb 2024 14:50:23 -0500
Subject: [PATCH] GUI: new osc renderer, part 4

we have a waveform
---
 src/gui/gui.h               |  1 +
 src/gui/osc.cpp             | 32 +++++++++++++++++---------------
 src/gui/render/abstract.cpp |  4 ++++
 src/gui/render/renderGL.cpp | 19 ++++++++++++-------
 src/gui/render/renderGL.h   |  1 +
 5 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/src/gui/gui.h b/src/gui/gui.h
index a821530c0..684b47a33 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -1437,6 +1437,7 @@ class FurnaceGUIRender {
     virtual void wipe(float alpha);
     virtual void drawOsc(float* data, size_t len, ImVec2 pos0, ImVec2 pos1, ImVec4 color, ImVec2 canvasSize, float lineWidth);
     virtual void present();
+    virtual bool supportsDrawOsc();
     virtual bool getOutputSize(int& w, int& h);
     virtual int getWindowFlags();
     virtual void preInit();
diff --git a/src/gui/osc.cpp b/src/gui/osc.cpp
index 8f5104930..3cb1393f1 100644
--- a/src/gui/osc.cpp
+++ b/src/gui/osc.cpp
@@ -303,23 +303,25 @@ void FurnaceGUI::drawOsc() {
             waveform[i]=ImLerp(inRect.Min,inRect.Max,ImVec2(x,0.5f-y));
           }
 
-          if (settings.oscEscapesBoundary) {
-            dl->PushClipRectFullScreen();
-            dl->AddPolyline(waveform,oscWidth-24,color,ImDrawFlags_None,dpiScale);
-            dl->PopClipRect();
+          if (rend->supportsDrawOsc()) {
+            _do.gui=this;
+            _do.data=&oscValuesAverage[12];
+            _do.len=oscWidth-24;
+            _do.pos0=inRect.Min;
+            _do.pos1=inRect.Max;
+            _do.color=isClipping?uiColors[GUI_COLOR_OSC_WAVE_PEAK]:uiColors[GUI_COLOR_OSC_WAVE];
+
+            dl->AddCallback(_drawOsc,&_do);
+            dl->AddCallback(ImDrawCallback_ResetRenderState,NULL);
           } else {
-            dl->AddPolyline(waveform,oscWidth-24,color,ImDrawFlags_None,dpiScale);
+            if (settings.oscEscapesBoundary) {
+              dl->PushClipRectFullScreen();
+              dl->AddPolyline(waveform,oscWidth-24,color,ImDrawFlags_None,dpiScale);
+              dl->PopClipRect();
+            } else {
+              dl->AddPolyline(waveform,oscWidth-24,color,ImDrawFlags_None,dpiScale);
+            }
           }
-
-          _do.gui=this;
-          _do.data=&oscValuesAverage[12];
-          _do.len=oscWidth-24;
-          _do.pos0=inRect.Min;
-          _do.pos1=inRect.Max;
-          _do.color=isClipping?uiColors[GUI_COLOR_OSC_WAVE_PEAK]:uiColors[GUI_COLOR_OSC_WAVE];
-
-          dl->AddCallback(_drawOsc,&_do);
-          dl->AddCallback(ImDrawCallback_ResetRenderState,NULL);
         } else {
           for (int ch=0; ch<e->getAudioDescGot().outChans; ch++) {
             for (int i=0; i<oscWidth-24; i++) {
diff --git a/src/gui/render/abstract.cpp b/src/gui/render/abstract.cpp
index 42fb2b8e2..2b5e9413d 100644
--- a/src/gui/render/abstract.cpp
+++ b/src/gui/render/abstract.cpp
@@ -81,6 +81,10 @@ bool FurnaceGUIRender::getOutputSize(int& w, int& h) {
   return false;
 }
 
+bool FurnaceGUIRender::supportsDrawOsc() {
+  return false;
+}
+
 int FurnaceGUIRender::getWindowFlags() {
   return 0;
 }
diff --git a/src/gui/render/renderGL.cpp b/src/gui/render/renderGL.cpp
index b4c60fcd0..965ade53b 100644
--- a/src/gui/render/renderGL.cpp
+++ b/src/gui/render/renderGL.cpp
@@ -114,8 +114,7 @@ const char* sh_oscRender_srcF=
   "  float valmin = min(min(val1,val2),val3);\n"
   "  float vald = abs(valmax-valmin);\n"
   "  float alpha = 1.0-abs(uv.y-val2)/max(tresh.y,vald);\n"
-  "  //gl_FragColor = vec4(uColor.xyz,uColor.w*alpha);\n"
-  "  gl_FragColor = vec4(clamp(0.5+val2*0.5,0.0,1.0),0.0,0.0,1.0);\n"
+  "  gl_FragColor = vec4(uColor.xyz,uColor.w*alpha);\n"
   "}\n";
 #else
 const char* sh_wipe_srcV=
@@ -407,6 +406,8 @@ void FurnaceGUIRenderGL::drawOsc(float* data, size_t len, ImVec2 pos0, ImVec2 po
   //C(glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA));
   //C(glEnable(GL_BLEND));
 
+  float height=fabs(pos1.y-pos0.y)*0.5;
+
   pos0.x=(2.0f*pos0.x/canvasSize.x)-1.0f;
   pos0.y=1.0f-(2.0f*pos0.y/canvasSize.y);
   pos1.x=(2.0f*pos1.x/canvasSize.x)-1.0f;
@@ -415,19 +416,19 @@ void FurnaceGUIRenderGL::drawOsc(float* data, size_t len, ImVec2 pos0, ImVec2 po
   oscVertex[0][0]=pos0.x;
   oscVertex[0][1]=pos1.y;
   oscVertex[0][2]=0.0f;
-  oscVertex[0][3]=1.0f;
+  oscVertex[0][3]=height;
   oscVertex[1][0]=pos1.x;
   oscVertex[1][1]=pos1.y;
   oscVertex[1][2]=(float)len;
-  oscVertex[1][3]=1.0f;
+  oscVertex[1][3]=height;
   oscVertex[2][0]=pos0.x;
   oscVertex[2][1]=pos0.y;
   oscVertex[2][2]=0.0f;
-  oscVertex[2][3]=-1.0f;
+  oscVertex[2][3]=-height;
   oscVertex[3][0]=pos1.x;
   oscVertex[3][1]=pos0.y;
   oscVertex[3][2]=(float)len;
-  oscVertex[3][3]=-1.0f;
+  oscVertex[3][3]=-height;
 
   C(glGetIntegerv(GL_ARRAY_BUFFER_BINDING,&lastArrayBuf));
   C(glGetIntegerv(GL_ELEMENT_ARRAY_BUFFER_BINDING,&lastElemArrayBuf));
@@ -445,7 +446,7 @@ void FurnaceGUIRenderGL::drawOsc(float* data, size_t len, ImVec2 pos0, ImVec2 po
   C(furUseProgram(sh_oscRender_program));
   C(furUniform4fv(sh_oscRender_uColor,1,(float*)&color));
   C(furUniform1f(sh_oscRender_uLineWidth,lineWidth));
-  C(furUniform2f(sh_oscRender_uResolution,2048.0f,1.0f));
+  C(furUniform2f(sh_oscRender_uResolution,2048.0f,height));
   C(furUniform1i(sh_oscRender_oscVal,0));
 
   C(glDrawArrays(GL_TRIANGLE_STRIP,0,4));
@@ -475,6 +476,10 @@ bool FurnaceGUIRenderGL::getOutputSize(int& w, int& h) {
   return true;
 }
 
+bool FurnaceGUIRenderGL::supportsDrawOsc() {
+  return true;
+}
+
 int FurnaceGUIRenderGL::getWindowFlags() {
   return SDL_WINDOW_OPENGL;
 }
diff --git a/src/gui/render/renderGL.h b/src/gui/render/renderGL.h
index c4d8da83d..6b0507e7a 100644
--- a/src/gui/render/renderGL.h
+++ b/src/gui/render/renderGL.h
@@ -64,6 +64,7 @@ class FurnaceGUIRenderGL: public FurnaceGUIRender {
     void drawOsc(float* data, size_t len, ImVec2 pos0, ImVec2 pos1, ImVec4 color, ImVec2 canvasSize, float lineWidth);
     void present();
     bool getOutputSize(int& w, int& h);
+    bool supportsDrawOsc();
     int getWindowFlags();
     void preInit();
     bool init(SDL_Window* win);