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

u_Mode uniform as integer

Browse Source
This commit is contained in:
Gustl22
2019-01-25 20:46:51 +01:00
parent 11a5d841f9
commit c32652c066
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vtm/resources/assets/shaders/line_aa.glsl
View File

@@ -8,7 +8,7 @@ uniform mat4 u_mvp;
uniform float u_width;
// xy hold position, zw extrusion vector
attribute vec4 a_pos;
uniform float u_mode;
uniform int u_mode;
uniform float u_height;
varying vec2 v_st;
void
@@ -30,13 +30,13 @@ precision highp float;
#endif
uniform sampler2D tex;
uniform float u_fade;
uniform float u_mode;
uniform int u_mode;
uniform vec4 u_color;
varying vec2 v_st;
void
main(){
float len;
if (u_mode == 2.0) {
if (u_mode == 2) {
// round cap line
#ifdef DESKTOP_QUIRKS
len = length(v_st);

10
vtm/resources/assets/shaders/line_aa_proj.glsl
View File

@@ -8,7 +8,7 @@ uniform mat4 u_mvp;
uniform float u_width;
// xy hold position, zw extrusion vector
attribute vec4 a_pos;
uniform float u_mode;
uniform int u_mode;
uniform float u_height;
varying vec2 v_st;
void
@@ -32,7 +32,7 @@ $$
precision highp float;
#endif
uniform sampler2D tex;
uniform float u_mode;
uniform int u_mode;
uniform vec4 u_color;
uniform float u_fade;
varying vec2 v_st;
@@ -40,7 +40,7 @@ void
main(){
float len;
float fuzz;
if (u_mode == 2.0) {
if (u_mode == 2) {
/* round cap line */
#ifdef DESKTOP_QUIRKS
len = length(v_st);
@@ -55,8 +55,8 @@ main(){
len = abs(v_st.s);
fuzz = fwidth(v_st.s);
}
// u_mode == 0.0 -> thin line
// len = len * clamp(u_mode, len, 1.0);
// u_mode == 0 -> thin line
// len = len * clamp(float(u_mode), len, 1.0);
if (fuzz > 2.0)
gl_FragColor = u_color * 0.5;
else

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

@@ -40,13 +40,13 @@ uniform vec4 u_bgcolor;
uniform float u_pwidth;
varying vec2 v_st;
uniform sampler2D tex;
uniform float u_mode;
uniform int u_mode;
void
main(){
if (u_mode >= 1.0) {
if (u_mode >= 1) {
/* Dash array or texture */
float step = 2.0;
if (u_mode == 2.0) { // dashed texture
if (u_mode == 2) { // dashed texture
step = 1.0;
}
// use lineLength mod texture step (mod is always positive)