tarion/Engine2026
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added Camera

Browse source
This commit is contained in:
Claire Schwarzer 2026-02-03 05:24:21 +01:00
parent 89e47fa56c
commit 3842a877ac
7 changed files with 233 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

3
assets/shaders/basicFragment.frag
View file

@ -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);
}

7
assets/shaders/basicVertex.vert
View file

@ -3,7 +3,6 @@ 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;
@ -13,8 +12,6 @@ uniform mat4 projection;
void main()
{
//gl_Position = vec4(aPos, 1.0);
gl_Position = projection * view * model * vec4(aPos, 1.0);
ourColor = aColor;
TexCoord = aTexCoord;
gl_Position = projection * view * model * vec4(aPos, 1.0f);
TexCoord = vec2(aTexCoord.x, aTexCoord.y);
}