diff options
Diffstat (limited to 'slideshow/opengl/basicVertexShader.glsl')
| -rw-r--r-- | slideshow/opengl/basicVertexShader.glsl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/slideshow/opengl/basicVertexShader.glsl b/slideshow/opengl/basicVertexShader.glsl index a4b258c69043..ebd5dbcc6585 100644 --- a/slideshow/opengl/basicVertexShader.glsl +++ b/slideshow/opengl/basicVertexShader.glsl @@ -28,6 +28,8 @@ #version 120 +uniform mat4 u_projectionMatrix; +uniform mat4 u_modelViewMatrix; uniform mat4 u_sceneTransformMatrix; uniform mat4 u_primitiveTransformMatrix; uniform mat4 u_operationsTransformMatrix; @@ -37,9 +39,9 @@ varying vec3 v_normal; void main( void ) { - mat4 modelViewMatrix = gl_ModelViewMatrix * u_operationsTransformMatrix * u_sceneTransformMatrix * u_primitiveTransformMatrix; + mat4 modelViewMatrix = u_modelViewMatrix * u_operationsTransformMatrix * u_sceneTransformMatrix * u_primitiveTransformMatrix; mat3 normalMatrix = mat3(transpose(inverse(modelViewMatrix))); - gl_Position = gl_ProjectionMatrix * modelViewMatrix * gl_Vertex; + gl_Position = u_projectionMatrix * modelViewMatrix * gl_Vertex; v_texturePosition = gl_MultiTexCoord0.xy; v_normal = normalize(normalMatrix * gl_Normal); } |