Use tone mapping module in projects reducing code, add normalizing

Signed-off-by: Tobias Frisch <tfrisch@uni-koblenz.de>

modules/tone_mapping/include/vkcv/tone/ACESToneMapping.hpp

@@ -9,7 +9,7 @@ namespace vkcv::tone {
 		void initToneMapping() override;
 		
 	public:
-		explicit ACESToneMapping(Core& core);
+		explicit ACESToneMapping(Core& core, bool normalize = false);
 		
 	};
 	

modules/tone_mapping/include/vkcv/tone/FilmicToneMapping.hpp

@@ -9,7 +9,7 @@ namespace vkcv::tone {
 		void initToneMapping() override;
 	
 	public:
-		explicit FilmicToneMapping(Core& core);
+		explicit FilmicToneMapping(Core& core, bool normalize = false);
 		
 	};
 	

modules/tone_mapping/include/vkcv/tone/LottesToneMapping.hpp

@@ -9,7 +9,7 @@ namespace vkcv::tone {
 		void initToneMapping() override;
 	
 	public:
-		explicit LottesToneMapping(Core& core);
+		explicit LottesToneMapping(Core& core, bool normalize = false);
 		
 	};
 	

modules/tone_mapping/include/vkcv/tone/Reinhard2ToneMapping.hpp

@@ -9,7 +9,7 @@ namespace vkcv::tone {
 		void initToneMapping() override;
 	
 	public:
-		explicit Reinhard2ToneMapping(Core& core);
+		explicit Reinhard2ToneMapping(Core& core, bool normalize = false);
 		
 	};
 	

modules/tone_mapping/include/vkcv/tone/ReinhardToneMapping.hpp

@@ -9,7 +9,7 @@ namespace vkcv::tone {
 		void initToneMapping() override;
 	
 	public:
-		explicit ReinhardToneMapping(Core& core);
+		explicit ReinhardToneMapping(Core& core, bool normalize = false);
 		
 	};
 	

modules/tone_mapping/include/vkcv/tone/ToneMapping.hpp

