ofxAddons/ofxMsdfgen
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update shaders

Browse source
This commit is contained in:
jrkb 2023-02-22 18:21:26 +01:00
parent 10496b8aa7
commit 39f2373958
2 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
data/ofxMsdfgen/shaders/simple/ES2/shader.frag
View file

@ -1,12 +1,10 @@
precision highp float; precision highp float;
// these are our textures // these are our textures
uniform sampler2D msdf_0; uniform sampler2D msdf;
uniform sampler2D msdf_1;
uniform vec4 fontColor; uniform vec4 fontColor;
uniform float msdf_mix; uniform float pxRange;
uniform float msdf_pxratio;
// this comes from the vertex shader // this comes from the vertex shader
varying vec2 texCoordVarying; varying vec2 texCoordVarying;
@ -15,8 +13,10 @@ float median(float r, float g, float b) {
return max(min(r, g), min(max(r, g), b)); return max(min(r, g), min(max(r, g), b));
} }
float screenPxRange(float ratio) { float screenPxRange() {
return ratio * 2.0; vec2 unitRange = vec2(pxRange)/vec2(textureSize(msdf));
vec2 screenTexSize = vec2(1.0)/fwidth(texCoordVarying);
return max(0.5*dot(unitRange, screenTexSize), 1.0);
} }
void main() void main()
@ -24,11 +24,9 @@ void main()
vec4 bgColor = vec4(fontColor.rgb,0); vec4 bgColor = vec4(fontColor.rgb,0);
vec4 fgColor = fontColor; vec4 fgColor = fontColor;
vec3 msd_0 = texture2D(msdf_0, texCoordVarying).rgb; vec3 msdf_rgb = texture2D(msdf, texCoordVarying).rgb;
vec3 msd_1 = texture2D(msdf_1, texCoordVarying).rgb; float sd = median(msdf_rgb.r, msdf_rgb.g, msdf_rgb.b);
vec3 msd = mix(msd_0, msd_1,msdf_mix); float screenPxDistance = screenPxRange()*(sd - 0.5);
float sd = median(msd.r, msd.g, msd.b);
float screenPxDistance = screenPxRange(msdf_pxratio)*(sd - 0.5);
float opacity = clamp(screenPxDistance + 0.5, 0.0, 1.0); float opacity = clamp(screenPxDistance + 0.5, 0.0, 1.0);
gl_FragColor = mix(bgColor, fgColor, opacity); gl_FragColor = mix(bgColor, fgColor, opacity);
} }

14
data/ofxMsdfgen/shaders/simple/GL2/shader.frag
View file

@ -3,11 +3,9 @@ precision highp float;
// these are our textures // these are our textures
uniform sampler2DRect msdf_0; uniform sampler2DRect msdf_0;
uniform sampler2DRect msdf_1;
uniform vec4 fontColor; uniform vec4 fontColor;
uniform float msdf_mix; uniform float pxRange;
uniform float msdf_pxratio;
// this comes from the vertex shader // this comes from the vertex shader
varying vec2 texCoordVarying; varying vec2 texCoordVarying;
@ -17,7 +15,9 @@ float median(float r, float g, float b) {
} }
float screenPxRange() { float screenPxRange() {
return 2.0; vec2 unitRange = vec2(pxRange)/vec2(textureSize(msdf));
vec2 screenTexSize = vec2(1.0)/fwidth(texCoordVarying);
return max(0.5*dot(unitRange, screenTexSize), 1.0);
} }
void main() void main()
@ -25,10 +25,8 @@ void main()
vec4 bgColor = vec4(fontColor.rgb,0); vec4 bgColor = vec4(fontColor.rgb,0);
vec4 fgColor = fontColor; vec4 fgColor = fontColor;
vec3 msd_0 = texture2DRect(msdf_0, texCoordVarying).rgb; vec3 msdf_rgb = texture2DRect(msdf, texCoordVarying).rgb;
vec3 msd_1 = texture2DRect(msdf_1, texCoordVarying).rgb; float sd = median(msdf_rgb.r, msdf_rgb.g, msdf_rgb.b);
vec3 msd = mix(msd_0, msd_1,msdf_mix);
float sd = median(msd.r, msd.g, msd.b);
float screenPxDistance = screenPxRange()*(sd - 0.5); float screenPxDistance = screenPxRange()*(sd - 0.5);
float opacity = clamp(screenPxDistance + 0.5, 0.0, 1.0); float opacity = clamp(screenPxDistance + 0.5, 0.0, 1.0);
gl_FragColor = mix(bgColor, fgColor, opacity); gl_FragColor = mix(bgColor, fgColor, opacity);