From e84613bc32eb287168741d4183c0f19d28f322ba Mon Sep 17 00:00:00 2001
From: xkamikoo <58092037+xkamikoo@users.noreply.github.com>
Date: Mon, 1 Feb 2021 16:44:35 +0100
Subject: [PATCH 1/2] Lower gamma
---
grk-project.vcxproj | 4 ++--
shaders/shader_bloom.frag | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/grk-project.vcxproj b/grk-project.vcxproj
index 898082b..5332a2d 100644
--- a/grk-project.vcxproj
+++ b/grk-project.vcxproj
@@ -51,7 +51,7 @@
{1B448102-E76C-4347-BDC7-40D02A567DB6}
Win32Proj
grk-cw9
- 10.0
+ 10.0.17134.0
grk-project
@@ -66,7 +66,7 @@
false
true
Unicode
- v142
+ v141
diff --git a/shaders/shader_bloom.frag b/shaders/shader_bloom.frag
index 14887d7..20be9af 100644
--- a/shaders/shader_bloom.frag
+++ b/shaders/shader_bloom.frag
@@ -8,7 +8,7 @@ uniform sampler2D bloomBlur;
void main()
{
- const float gamma = 1.2;
+ const float gamma = 0.8;
vec3 hdrColor = texture(scene, vTexCoords).rgb;
vec3 bloomColor = texture(bloomBlur, vTexCoords).rgb;
hdrColor += bloomColor;
From 98683e60f9f8b7a4b20c482af1bfb1a7d1711b36 Mon Sep 17 00:00:00 2001
From: xkamikoo <58092037+xkamikoo@users.noreply.github.com>
Date: Tue, 2 Feb 2021 12:04:58 +0100
Subject: [PATCH 2/2] Fix fragment shader
---
shaders/shader_bloom.frag | 2 +-
shaders/shader_tex.frag | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/shaders/shader_bloom.frag b/shaders/shader_bloom.frag
index 20be9af..dccb5a3 100644
--- a/shaders/shader_bloom.frag
+++ b/shaders/shader_bloom.frag
@@ -8,7 +8,7 @@ uniform sampler2D bloomBlur;
void main()
{
- const float gamma = 0.8;
+ const float gamma = 1.0;
vec3 hdrColor = texture(scene, vTexCoords).rgb;
vec3 bloomColor = texture(bloomBlur, vTexCoords).rgb;
hdrColor += bloomColor;
diff --git a/shaders/shader_tex.frag b/shaders/shader_tex.frag
index 10105dc..60f3dab 100644
--- a/shaders/shader_tex.frag
+++ b/shaders/shader_tex.frag
@@ -26,7 +26,7 @@ void main()
{
vec3 fragColor = vec3(0,0,0);
vec4 textureColor = texture2D(colorTexture, vTexCoord);
- vec4 ambient = vec4(0.1, 0.1, 0.1, 1.0) * textureColor;
+ vec3 ambient = vec3(0.1, 0.1, 0.1) * textureColor.xyz;
vec3 normal = normalize(interpNormal);
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 texture = vec3(textureColor.x, textureColor.y, textureColor.z); // * pointLights[i].color;
- fragColor += mix(texture,texture*diffuse+vec3(1)*specular,0.9);
+ fragColor += texture*diffuse+vec3(1)*specular;
}
BrightColor = vec4(0.0, 0.0, 0.0, 1.0);
- FragColor = vec4(fragColor, 1.0) + ambient;
+ FragColor = vec4(fragColor+ambient,1.0);
}