Added texture support.
This commit is contained in:
@ -1,6 +1,14 @@
|
||||
#version 330 core
|
||||
|
||||
in vec2 TexCoord;
|
||||
|
||||
uniform sampler2D u_Text;
|
||||
|
||||
out vec4 FragColor;
|
||||
|
||||
void main() {
|
||||
FragColor = vec4(1, 1, 1, 1);
|
||||
vec4 color = texture(u_Text, TexCoord);
|
||||
FragColor = color;
|
||||
// FragColor = color + vec4(0.5, 0.5, 0.5, 1);
|
||||
// FragColor = vec4(1, 1, 1, 1);
|
||||
}
|
@ -1,11 +1,15 @@
|
||||
// #version 330 core
|
||||
// #extension GL_ARB_separate_shader_objects : enable
|
||||
#version 330 core
|
||||
#extension GL_ARB_separate_shader_objects : enable
|
||||
|
||||
// layout (location = 0) in vec3 aPos;
|
||||
layout (location = 0) in vec3 aPos;
|
||||
layout (location = 1) in vec2 aTexCoord;
|
||||
|
||||
uniform mat4 u_Proj;
|
||||
uniform mat4 u_View;
|
||||
|
||||
out vec2 TexCoord;
|
||||
|
||||
void main() {
|
||||
gl_Position = u_Proj * u_View * gl_Vertex;
|
||||
TexCoord = vec2(aTexCoord.x, aTexCoord.y);
|
||||
}
|
Reference in New Issue
Block a user