xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Line texture: fix fragment shader, #105

Browse Source
This commit is contained in:
Emux 2016-07-31 18:42:28 +03:00
parent c926a714db
commit a4934a50cd
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
vtm/resources/assets/shaders/linetex_layer_tex.glsl
View File

@ -38,9 +38,25 @@ uniform vec4 u_bgcolor;
uniform float u_pwidth; uniform float u_pwidth;
varying vec2 v_st; varying vec2 v_st;
uniform sampler2D tex; uniform sampler2D tex;
uniform float u_mode;
void void
main(){ main(){
vec4 c=texture2D(tex,vec2(abs(mod(v_st.s+1.0,2.0)),(v_st.t+1.0)*0.5)); if (u_mode == 1.0) {
float fuzz=fwidth(c.a); vec4 c=texture2D(tex,vec2(abs(mod(v_st.s+1.0,2.0)),(v_st.t+1.0)*0.5));
gl_FragColor=(c * u_color) *smoothstep(0.5-fuzz,0.5+fuzz,c.a); float fuzz=fwidth(c.a);
gl_FragColor=(c * u_color) *smoothstep(0.5-fuzz,0.5+fuzz,c.a);
}
else {
/* distance on perpendicular to the line */
float dist = abs(v_st.t);
float fuzz = fwidth(v_st.t);
float fuzz_p = fwidth(v_st.s);
float line_w = smoothstep(0.0, fuzz, 1.0 - dist);
float stipple_w = smoothstep(0.0, fuzz, u_pwidth - dist);
/* triangle waveform in the range 0..1 for regular pattern */
float phase = abs(mod(v_st.s, 2.0) - 1.0);
/* interpolate between on/off phase, 0.5 = equal phase length */
float stipple_p = smoothstep(0.5 - fuzz_p, 0.5 + fuzz_p, phase);
gl_FragColor = line_w * mix(u_bgcolor, u_color, min(stipple_w, stipple_p));
}
} }

5
vtm/src/org/oscim/renderer/bucket/LineTexBucket.java
View File

@ -217,7 +217,7 @@ public final class LineTexBucket extends LineBucket {
} }
static class Shader extends GLShader { static class Shader extends GLShader {
int uMVP, uColor, uWidth, uBgColor, uScale; int uMVP, uColor, uWidth, uBgColor, uScale, uMode;
int uPatternWidth, uPatternScale; int uPatternWidth, uPatternScale;
int aPos0, aPos1, aLen0, aLen1, aFlip; int aPos0, aPos1, aLen0, aLen1, aFlip;
@ -231,6 +231,7 @@ public final class LineTexBucket extends LineBucket {
uColor = getUniform("u_color"); uColor = getUniform("u_color");
uWidth = getUniform("u_width"); uWidth = getUniform("u_width");
uBgColor = getUniform("u_bgcolor"); uBgColor = getUniform("u_bgcolor");
uMode = getUniform("u_mode");
uPatternWidth = getUniform("u_pwidth"); uPatternWidth = getUniform("u_pwidth");
uPatternScale = getUniform("u_pscale"); uPatternScale = getUniform("u_pscale");
@ -360,6 +361,8 @@ public final class LineTexBucket extends LineBucket {
LineTexBucket lb = (LineTexBucket) b; LineTexBucket lb = (LineTexBucket) b;
LineStyle line = lb.line.current(); LineStyle line = lb.line.current();
gl.uniform1f(shader.uMode, line.texture != null ? 1 : 0);
if (line.texture != null) if (line.texture != null)
line.texture.bind(); line.texture.bind();