1- #version 450 core
1+ #version 430 core
22
33#define M_PI 3.1415926535897932384626433832795
44
5- #define POINT_LIGHTS 1
5+ // #define POINT_LIGHTS 1
66
77const float MAX_REFLECTION_LOD = 4.0 ;
88
@@ -11,7 +11,7 @@ in VS_OUT {
1111 vec3 WorldPos;
1212 vec3 TangentViewPos;
1313 vec3 TangentWorldPos;
14- vec3 TangentLightPositions[POINT_LIGHTS];
14+ // vec3 TangentLightPositions[POINT_LIGHTS];
1515 mat3 TBN;
1616} fs_in;
1717
@@ -20,6 +20,8 @@ out vec4 FragColor;
2020uniform samplerCube irradianceMap;
2121uniform samplerCube prefilterMap;
2222uniform sampler2D brdfLUT;
23+ uniform float skyboxExposure;
24+ uniform float skyboxColorIntensity;
2325
2426uniform sampler2D albedoMap;
2527uniform sampler2D normalMap;
@@ -34,8 +36,18 @@ uniform float colorIntensity;
3436
3537uniform vec3 camPos;
3638
37- uniform vec3 lightPositions[POINT_LIGHTS];
38- uniform vec3 lightColors[POINT_LIGHTS];
39+ // uniform vec3 lightPositions[POINT_LIGHTS];
40+ // uniform vec3 lightColors[POINT_LIGHTS];
41+
42+ vec3 ApplyExposureAndIntensity(vec3 color, float e, float i)
43+ {
44+ vec3 ret = color;
45+ // Exposure
46+ ret = vec3 (1.0 ) - exp (- ret * e);
47+ // Color Intensity
48+ ret *= i;
49+ return ret;
50+ }
3951
4052vec3 GetNormalFromNormalMap(sampler2D map, vec2 coords)
4153{
@@ -56,35 +68,35 @@ vec2 ParallaxMapping(vec2 texCoords, vec3 viewDir)
5668 // depth of current layer
5769 float currentLayerDepth = 0.0 ;
5870 // the amount to shift the texture coordinates per layer (from vector P)
59- vec2 P = viewDir.xy * height_scale;
71+ vec2 P = viewDir.xy / viewDir.z * height_scale;
6072 vec2 deltaTexCoords = P / numLayers;
6173
6274 // get initial values
6375 vec2 currentTexCoords = texCoords;
64- float currentDepthMapValue = texture(displacementMap, texCoords ).r;
76+ float currentDepthMapValue = texture(displacementMap, currentTexCoords ).r;
6577
6678 while (currentLayerDepth < currentDepthMapValue)
6779 {
6880 // shift texture coordinates along direction of P
6981 currentTexCoords -= deltaTexCoords;
7082 // get depthmap value at current texture coordinates
71- currentDepthMapValue = texture(displacementMap, texCoords ).r;
83+ currentDepthMapValue = texture(displacementMap, currentTexCoords ).r;
7284 // get depth of next layer
73- currentLayerDepth += layerDepth;
85+ currentLayerDepth += layerDepth;
7486 }
7587
7688 // get texture coordinates before collision (reverse operations)
7789 vec2 prevTexCoords = currentTexCoords + deltaTexCoords;
7890
7991 // get depth after and before collision for linear interpolation
8092 float afterDepth = currentDepthMapValue - currentLayerDepth;
81- float beforeDepth = texture(displacementMap, texCoords ).r - currentLayerDepth + layerDepth;
93+ float beforeDepth = texture(displacementMap, prevTexCoords ).r - currentLayerDepth + layerDepth;
8294
8395 // interpolation of texture coordinates
8496 float weight = afterDepth / (afterDepth - beforeDepth);
8597 vec2 finalTexCoords = prevTexCoords * weight + currentTexCoords * (1.0 - weight);
8698
87- return finalTexCoords;
99+ return finalTexCoords;
88100}
89101
90102vec3 FresnelSchlick(float cosTheta, vec3 F0)
@@ -132,6 +144,16 @@ float GeometrySmith(vec3 N, vec3 V, vec3 L, float roughness)
132144 return ggx1 * ggx2;
133145}
134146
147+ vec3 PrefilteredColor(vec3 R, float roughness)
148+ {
149+ return ApplyExposureAndIntensity(textureLod(prefilterMap, R, roughness * MAX_REFLECTION_LOD).rgb, skyboxExposure, skyboxColorIntensity);
150+ }
151+
152+ vec3 IrradianceColor(vec3 N)
153+ {
154+ return ApplyExposureAndIntensity(texture(irradianceMap, N).rgb, skyboxExposure, skyboxColorIntensity);
155+ }
156+
135157void main()
136158{
137159 vec3 viewDir = normalize (fs_in.TangentViewPos - fs_in.TangentWorldPos);
@@ -153,8 +175,6 @@ void main()
153175 float metallic = texture(metallicMap, texCoords).r;
154176 float roughness = texture(roughnessMap, texCoords).r;
155177 float ao = texture(aoMap, texCoords).r;
156- /*
157- */
158178
159179 vec3 N = normalize (normal);
160180 vec3 V = normalize (camPos - fs_in.WorldPos);
@@ -163,19 +183,18 @@ void main()
163183 vec3 F0 = vec3 (0.04 );
164184 F0 = mix (F0, albedo, metallic);
165185
166- vec3 Lo = vec3 (0.0 );
167- // for(int i = 0; i < POINT_LIGHTS; ++i)
168- for (int i = POINT_LIGHTS; i < POINT_LIGHTS; ++ i)
186+ // vec3 Lo = vec3(0.0);
187+ /* for(int i = 0; i < POINT_LIGHTS; ++i)
169188 {
170189 vec3 L = normalize(lightPositions[i] - fs_in.WorldPos);
171190 //vec3 L = normalize(fs_in.TangentLightPositions[i] - fs_in.TangentWorldPos);
172191 vec3 H = normalize(V + L);
173-
192+
174193 float dist = length(lightPositions[i] - fs_in.WorldPos);
175194 //float dist = length(fs_in.TangentLightPositions[i] - fs_in.TangentWorldPos);
176195 float attenuation = 1.0 / (dist * dist);
177196 vec3 radiance = lightColors[i] * attenuation;
178-
197+
179198 // cook-torrance brdf
180199 float NDF = DistributionGGX(N, H, roughness);
181200 float G = GeometrySmith(N, V, L, roughness);
@@ -184,39 +203,43 @@ void main()
184203 vec3 kS = F;
185204 vec3 kD = vec3(1.0) - kS;
186205 kD *= 1.0 - metallic;
187-
206+
188207 vec3 numerator = NDF * G * F;
189208 float denominator = 4.0 * max(dot(N, V), 0.0) * max(dot(N, L), 0.0);
190209 vec3 specular = numerator / max(denominator, 0.001);
191-
210+
192211 float NdotL = max(dot(N, L), 0.0);
193212 Lo += (kD * albedo / M_PI + specular) * radiance * NdotL;
194213 }
214+ */
195215
196216 vec3 F = FresnelSchlickRoughness(max (dot (N, V), 0.0 ), F0, roughness);
197217
198218 vec3 kS = F;
199219 vec3 kD = 1.0 - kS;
200220 kD *= 1.0 - metallic;
201221
202- vec3 irradiance = texture(irradianceMap, N).rgb ;
222+ vec3 irradiance = IrradianceColor(N) ;
203223 vec3 diffuse = irradiance * albedo;
204224
205- vec3 prefilteredColor = textureLod(prefilterMap, R, roughness * MAX_REFLECTION_LOD).rgb ;
225+ vec3 prefilteredColor = PrefilteredColor( R, roughness) ;
206226 vec2 envBRDF = texture(brdfLUT, vec2 (max (dot (N, V), 0.0 ), roughness)).rg;
207227 vec3 specular = prefilteredColor * (F * envBRDF.x + envBRDF.y);
208228
209229 vec3 ambient = (kD * diffuse + specular) * ao;
210230
211- vec3 color = ambient + Lo;
231+ // vec3 color = ambient + Lo;
232+ vec3 color = ambient;
212233
213234 // Exposure
214235 // color *= exposure;
215236 // Tonemapping Reinharda
216237 // color = color / (color + vec3(1.0));
217- color = vec3 (1.0 ) - exp (- color * exposure);
238+ // color = vec3(1.0) - exp(-color * exposure);
218239 // Color Intensity
219- color *= colorIntensity;
240+ // color *= colorIntensity;
241+
242+ color = ApplyExposureAndIntensity(color, exposure, colorIntensity);
220243 // Gamma Correction
221244 color = pow (color, vec3 (1.0 / 2.2 ));
222245
0 commit comments