Conjure/LOG750-LAB2
6
0
Fork 0
mirror of https://github.com/ConjureETS/LOG750-LAB2.git synced 2026-03-24 03:21:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/issues/2-skybox' into issues/4-phong

Browse Source
This commit is contained in:
Riku Avelar 2016-11-09 20:20:36 -05:00
commit fff57b7285
2 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/shaders/skyboxShader.frag
View File

@ -1,11 +1,11 @@
#version 400 core #version 400 core
in vec2 texCoords; in vec2 texCoords;
out vec4 fColor; out vec4 fColor;
uniform sampler2D skybox; uniform sampler2D skybox;
void main() void main()
{ {
//fColor = texture(skybox, texCoords); //fColor = texture(skybox, texCoords);
fColor = texture(skybox, texCoords); fColor = texture(skybox, texCoords);
} }

11
src/shaders/skyboxshader.frag
View File

@ -1,11 +0,0 @@
#version 400 core
in vec2 texCoords;
out vec4 fColor;
uniform sampler2D skybox;
void main()
{
//fColor = texture(skybox, texCoords);
fColor = texture(skybox, texCoords);
}