Mercurial > love-experiments
diff src/scripts/graphics.lua @ 1220:97025908abb5
More cleanup and some overdone comments
| author | Alexander Szpakowski <amaranth72@gmail.com> |
|---|---|
| date | Sat, 05 Jan 2013 15:59:01 -0400 |
| parents | 484d3ee8c269 |
| children | 4c72cb704bf1 |
line wrap: on
line diff
--- a/src/scripts/graphics.lua Fri Jan 04 05:05:25 2013 -0400 +++ b/src/scripts/graphics.lua Sat Jan 05 15:59:01 2013 -0400 @@ -1295,14 +1295,16 @@ #define Texel texture2D #define ModelViewMatrix gl_ModelViewMatrix +#define ProjectionMatrix gl_ProjectionMatrix #define ModelViewProjectionMatrix gl_ModelViewProjectionMatrix #define NormalMatrix gl_NormalMatrix -#define ExternColor vec4(1.0) + #define VertexColor gl_Color +#define VertexTexCoord gl_MultiTexCoord0 +#define VertexPosition gl_Vertex + #define VaryingColor gl_FrontColor -#define VertexTexCoord gl_MultiTexCoord0 #define VaryingTexCoord gl_TexCoord[0] -#define VertexPosition gl_Vertex uniform sampler2D _tex0_; @@ -1310,7 +1312,7 @@ FOOTER = [[ void main() { VaryingTexCoord = VertexTexCoord; - VaryingColor = VertexColor * ExternColor; + VaryingColor = VertexColor; gl_Position = position(ModelViewProjectionMatrix, VertexPosition); }]], } @@ -1325,9 +1327,10 @@ #define Texel texture2D #define ModelViewMatrix gl_ModelViewMatrix +#define ProjectionMatrix gl_ProjectionMatrix #define ModelViewProjectionMatrix gl_ModelViewProjectionMatrix #define NormalMatrix gl_NormalMatrix -#define ExternColor vec4(1.0) + #define VaryingColor gl_Color #define VaryingTexCoord gl_TexCoord[0]