This commit is contained in:
2024-08-27 01:48:58 +02:00
parent 68abd9eefe
commit 346bc96ca8
44 changed files with 2593 additions and 546 deletions

View File

@@ -1,8 +1,17 @@
#version 430 core
#version 460 core
precision highp float;
out vec4 color;
out vec4 FragColor;
in vec3 ourColor;
in vec2 TexCoord;
in vec3 pos;
uniform sampler2D ourTexture;
void main()
{
color = vec4(1.0f, 1.0f, 1.0f, 1.0f);
}
FragColor = texture(ourTexture, TexCoord);
// FragColor = vec4(1.0f, TexCoord.x, 1.0f, 1.0);
// FragColor = vec4(137 / 255, 85 / 255, 95 / 255, 1.0f);
}

View File

@@ -0,0 +1,34 @@
#version 330 core
layout (location = 0) in vec3 aPos;
layout (location = 1) in vec3 aColor;
layout (location = 2) in vec2 aTexCoord;
out vec3 ourColor;
out vec2 TexCoord;
uniform mat4 model;
uniform mat4 view;
uniform mat4 projection;
void main()
{
gl_Position = projection * view * model * vec4(aPos, 1.0);
ourColor = aColor;
TexCoord = aTexCoord;
}
#version 330 core
out vec4 FragColor;
in vec3 ourColor;
in vec2 TexCoord;
uniform sampler2D ourTexture;
void main()
{
FragColor = texture(ourTexture, TexCoord);
// FragColor = vec4(1.0f, 1.0f, 0.0f, 1.0);
}

View File

@@ -1,8 +1,20 @@
#version 430 core
#version 460 core
precision highp float;
in vec3 position;
layout (location = 0) in vec3 aPos;
//layout (location = 1) in vec3 aColor;
layout (location = 1) in vec2 aTexCoord;
out vec2 TexCoord;
out vec3 pos;
uniform mat4 model;
uniform mat4 view;
uniform mat4 projection;
void main()
{
gl_Position = vec4(position, 1.0f);
}
gl_Position = projection * view * model * vec4(aPos, 1.0);
TexCoord = aTexCoord;
pos = aPos;
}