mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-22 19:29:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned code and removed unused features.

Browse Source
This commit is contained in:
Jonathas Costa
2019-07-22 16:05:00 -04:00
parent df6c90b1ee
commit 20d24764e7
7 changed files with 5 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shaders/framebuffer/hdrAndFiltering.frag
+1 -48
View File
@@ -36,7 +36,6 @@ uniform float hdrExposure;
uniform float blackoutFactor;
uniform float gamma;
uniform float maxWhite;
uniform float aveLum;
uniform float Hue;
uniform float Saturation;
uniform float Value;
@@ -45,52 +44,10 @@ uniform int toneMapOperator;
uniform uint colorSpace;
uniform int nAaSamples;
//uniform sampler2D hdrFeedingTexture;
uniform sampler2DMS hdrFeedingTexture;
in vec2 texCoord;
// JCC: Change the next function to work with a MSAA texture
vec4 adaptiveToneMap() {
// int i;
// float lum[25];
// // Non MSAAA variant:
// //vec2 tex_scale = vec2(1.0) / textureSize(hdrFeedingTexture, 0);
// vec2 tex_scale = vec2(1.0) / textureSize(hdrFeedingTexture);
// for (i = 0; i < 25; i++)
// {
// vec2 tc = (gl_FragCoord.xy + 3.5 * vec2(i % 5 - 2, i / 5 - 2));
// vec3 col = texture(hdrFeedingTexture, tc * tex_scale).rgb;
// lum[i] = dot(col, vec3(0.3, 0.59, 0.11));
// }
// // Calculate weighted color of region
// vec3 vColor = texelFetch(hdrFeedingTexture, ivec2(gl_FragCoord.xy), 0).rgb;
// float kernelLuminance = (
// (1.0 * (lum[0] + lum[4] + lum[20] + lum[24])) +
// (4.0 * (lum[1] + lum[3] + lum[5] + lum[9] +
// lum[15] + lum[19] + lum[21] + lum[23])) +
// (7.0 * (lum[2] + lum[10] + lum[14] + lum[22])) +
// (16.0 * (lum[6] + lum[8] + lum[16] + lum[18])) +
// (26.0 * (lum[7] + lum[11] + lum[13] + lum[17])) +
// (41.0 * lum[12])
// ) / 273.0;
// // Compute the corresponding exposure
// float exposure = sqrt(8.0 / (kernelLuminance + 0.25));
// // Apply the exposure to this texel
// vec4 fColor;
// fColor.rgb = 1.0 - exp2(-vColor * exposure);
// fColor.a = 1.0f;
// return fColor;
return vec4(1.0, 0.0, 0.0, 1.0);
}
void main() {
vec4 color = vec4(0.0);
@@ -104,7 +61,7 @@ void main() {
vec3 tColor = vec3(0.0);
if (toneMapOperator == EXPONENTIAL) {
tColor = exponentialToneMapping(color.rgb, hdrExposure, gamma);
tColor = exponentialToneMapping(color.rgb, hdrExposure, gamma);
} else if (toneMapOperator == LINEAR) {
tColor = linearToneMapping(color.rgb, hdrExposure);
} else if (toneMapOperator == SIMPLE_REINHARD) {
@@ -121,10 +78,6 @@ void main() {
tColor = Uncharted2ToneMapping(color.rgb, hdrExposure);
} else if (toneMapOperator == COSTA) {
tColor = jToneMapping(color.rgb, hdrExposure);
} else if (toneMapOperator == ADAPTIVE) {
tColor = vec3(adaptiveToneMap());
} else if (toneMapOperator == GLOBAL) {
tColor = globalToneMappingOperatorRTR(color.rgb, hdrExposure, maxWhite, aveLum);
} else if (toneMapOperator == PHOTOGRAPHIC_REINHARD) {
tColor = photographicReinhardToneMapping(color.rgb);
}