Skip to content

Commit

Permalink
New shader system now working with cubemapping (still only vertex-lit…
Browse files Browse the repository at this point in the history
… + no effects)

Blending is now performed properly (the old version seems to never do this correctly, see spheres in Testscene)
Cleanup of now unnecessary code
  • Loading branch information
fschauk committed Dec 18, 2014
1 parent 9e92b4e commit 62e5733
Show file tree
Hide file tree
Showing 6 changed files with 318 additions and 380 deletions.
5 changes: 2 additions & 3 deletions data/shaders/s3d_vertexlit.vert
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ This is a shader for basic vertex lighting. This should be the minimum quality s
#version 120

//matrices
uniform mat4 u_mModelView;
uniform mat4 u_mProjection;
uniform mat4 u_mMVP;
uniform mat3 u_mNormal;

//light info
Expand Down Expand Up @@ -66,5 +65,5 @@ void main(void)

v_illumination = vec4(calcLighting(normal), u_vMatAlpha);
v_texcoord = a_texcoord;
gl_Position = u_mProjection * u_mModelView * a_vertex;
gl_Position = u_mMVP * a_vertex;
}
Loading

0 comments on commit 62e5733

Please sign in to comment.