diff options
author | Juan Linietsky <juan@okamstudio.com> | 2015-01-19 02:39:58 -0300 |
---|---|---|
committer | Juan Linietsky <juan@okamstudio.com> | 2015-01-19 02:39:58 -0300 |
commit | a0511ed59a0e03232bf3abb49b3c916591453aef (patch) | |
tree | 1911b8cf77de024c526757ef0a6aff973b988397 /drivers/gles2 | |
parent | e0c0aef615e8c8dac370fe745972190a077dc0cc (diff) |
Color Ramp and Curve Map added to visual shader editing.
Added Color Ramp and Curve Map to shader nodes.
Fixed an issue that crashed Godot Editor right when opened.
Diffstat (limited to 'drivers/gles2')
-rw-r--r-- | drivers/gles2/shaders/canvas.glsl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/gles2/shaders/canvas.glsl b/drivers/gles2/shaders/canvas.glsl index 464cb9e188..5a26f7321e 100644 --- a/drivers/gles2/shaders/canvas.glsl +++ b/drivers/gles2/shaders/canvas.glsl @@ -46,14 +46,15 @@ void main() { color_interp = color_attrib; uv_interp = uv_attrib; - highp vec4 outvec = vec4(vertex, 1.0); + highp vec4 outvec = vec4(vertex, 1.0); { - vec2 src_vtx=outvec.xy; + vec2 src_vtx=outvec.xy; VERTEX_SHADER_CODE } - outvec = extra_matrix * outvec; - outvec = modelview_matrix * outvec; + outvec = extra_matrix * outvec; + outvec = modelview_matrix * outvec; + #ifdef USE_PIXEL_SNAP outvec.xy=floor(outvec.xy+0.5); |