@@ -12,6 +12,7 @@ namespace vkcv::tone {
 		Core& m_core;
 		
 		std::string m_name;
+		bool m_normalize;
 		
 		ComputePipelineHandle m_pipeline;
 		
@@ -40,8 +41,11 @@ namespace vkcv::tone {
          *
          * @param[in,out] core Reference to a Core instance
          * @param[in] name Name of the tone mapping function
+         * @param[in] normalize Normalize color values
          */
-		explicit ToneMapping(Core& core, const std::string& name);
+		explicit ToneMapping(Core& core,
+							 const std::string& name,
+							 bool normalize = false);
 	
 		~ToneMapping() = default;
 		

modules/tone_mapping/include/vkcv/tone/UchimuraToneMapping.hpp

@@ -9,7 +9,7 @@ namespace vkcv::tone {
 		void initToneMapping() override;
 	
 	public:
-		explicit UchimuraToneMapping(Core& core);
+		explicit UchimuraToneMapping(Core& core, bool normalize = false);
 		
 	};
 	

modules/tone_mapping/include/vkcv/tone/Uncharted2ToneMapping.hpp

@@ -9,7 +9,7 @@ namespace vkcv::tone {
 		void initToneMapping() override;
 	
 	public:
-		explicit Uncharted2ToneMapping(Core& core);
+		explicit Uncharted2ToneMapping(Core& core, bool normalize = false);
 		
 	};
 	

modules/tone_mapping/include/vkcv/tone/UnrealToneMapping.hpp

@@ -9,7 +9,7 @@ namespace vkcv::tone {
 		void initToneMapping() override;
 	
 	public:
-		explicit UnrealToneMapping(Core& core);
+		explicit UnrealToneMapping(Core& core, bool normalize = false);
 		
 	};
 	

modules/tone_mapping/src/vkcv/tone/ACESToneMapping.cpp

@@ -9,7 +9,8 @@ namespace vkcv::tone {
 		buildComputePipeline("aces", ACES_GLSL_SHADER);
 	}
 	
-	ACESToneMapping::ACESToneMapping(Core &core) : ToneMapping(core, "ACES Tone Mapping") {
+	ACESToneMapping::ACESToneMapping(Core &core, bool normalize)
+	: ToneMapping(core, "ACES Tone Mapping", normalize) {
 		initToneMapping();
 	}
 	

modules/tone_mapping/src/vkcv/tone/FilmicToneMapping.cpp

@@ -9,7 +9,8 @@ namespace vkcv::tone {
 		buildComputePipeline("filmic", FILMIC_GLSL_SHADER);
 	}
 	
-	FilmicToneMapping::FilmicToneMapping(Core &core) : ToneMapping(core, "Filmic Tone Mapping") {
+	FilmicToneMapping::FilmicToneMapping(Core &core, bool normalize)
+	: ToneMapping(core, "Filmic Tone Mapping", normalize) {
 		initToneMapping();
 	}
 

modules/tone_mapping/src/vkcv/tone/LottesToneMapping.cpp

@@ -9,7 +9,8 @@ namespace vkcv::tone {
 		buildComputePipeline("lottes", LOTTES_GLSL_SHADER);
 	}
 	
-	LottesToneMapping::LottesToneMapping(Core &core) : ToneMapping(core, "Lottes Tone Mapping") {
+	LottesToneMapping::LottesToneMapping(Core &core, bool normalize)
+	: ToneMapping(core, "Lottes Tone Mapping", normalize) {
 		initToneMapping();
 	}
 

modules/tone_mapping/src/vkcv/tone/Reinhard2ToneMapping.cpp

@@ -9,7 +9,8 @@ namespace vkcv::tone {
 		buildComputePipeline("reinhard2", REINHARD2_GLSL_SHADER);
 	}
 	
-	Reinhard2ToneMapping::Reinhard2ToneMapping(Core &core) : ToneMapping(core, "Reinhard2 Tone Mapping") {
+	Reinhard2ToneMapping::Reinhard2ToneMapping(Core &core, bool normalize)
+	: ToneMapping(core, "Reinhard2 Tone Mapping", normalize) {
 		initToneMapping();
 	}
 

modules/tone_mapping/src/vkcv/tone/ReinhardToneMapping.cpp

@@ -9,7 +9,8 @@ namespace vkcv::tone {
 		buildComputePipeline("reinhard", REINHARD_GLSL_SHADER);
 	}
 	
-	ReinhardToneMapping::ReinhardToneMapping(Core &core) : ToneMapping(core, "Reinhard Tone Mapping") {
+	ReinhardToneMapping::ReinhardToneMapping(Core &core, bool normalize)
+	: ToneMapping(core, "Reinhard Tone Mapping", normalize) {
 		initToneMapping();
 	}
 

modules/tone_mapping/src/vkcv/tone/ToneMapping.cpp

@@ -53,9 +53,14 @@ namespace vkcv::tone {
 		stream << "    return;" << std::endl;
 		stream << "  }" << std::endl;
 		stream << "  ivec2 uv = ivec2(gl_GlobalInvocationID.xy);" << std::endl;
-		stream << "  vec3 color = imageLoad(inImage, uv).xyz;" << std::endl;
-		stream << "  color = " << functionName << "(color);" << std::endl;
-		stream << "  imageStore(outImage, uv, vec4(color, 0.f));" << std::endl;
+		stream << "  vec4 color = imageLoad(inImage, uv);" << std::endl;
+		
+		if (m_normalize) {
+			stream << "  color /= color.w;" << std::endl;
+		}
+		
+		stream << "  color = vec4(" << functionName << "(color.xyz), color.w);" << std::endl;
+		stream << "  imageStore(outImage, uv, color);" << std::endl;
 		stream << "}" << std::endl;
 		
 		compiler.compileSource(
@@ -88,8 +93,15 @@ namespace vkcv::tone {
 		});
 	}
 	
-	ToneMapping::ToneMapping(Core &core, const std::string &name)
-	: m_core(core), m_name(name), m_pipeline(), m_descriptorSetLayout(), m_descriptorSet() {}
+	ToneMapping::ToneMapping(Core &core,
+							 const std::string &name,
+							 bool normalize)
+	: m_core(core),
+	  m_name(name),
+	  m_normalize(normalize),
+	  m_pipeline(),
+	  m_descriptorSetLayout(),
+	  m_descriptorSet() {}
 	
 	const std::string &ToneMapping::getName() const {
 		return m_name;

modules/tone_mapping/src/vkcv/tone/UchimuraToneMapping.cpp

@@ -9,7 +9,8 @@ namespace vkcv::tone {
 		buildComputePipeline("uchimura", UCHIMURA_GLSL_SHADER);
 	}
 	
-	UchimuraToneMapping::UchimuraToneMapping(Core &core) : ToneMapping(core, "Uchimura Tone Mapping") {
+	UchimuraToneMapping::UchimuraToneMapping(Core &core, bool normalize)
+	: ToneMapping(core, "Uchimura Tone Mapping", normalize) {
 		initToneMapping();
 	}
 

modules/tone_mapping/src/vkcv/tone/Uncharted2ToneMapping.cpp

@@ -9,7 +9,8 @@ namespace vkcv::tone {
 		buildComputePipeline("uncharted2", UNCHARTED2_GLSL_SHADER);
 	}
 	
-	Uncharted2ToneMapping::Uncharted2ToneMapping(Core &core) : ToneMapping(core, "Uncharted2 Tone Mapping") {
+	Uncharted2ToneMapping::Uncharted2ToneMapping(Core &core, bool normalize)
+	: ToneMapping(core, "Uncharted2 Tone Mapping", normalize) {
 		initToneMapping();
 	}
 

modules/tone_mapping/src/vkcv/tone/UnrealToneMapping.cpp

@@ -9,7 +9,8 @@ namespace vkcv::tone {
 		buildComputePipeline("unreal", UNREAL_GLSL_SHADER);
 	}
 	
-	UnrealToneMapping::UnrealToneMapping(Core &core) : ToneMapping(core, "Unreal Tone Mapping") {
+	UnrealToneMapping::UnrealToneMapping(Core &core, bool normalize)
+	: ToneMapping(core, "Unreal Tone Mapping", normalize) {
 		initToneMapping();
 	}
 

projects/particle_simulation/CMakeLists.txt

@@ -19,6 +19,7 @@ target_include_directories(particle_simulation SYSTEM BEFORE PRIVATE
 		${vkcv_includes}
 		${vkcv_camera_include}
 		${vkcv_shader_compiler_include}
+		${vkcv_tone_mapping_include}
 		${vkcv_effects_include})
 
 # linking with libraries from all dependencies and the VkCV framework
@@ -26,4 +27,5 @@ target_link_libraries(particle_simulation
 		vkcv
 		vkcv_camera
 		vkcv_shader_compiler
+		vkcv_tone_mapping
 		vkcv_effects)

projects/particle_simulation/shaders/tonemapping.comp

-#version 440
-
-layout(set=0, binding=0, rgba16f)   uniform image2D inImage;
-layout(set=0, binding=1, rgba8)     uniform image2D outImage;
-
-
-layout(local_size_x = 8, local_size_y = 8, local_size_z = 1) in;
-
-void main(){
-
-    if(any(greaterThanEqual(gl_GlobalInvocationID.xy, imageSize(inImage)))){
-        return;
-    }
-    ivec2 uv            = ivec2(gl_GlobalInvocationID.xy);
-    vec3 linearColor    = imageLoad(inImage, uv).rgb;
-    vec3 tonemapped     = linearColor / (dot(linearColor, vec3(0.21, 0.71, 0.08)) + 1); // reinhard tonemapping
-    vec3 gammaCorrected = pow(tonemapped, vec3(1.f / 2.2f));
-    imageStore(outImage, uv, vec4(gammaCorrected, 0.f));
-}
\ No newline at end of file