diff --git a/src/gui/render/renderGL.cpp b/src/gui/render/renderGL.cpp index 0207874df..8689338f0 100644 --- a/src/gui/render/renderGL.cpp +++ b/src/gui/render/renderGL.cpp @@ -103,10 +103,10 @@ const char* sh_oscRender_srcF= "uniform float uLineWidth;\n" "uniform sampler2D oscVal;\n" "varying vec2 fur_fragCoord;\n" + "const float oneStep=1.0/2048.0;\n" "void main() {\n" " float alpha=0.0;\n" " float xMax=ceil(fur_fragCoord.x+uLineWidth);\n" - " float oneStep=1.0/2048.0;\n" " float valmax=-1024.0;\n" " float valmin=1024.0;\n" " for (float x=floor(fur_fragCoord.x-uLineWidth); x<=xMax; x+=1.0) {\n" @@ -117,16 +117,17 @@ const char* sh_oscRender_srcF= " if ((fur_fragCoord.y-uLineWidth)>valmax*uResolution.y) discard;\n" " if ((fur_fragCoord.y+uLineWidth)1.0) {\n" - " gl_FragColor = vec4(uColor.xyz,uColor.w*clamp(alpha/uLineWidth,0.0,1.0));\n" + " gl_FragColor = vec4(uColor.xyz,uColor.w*clamp(alpha*(1.0+uResolution.y*pow(slope/uResolution.y,2.0))/(uLineWidth*slopeMul),0.0,1.0));\n" " } else {\n" " gl_FragColor = vec4(uColor.xyz,uColor.w*clamp(alpha/uLineWidth,0.0,1.0));\n" " }\n" @@ -189,7 +190,7 @@ const char* sh_oscRender_srcF= " alpha+=max(uLineWidth-distance(vec2(fur_fragCoord.x,fur_fragCoord.y),vec2(x,val)),0.0);\n" " }\n" " if (slope>1.0) {\n" - " fur_FragColor = vec4(uColor.xyz,uColor.w*clamp(alpha/(uLineWidth*(uLineWidth*2.0+log2(slopeMul))),0.0,1.0));\n" + " fur_FragColor = vec4(uColor.xyz,uColor.w*clamp(alpha*(1.0+uResolution.y*pow(slope/uResolution.y,2.0))/(uLineWidth*slopeMul),0.0,1.0));\n" " } else {\n" " fur_FragColor = vec4(uColor.xyz,uColor.w*clamp(alpha/uLineWidth,0.0,1.0));\n" " }\n" diff --git a/src/gui/settings.cpp b/src/gui/settings.cpp index 70bc4f7c1..cfca00e72 100644 --- a/src/gui/settings.cpp +++ b/src/gui/settings.cpp @@ -3827,7 +3827,7 @@ void FurnaceGUI::readConfig(DivConfig& conf, FurnaceGUISettingGroups groups) { settings.chanOscThreads=conf.getInt("chanOscThreads",0); settings.renderPoolThreads=conf.getInt("renderPoolThreads",0); - settings.shaderOsc=conf.getInt("shaderOsc",1); + settings.shaderOsc=conf.getInt("shaderOsc",0); settings.showPool=conf.getInt("showPool",0); settings.writeInsNames=conf.getInt("writeInsNames",0); settings.readInsNames=conf.getInt("readInsNames",1);