etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-11-26 06:25:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

GUI: new osc renderer, part 5

Browse source
This commit is contained in:
tildearrow 2024-02-10 18:30:17 -05:00
parent 3836756115
commit e6a5e102fe
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/gui/render/renderGL.cpp
View file

@ -98,23 +98,25 @@ const char* sh_oscRender_srcF=
"uniform vec4 uColor;\n" "uniform vec4 uColor;\n"
"uniform vec2 uResolution;\n" "uniform vec2 uResolution;\n"
"uniform float uLineWidth;\n" "uniform float uLineWidth;\n"
"uniform float uAdvance;\n"
"uniform sampler2D oscVal;\n" "uniform sampler2D oscVal;\n"
"varying vec2 fur_fragCoord;\n" "varying vec2 fur_fragCoord;\n"
"void main() {\n" "void main() {\n"
" vec2 uv = fur_fragCoord/uResolution;\n" " vec2 uv = fur_fragCoord/uResolution;\n"
" vec2 tresh = vec2(uLineWidth)/uResolution;\n" " vec2 tresh = vec2(uLineWidth)/uResolution;\n"
" float xoff = tresh.x/2.0;\n"
" float x1 = uv.x-xoff;\n"
" float x2 = uv.x;\n" " float x2 = uv.x;\n"
" float x3 = uv.x+xoff;\n" " float x3 = uv.x+uAdvance;\n"
" float val1 = texture2D(oscVal,vec2(x1,1.0)).x;\n"
" float val2 = texture2D(oscVal,vec2(x2,1.0)).x;\n" " float val2 = texture2D(oscVal,vec2(x2,1.0)).x;\n"
" float val3 = texture2D(oscVal,vec2(x3,1.0)).x;\n" " float val3 = texture2D(oscVal,vec2(x3,1.0)).x;\n"
" float valmax = max(max(val1,val2),val3);\n" " float valmax = max(val2,val3);\n"
" float valmin = min(min(val1,val2),val3);\n" " float valmin = min(val2,val3);\n"
" float vald = abs(valmax-valmin);\n" " float vald = abs(valmax-valmin);\n"
" float alpha = 1.0-abs(uv.y-val2)/max(tresh.y,vald);\n" " float alpha = 1.0-abs(uv.y-val2)/max(tresh.y,vald);\n"
" gl_FragColor = vec4(uColor.xyz,uColor.w*alpha);\n" " if (vald>(1.0/uResolution.y)) {\n"
" gl_FragColor = vec4(1.0,0.0,0.0,uColor.w*alpha);\n"
" } else {\n"
" gl_FragColor = vec4(uColor.xyz,uColor.w*alpha);\n"
" }\n"
"}\n"; "}\n";
#else #else
const char* sh_wipe_srcV= const char* sh_wipe_srcV=
@ -406,6 +408,7 @@ void FurnaceGUIRenderGL::drawOsc(float* data, size_t len, ImVec2 pos0, ImVec2 po
//C(glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA)); //C(glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA));
//C(glEnable(GL_BLEND)); //C(glEnable(GL_BLEND));
float width=fabs(pos1.x-pos0.x);
float height=fabs(pos1.y-pos0.y)*0.5; float height=fabs(pos1.y-pos0.y)*0.5;
pos0.x=(2.0f*pos0.x/canvasSize.x)-1.0f; pos0.x=(2.0f*pos0.x/canvasSize.x)-1.0f;
@ -446,6 +449,7 @@ void FurnaceGUIRenderGL::drawOsc(float* data, size_t len, ImVec2 pos0, ImVec2 po
C(furUseProgram(sh_oscRender_program)); C(furUseProgram(sh_oscRender_program));
C(furUniform4fv(sh_oscRender_uColor,1,(float*)&color)); C(furUniform4fv(sh_oscRender_uColor,1,(float*)&color));
C(furUniform1f(sh_oscRender_uLineWidth,lineWidth)); C(furUniform1f(sh_oscRender_uLineWidth,lineWidth));
C(furUniform1f(sh_oscRender_uAdvance,(1.0f/2048.0f)*((float)len/width)));
C(furUniform2f(sh_oscRender_uResolution,2048.0f,height)); C(furUniform2f(sh_oscRender_uResolution,2048.0f,height));
C(furUniform1i(sh_oscRender_oscVal,0)); C(furUniform1i(sh_oscRender_oscVal,0));
@ -584,6 +588,7 @@ bool FurnaceGUIRenderGL::init(SDL_Window* win) {
if (createShader(sh_oscRender_srcV,sh_oscRender_srcF,sh_oscRender_vertex,sh_oscRender_fragment,sh_oscRender_program,sh_oscRender_attrib)) { if (createShader(sh_oscRender_srcV,sh_oscRender_srcF,sh_oscRender_vertex,sh_oscRender_fragment,sh_oscRender_program,sh_oscRender_attrib)) {
sh_oscRender_uColor=furGetUniformLocation(sh_oscRender_program,"uColor"); sh_oscRender_uColor=furGetUniformLocation(sh_oscRender_program,"uColor");
sh_oscRender_uAdvance=furGetUniformLocation(sh_oscRender_program,"uAdvance");
sh_oscRender_uLineWidth=furGetUniformLocation(sh_oscRender_program,"uLineWidth"); sh_oscRender_uLineWidth=furGetUniformLocation(sh_oscRender_program,"uLineWidth");
sh_oscRender_uResolution=furGetUniformLocation(sh_oscRender_program,"uResolution"); sh_oscRender_uResolution=furGetUniformLocation(sh_oscRender_program,"uResolution");
sh_oscRender_oscVal=furGetUniformLocation(sh_oscRender_program,"oscVal"); sh_oscRender_oscVal=furGetUniformLocation(sh_oscRender_program,"oscVal");

1
src/gui/render/renderGL.h
View file

@ -41,6 +41,7 @@ class FurnaceGUIRenderGL: public FurnaceGUIRender {
int sh_oscRender_program; int sh_oscRender_program;
int sh_oscRender_uColor; int sh_oscRender_uColor;
int sh_oscRender_uLineWidth; int sh_oscRender_uLineWidth;
int sh_oscRender_uAdvance;
int sh_oscRender_uResolution; int sh_oscRender_uResolution;
int sh_oscRender_oscVal; int sh_oscRender_oscVal;