Model + Texture

This commit is contained in:
ViktorLjung
2014-03-07 20:34:40 +01:00
parent 95a36794e3
commit 800b4a3045
22 changed files with 16705 additions and 60 deletions
+2 -2
View File
@@ -5,7 +5,7 @@ uniform sampler2D texture0;
in VertexData {
vec3 Position;
vec3 Color;
vec3 Normal;
vec2 TextureCoord;
} Input;
@@ -14,5 +14,5 @@ out vec4 FragmentColor;
void main()
{
vec4 texel = texture2D(texture0, Input.TextureCoord);
FragmentColor = texel * vec4(Input.Color, 0);
FragmentColor = texel;
}