diff options
| author | hwc487 | 2012-07-09 16:08:02 -0700 |
|---|---|---|
| committer | hwc487 | 2012-07-09 16:08:02 -0700 |
| commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
| tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /assets/shaders/Basic.vert.glsl | |
| parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
| parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
| download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
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 | } |