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/Basic.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/Basic.vert.glsl')
| -rwxr-xr-x | assets/shaders/Basic.vert.glsl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/assets/shaders/Basic.vert.glsl b/assets/shaders/Basic.vert.glsl index ae454411..80b2f088 100755 --- a/assets/shaders/Basic.vert.glsl +++ b/assets/shaders/Basic.vert.glsl | |||
| @@ -39,7 +39,7 @@ attribute vec3 a_pos; | |||
| 39 | attribute vec2 texcoord; | 39 | attribute vec2 texcoord; |
| 40 | 40 | ||
| 41 | // varying | 41 | // varying |
| 42 | varying vec2 v_texCoord0; | 42 | varying vec2 v_texCoord0; |
| 43 | 43 | ||
| 44 | // matrix uniforms | 44 | // matrix uniforms |
| 45 | uniform mat4 u_mvMatrix; | 45 | uniform mat4 u_mvMatrix; |
| @@ -48,6 +48,6 @@ uniform mat4 u_worldMatrix; | |||
| 48 | 48 | ||
| 49 | void main(void) | 49 | void main(void) |
| 50 | { | 50 | { |
| 51 | v_texCoord0 = texcoord; | 51 | v_texCoord0 = texcoord; |
| 52 | gl_Position = u_projMatrix * u_mvMatrix * vec4(a_pos,1.0) ; | 52 | gl_Position = u_projMatrix * u_mvMatrix * vec4(a_pos,1.0) ; |
| 53 | } | 53 | } |