s444441/Space-Project
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Fix fragment shader"

Browse Source 
This reverts commit 98683e60f9.
This commit is contained in:
Marcin Kwapisz 2021-02-04 01:56:17 +01:00
parent f2ab237a78
commit e2146bc5a1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shaders/shader_bloom.frag
View File

@ -8,7 +8,7 @@ uniform sampler2D bloomBlur;
void main() void main()
{ {
const float gamma = 1.0; const float gamma = 0.8;
vec3 hdrColor = texture(scene, vTexCoords).rgb; vec3 hdrColor = texture(scene, vTexCoords).rgb;
vec3 bloomColor = texture(bloomBlur, vTexCoords).rgb; vec3 bloomColor = texture(bloomBlur, vTexCoords).rgb;
hdrColor += bloomColor; hdrColor += bloomColor;

6
shaders/shader_tex.frag
View File

@ -26,7 +26,7 @@ void main()
{ {
vec3 fragColor = vec3(0,0,0); vec3 fragColor = vec3(0,0,0);
vec4 textureColor = texture2D(colorTexture, vTexCoord); vec4 textureColor = texture2D(colorTexture, vTexCoord);
vec3 ambient = vec3(0.1, 0.1, 0.1) * textureColor.xyz; vec4 ambient = vec4(0.1, 0.1, 0.1, 1.0) * textureColor;
vec3 normal = normalize(interpNormal); vec3 normal = normalize(interpNormal);
for(int i = 0; i < NR_POINT_LIGHTS; i++) for(int i = 0; i < NR_POINT_LIGHTS; i++)
{ {
@ -45,9 +45,9 @@ void main()
vec3 specular = spec * pointLights[i].color * (pointLights[i].intensity/dist); vec3 specular = spec * pointLights[i].color * (pointLights[i].intensity/dist);
vec3 texture = vec3(textureColor.x, textureColor.y, textureColor.z); // * pointLights[i].color; vec3 texture = vec3(textureColor.x, textureColor.y, textureColor.z); // * pointLights[i].color;
fragColor += texture*diffuse+vec3(1)*specular; fragColor += mix(texture,texture*diffuse+vec3(1)*specular,0.9);
} }
BrightColor = vec4(0.0, 0.0, 0.0, 1.0); BrightColor = vec4(0.0, 0.0, 0.0, 1.0);
FragColor = vec4(fragColor+ambient,1.0); FragColor = vec4(fragColor, 1.0) + ambient;
} }