Added Camera
This commit is contained in:
parent
89e47fa56c
commit
3842a877ac
7 changed files with 233 additions and 67 deletions
|
|
@ -1,7 +1,6 @@
|
|||
#version 330 core
|
||||
out vec4 FragColor;
|
||||
|
||||
in vec3 ourColor;
|
||||
in vec2 TexCoord;
|
||||
|
||||
uniform sampler2D ourTexture;
|
||||
|
|
@ -9,5 +8,5 @@ uniform sampler2D decal;
|
|||
|
||||
void main()
|
||||
{
|
||||
FragColor = mix(texture(ourTexture, TexCoord), texture(decal, TexCoord), 0.2);
|
||||
FragColor = mix(texture(ourTexture, TexCoord), texture(decal, TexCoord), 0.2f);
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue