diff options
| author | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
| commit | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch) | |
| tree | 3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /assets/shaders/linearGradient.vert.glsl | |
| parent | c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff) | |
| parent | 40c6eb2c06b34f65a74d59ef9687251952858bab (diff) | |
| download | ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz | |
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts:
js/components/gradientpicker.reel/gradientpicker.js
js/components/tools-properties/text-properties.reel/text-properties.js
js/document/views/base.js
js/document/views/design.js
js/helper-classes/3D/StageLine.js
js/helper-classes/3D/draw-utils.js
js/lib/drawing/world.js
js/lib/geom/circle.js
js/lib/geom/line.js
js/lib/geom/rectangle.js
js/lib/geom/shape-primitive.js
js/lib/rdge/materials/bump-metal-material.js
js/lib/rdge/materials/flag-material.js
js/lib/rdge/materials/fly-material.js
js/lib/rdge/materials/julia-material.js
js/lib/rdge/materials/keleidoscope-material.js
js/lib/rdge/materials/mandel-material.js
js/lib/rdge/materials/material.js
js/lib/rdge/materials/plasma-material.js
js/lib/rdge/materials/pulse-material.js
js/lib/rdge/materials/radial-gradient-material.js
js/lib/rdge/materials/taper-material.js
js/lib/rdge/materials/twist-vert-material.js
js/lib/rdge/materials/water-material.js
js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
js/panels/Materials/materials-popup.reel/materials-popup.html
js/panels/Materials/materials-popup.reel/materials-popup.js
js/tools/LineTool.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'assets/shaders/linearGradient.vert.glsl')
| -rwxr-xr-x | assets/shaders/linearGradient.vert.glsl | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/assets/shaders/linearGradient.vert.glsl b/assets/shaders/linearGradient.vert.glsl index 165c2646..12b36c0f 100755 --- a/assets/shaders/linearGradient.vert.glsl +++ b/assets/shaders/linearGradient.vert.glsl | |||
| @@ -51,25 +51,25 @@ uniform mat4 u_normalMatrix; | |||
| 51 | uniform mat4 u_projMatrix; | 51 | uniform mat4 u_projMatrix; |
| 52 | uniform mat4 u_worldMatrix; | 52 | uniform mat4 u_worldMatrix; |
| 53 | 53 | ||
| 54 | uniform vec4 u_color1; | 54 | uniform vec4 u_color1; |
| 55 | uniform vec4 u_color2; | 55 | uniform vec4 u_color2; |
| 56 | uniform vec4 u_color3; | 56 | uniform vec4 u_color3; |
| 57 | uniform vec4 u_color4; | 57 | uniform vec4 u_color4; |
| 58 | uniform float u_colorStop1; | 58 | uniform float u_colorStop1; |
| 59 | uniform float u_colorStop2; | 59 | uniform float u_colorStop2; |
| 60 | uniform float u_colorStop3; | 60 | uniform float u_colorStop3; |
| 61 | uniform float u_colorStop4; | 61 | uniform float u_colorStop4; |
| 62 | uniform vec2 u_cos_sin_angle; | 62 | uniform vec2 u_cos_sin_angle; |
| 63 | //uniform int u_colorCount; // currently using 4 | 63 | //uniform int u_colorCount; // currently using 4 |
| 64 | uniform mat3 u_texTransform; | 64 | uniform mat3 u_texTransform; |
| 65 | 65 | ||
| 66 | varying vec2 v_uv; | 66 | varying vec2 v_uv; |
| 67 | 67 | ||
| 68 | 68 | ||
| 69 | void main(void) | 69 | void main(void) |
| 70 | { | 70 | { |
| 71 | gl_Position = u_projMatrix * u_mvMatrix * vec4(vert,1.0) ; | 71 | gl_Position = u_projMatrix * u_mvMatrix * vec4(vert,1.0) ; |
| 72 | //v_uv = texcoord; | 72 | //v_uv = texcoord; |
| 73 | vec3 tmp = u_texTransform * vec3( texcoord, 1.0); | 73 | vec3 tmp = u_texTransform * vec3( texcoord, 1.0); |
| 74 | v_uv = tmp.xy; | 74 | v_uv = tmp.xy; |
| 75 | } | 75 | } |