BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit in order to pull from Master.

Browse Source
This commit is contained in:
antc13
2016-01-19 18:21:27 +01:00
parent 3826142e94
commit e643581971
5 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/Shaders/ForwardPlus.frag.glsl
+1 -2
View File
@@ -113,7 +113,7 @@ void main()
totalLighting.Specular += result.Specular;
}
//fragmentColor += Input.DiffuseColor * (totalLighting.Diffuse + totalLighting.Specular) * texel * Color;
fragmentColor += (totalLighting.Diffuse + totalLighting.Specular) * texel * Color;
//fragmentColor += Input.DiffuseColor * (totalLighting.Diffuse) * texel * Color;
//fragmentColor += vec4(0.0, LightGrids.Data[currentTile].Amount/3.0, 0, 1);
//fragmentColor = texel * Input.DiffuseColor * Color;
@@ -125,7 +125,6 @@ void main()
}
fragmentColor = vec4(1.0f, 1.0f, 1.0f, 1.0f);
}