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

Merge branch 'issues/4-phong' of github.com:fataku/LOG750-LAB2 into issues/4-phong

Browse Source
This commit is contained in:
Riku Avelar 2016-11-09 23:34:32 -05:00
commit ba769e6ed3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/shaders/basicShader.frag
View File

@ -16,7 +16,7 @@ main()
{ {
vec4 texColor = texture(tex, texCoords); vec4 texColor = texture(tex, texCoords);
if(isSky) { if(isSky) {
fColor = texColor; fColor = normalize(texColor*texColor*texColor*2/1.41)*2;
} else if(isPhong) { } else if(isPhong) {
// Get lighting vectors // Get lighting vectors
vec3 LightDirection = normalize(vec3(1,3,1)); vec3 LightDirection = normalize(vec3(1,3,1));