added ObjectGlTexColor, tweaked shaders
This commit is contained in:
@ -1,10 +1,10 @@
|
||||
#version 330 core
|
||||
|
||||
in vec3 Color;
|
||||
in vec3 color;
|
||||
|
||||
out vec4 FragColor;
|
||||
|
||||
void main()
|
||||
{
|
||||
FragColor = vec4(Color, 1.0f);
|
||||
FragColor = vec4(color, 1.0f);
|
||||
}
|
@ -3,10 +3,12 @@
|
||||
layout (location = 0) in vec3 aPos;
|
||||
layout (location = 1) in vec3 aColor;
|
||||
|
||||
out vec3 Color;
|
||||
out vec3 color;
|
||||
|
||||
uniform mat4 transform;
|
||||
|
||||
void main()
|
||||
{
|
||||
gl_Position = vec4(aPos, 1.0);
|
||||
Color = aColor;
|
||||
gl_Position = transform * vec4(aPos, 1.0);
|
||||
color = aColor;
|
||||
}
|
Reference in New Issue
Block a user