Commit 5c1ae670 authored by Margaux Mouchene's avatar Margaux Mouchene
Browse files

mix texture

parent 545b67dd
......@@ -57,10 +57,12 @@ MAP_SHADER = r"""
// if(1. - v.y > 1.e-6) { discard; }
vec4 l = colormap(v.x);
gl_FragColor = gl_Color * vec4(l.rgb, v.y);
// gl_FragColor = gl_Color * vec4(l.rgb, v.y);
vec4 b = texture2D(others, gl_TexCoord[0].st);
if(1. - b.y > 1.e-6) {gl_FragColor = vec4(1.,1.,0.,1.); }
vec4 m = colormap(b.x);
gl_FragColor = gl_Color * vec4(l.rgb, v.y)* vec4(m.rgb, b.y);
// handle selection
vec4 s = texture2D(selection, gl_TexCoord[0].st);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment