diff options
101 files changed, 560 insertions, 561 deletions
diff --git a/assets/shaders/Cloud.frag.glsl b/assets/shaders/Cloud.frag.glsl index dc984191..1149f11b 100644 --- a/assets/shaders/Cloud.frag.glsl +++ b/assets/shaders/Cloud.frag.glsl | |||
@@ -43,5 +43,5 @@ void main() | |||
43 | { | 43 | { |
44 | vec4 c = texture2D(u_tex0, v_texCoord0); | 44 | vec4 c = texture2D(u_tex0, v_texCoord0); |
45 | gl_FragColor = c; | 45 | gl_FragColor = c; |
46 | } | 46 | } |
47 | 47 | ||
diff --git a/assets/shaders/Cloud.vert.glsl b/assets/shaders/Cloud.vert.glsl index c709bc27..a33429fe 100644 --- a/assets/shaders/Cloud.vert.glsl +++ b/assets/shaders/Cloud.vert.glsl | |||
@@ -70,6 +70,6 @@ void main() | |||
70 | pos.z = z; | 70 | pos.z = z; |
71 | 71 | ||
72 | gl_Position = u_projMatrix * u_mvMatrix * pos; | 72 | gl_Position = u_projMatrix * u_mvMatrix * pos; |
73 | 73 | ||
74 | v_texCoord0 = texcoord; | 74 | v_texCoord0 = texcoord; |
75 | } | 75 | } |
diff --git a/assets/shaders/Flag.vert.glsl b/assets/shaders/Flag.vert.glsl index 49eaaccb..51ec8f8b 100644 --- a/assets/shaders/Flag.vert.glsl +++ b/assets/shaders/Flag.vert.glsl | |||
@@ -70,6 +70,6 @@ void main() | |||
70 | v.z *= u_waveHeight; | 70 | v.z *= u_waveHeight; |
71 | v.z -= 2.0*u_waveHeight; | 71 | v.z -= 2.0*u_waveHeight; |
72 | v.z *= x * 0.09; | 72 | v.z *= x * 0.09; |
73 | 73 | ||
74 | gl_Position = u_projMatrix * u_mvMatrix * vec4(v,1.0) ; | 74 | gl_Position = u_projMatrix * u_mvMatrix * vec4(v,1.0) ; |
75 | } | 75 | } |
diff --git a/assets/shaders/linearGradient.frag.glsl b/assets/shaders/linearGradient.frag.glsl index 56a55d86..03310255 100755 --- a/assets/shaders/linearGradient.frag.glsl +++ b/assets/shaders/linearGradient.frag.glsl | |||
@@ -33,14 +33,14 @@ precision highp float; | |||
33 | #endif | 33 | #endif |
34 | 34 | ||
35 | 35 | ||
36 | uniform vec4 u_color1; | 36 | uniform vec4 u_color1; |