Added camera
This commit is contained in:
@ -1,11 +1,6 @@
|
||||
#version 330 core
|
||||
out vec4 FragColor;
|
||||
|
||||
in vec2 TexCoord;
|
||||
uniform sampler2D uniform_Texture;
|
||||
|
||||
void main() {
|
||||
vec4 color = texture(uniform_Texture, TexCoord);
|
||||
FragColor = color;
|
||||
// FragColor = vec4(1, 1, 1, 1);
|
||||
FragColor = vec4(1, 1, 1, 1);
|
||||
}
|
@ -1,17 +1,11 @@
|
||||
#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 = 1) in vec2 aTexCoord;
|
||||
// layout (location = 0) in vec3 aPos;
|
||||
|
||||
uniform mat4 uniform_MVP;
|
||||
uniform mat4 uniform_MP;
|
||||
|
||||
out vec2 TexCoord;
|
||||
uniform mat4 u_Proj;
|
||||
uniform mat4 u_View;
|
||||
|
||||
void main() {
|
||||
vec3 pos = aPos;
|
||||
|
||||
gl_Position = uniform_MVP * uniform_MP * vec4(pos, 1);
|
||||
TexCoord = vec2(aTexCoord.x, aTexCoord.y);
|
||||
gl_Position = u_Proj * u_View * gl_Vertex;
|
||||
}
|
Reference in New Issue
Block a user