Added texture and color support to default shaders.
This commit is contained in:
parent
c62ec58c8f
commit
1a256eb664
@ -1,10 +1,10 @@
|
|||||||
out vec4 outputColor;
|
out vec4 outputColor;
|
||||||
|
|
||||||
in vec2 texCoord;
|
in vec2 texCoord;
|
||||||
|
in vec4 color;
|
||||||
uniform sampler2D texture0;
|
uniform sampler2D texture0;
|
||||||
|
|
||||||
void main()
|
void main()
|
||||||
{
|
{
|
||||||
outputColor = texture(texture0, texCoord);
|
outputColor = texture(texture0, texCoord) * color;
|
||||||
}
|
}
|
@ -1,6 +1,11 @@
|
|||||||
#version 330 core
|
#version 330 core
|
||||||
in vec3 aPosition;
|
in vec3 aPosition;
|
||||||
in mat4 aTransform;
|
in mat4 aTransform;
|
||||||
|
in vec2 aTexCoord;
|
||||||
|
in vec4 aColor;
|
||||||
|
|
||||||
|
out vec2 texCoord;
|
||||||
|
out vec4 color;
|
||||||
|
|
||||||
void main()
|
void main()
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user