basic screen space effects

Author: malytomas

sources/include/cage-engine/sceneScreenSpaceEffects.h

@@ -10,20 +10,18 @@ namespace cage
 		None = 0,
 		AmbientOcclusion = 1 << 0,
 		DepthOfField = 1 << 1,
-		Bloom = 1 << 3,
-		EyeAdaptation = 1 << 4,
-		ToneMapping = 1 << 5,
-		GammaCorrection = 1 << 6,
-		AntiAliasing = 1 << 7,
-		Sharpening = 1 << 8,
+		Bloom = 1 << 2,
+		ToneMapping = 1 << 3,
+		GammaCorrection = 1 << 4,
+		AntiAliasing = 1 << 5,
+		Sharpening = 1 << 6,
 		Default = AmbientOcclusion | Bloom | ToneMapping | GammaCorrection | AntiAliasing,
 	};
 
 	struct CAGE_ENGINE_API ScreenSpaceEffectsComponent
 	{
 		ScreenSpaceAmbientOcclusion ssao;
 		ScreenSpaceBloom bloom;
-		ScreenSpaceEyeAdaptation eyeAdaptation;
 		ScreenSpaceDepthOfField depthOfField;
 		ScreenSpaceSharpening sharpening;
 		Real gamma = 2.2;

sources/include/cage-engine/screenSpaceEffects.h

@@ -1,85 +1,68 @@
 #ifndef guard_screenSpaceEffects_h_xcfvh241448960sdrt
 #define guard_screenSpaceEffects_h_xcfvh241448960sdrt
 
-/*
-
-#include <cage-engine/provisionalHandles.h>
 #include <cage-engine/screenSpaceEffectsProperties.h>
 
 namespace cage
 {
-	class RenderQueue;
-	class AssetsManager;
-	class ProvisionalGraphics;
+	class GraphicsEncoder;
+	class Texture;
 
 	struct CAGE_ENGINE_API ScreenSpaceCommonConfig
 	{
-		RenderQueue *queue = nullptr;
+		GraphicsEncoder *encoder = nullptr;
 		AssetsManager *assets = nullptr;
-		ProvisionalGraphics *provisionals = nullptr;
 		Vec2i resolution;
 	};
 
 	struct CAGE_ENGINE_API ScreenSpaceAmbientOcclusionConfig : public ScreenSpaceCommonConfig, public ScreenSpaceAmbientOcclusion
 	{
 		Mat4 proj;
-		TextureHandle inDepth;
-		mutable TextureHandle outAo;
+		Texture *inDepth = nullptr;
+		Texture *outAo = nullptr;
 		uint32 frameIndex = 0;
 	};
 
 	struct CAGE_ENGINE_API ScreenSpaceDepthOfFieldConfig : public ScreenSpaceCommonConfig, public ScreenSpaceDepthOfField
 	{
 		Mat4 proj;
-		TextureHandle inDepth;
-		TextureHandle inColor;
-		TextureHandle outColor;
-	};
-
-	struct CAGE_ENGINE_API ScreenSpaceEyeAdaptationConfig : public ScreenSpaceCommonConfig, public ScreenSpaceEyeAdaptation
-	{
-		String cameraId; // for synchronizing data across frames
-		TextureHandle inColor; // used in both passes
-		TextureHandle outColor; // used in the apply pass only
-		Real elapsedTime = 1.0 / 60;
+		Texture *inDepth = nullptr;
+		Texture *inColor = nullptr;
+		Texture *outColor = nullptr;
 	};
 
 	struct CAGE_ENGINE_API ScreenSpaceBloomConfig : public ScreenSpaceCommonConfig, public ScreenSpaceBloom
 	{
-		TextureHandle inColor;
-		TextureHandle outColor;
+		Texture *inColor = nullptr;
+		Texture *outColor = nullptr;
 	};
 
 	struct CAGE_ENGINE_API ScreenSpaceTonemapConfig : public ScreenSpaceCommonConfig
 	{
-		TextureHandle inColor;
-		TextureHandle outColor;
+		Texture *inColor = nullptr;
+		Texture *outColor = nullptr;
 		Real gamma = 2.2;
 		bool tonemapEnabled = true;
 	};
 
 	struct CAGE_ENGINE_API ScreenSpaceFastApproximateAntiAliasingConfig : public ScreenSpaceCommonConfig
 	{
-		TextureHandle inColor;
-		TextureHandle outColor;
+		Texture *inColor = nullptr;
+		Texture *outColor = nullptr;
 	};
 
 	struct CAGE_ENGINE_API ScreenSpaceSharpeningConfig : public ScreenSpaceCommonConfig, public ScreenSpaceSharpening
 	{
-		TextureHandle inColor;
-		TextureHandle outColor;
+		Texture *inColor = nullptr;
+		Texture *outColor = nullptr;
 	};
 
 	CAGE_ENGINE_API void screenSpaceAmbientOcclusion(const ScreenSpaceAmbientOcclusionConfig &config);
 	CAGE_ENGINE_API void screenSpaceDepthOfField(const ScreenSpaceDepthOfFieldConfig &config);
-	CAGE_ENGINE_API void screenSpaceEyeAdaptationPrepare(const ScreenSpaceEyeAdaptationConfig &config);
 	CAGE_ENGINE_API void screenSpaceBloom(const ScreenSpaceBloomConfig &config);
-	CAGE_ENGINE_API void screenSpaceEyeAdaptationApply(const ScreenSpaceEyeAdaptationConfig &config);
 	CAGE_ENGINE_API void screenSpaceTonemap(const ScreenSpaceTonemapConfig &config);
 	CAGE_ENGINE_API void screenSpaceFastApproximateAntiAliasing(const ScreenSpaceFastApproximateAntiAliasingConfig &config);
 	CAGE_ENGINE_API void screenSpaceSharpening(const ScreenSpaceSharpeningConfig &config);
 }
 
-*/
-
 #endif // guard_screenSpaceEffects_h_xcfvh241448960sdrt

sources/include/cage-engine/screenSpaceEffectsProperties.h

@@ -27,19 +27,6 @@ namespace cage
 		uint32 blurPasses = 3;
 	};
 
-	struct CAGE_ENGINE_API ScreenSpaceEyeAdaptation
-	{
-		Real darkerSpeed = 1;
-		Real lighterSpeed = 2;
-		Real lowLogLum = -12;
-		Real highLogLum = 2;
-		Real nightOffset = 3;
-		Real nightDesaturate = 0.2;
-		Real nightContrast = 0.01;
-		Real key = 0.1; // target gray
-		Real strength = 0.8; // whole effect factor
-	};
-
 	struct CAGE_ENGINE_API ScreenSpaceBloom
 	{
 		uint32 blurPasses = 5;

sources/libengine/graphics/encoder.cpp

@@ -128,7 +128,8 @@ namespace cage
 			{
 				wgpu::ColorTargetState cts = {};
 				cts.format = ct.texture->nativeTexture().GetFormat();
-				cts.blend = &blendState;
+				if (config.blending != BlendingEnum::None)
+					cts.blend = &blendState;
 				colors.push_back(cts);
 			}