Nigel Barink
16b61986a1
* Added Texures to the two sample cubes * Modified mesh structure - mesh now contains indices and vertices - Vertices contain vertices and uv's (later on they will also contain normals) Solution definitely not perfect and needs improvement.
14 lines
203 B
GLSL
14 lines
203 B
GLSL
#version 440 core
|
|
|
|
out vec4 FragColor;
|
|
|
|
uniform vec3 Color;
|
|
|
|
in vec2 TexCoord;
|
|
|
|
uniform sampler2D Texture;
|
|
|
|
|
|
void main(){
|
|
FragColor = mix ( texture(Texture, TexCoord), vec4(Color, 1.0f));
|
|
} |