feat(draw): make the motion blur amount adjustable

yvt · Jan 16, 2021 · 4da14fc · 4da14fc
1 parent 6b54ce0
commit 4da14fc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/Sources/Draw/GLCameraBlurFilter.cpp b/Sources/Draw/GLCameraBlurFilter.cpp
@@ -56,7 +56,8 @@ namespace spades {
 				return acosf(v);
 		}
 
-		GLColorBuffer GLCameraBlurFilter::Filter(GLColorBuffer input, float radialBlur) {
+		GLColorBuffer GLCameraBlurFilter::Filter(GLColorBuffer input, float intensity,
+		                                         float radialBlur) {
 			SPADES_MARK_FUNCTION();
 
 			if (radialBlur > 0.f)
@@ -114,7 +115,7 @@ namespace spades {
 			}
 
 			float movePixels = MyACos(diffMatrix.m[0]);
-			float shutterTimeScale = .3f;
+			float shutterTimeScale = intensity;
 			movePixels = std::max(movePixels, MyACos(diffMatrix.m[5]));
 			movePixels = std::max(movePixels, MyACos(diffMatrix.m[10]));
 			movePixels = tanf(movePixels) / tanf(def.fovX * .5f);

diff --git a/Sources/Draw/GLCameraBlurFilter.h b/Sources/Draw/GLCameraBlurFilter.h
@@ -34,7 +34,7 @@ namespace spades {
 
 		public:
 			GLCameraBlurFilter(GLRenderer *);
-			GLColorBuffer Filter(GLColorBuffer, float radialBlur = 0.f);
+			GLColorBuffer Filter(GLColorBuffer, float intensity, float radialBlur = 0.f);
 		};
 	}
 }
diff --git a/Sources/Draw/GLRenderer.cpp b/Sources/Draw/GLRenderer.cpp
@@ -940,9 +940,14 @@ namespace spades {
 				}
 
 				if (settings.r_cameraBlur && !sceneDef.denyCameraBlur) {
+					if (!cameraBlur) {
+						cameraBlur = new GLCameraBlurFilter(this);
+					}
+
 					GLProfiler::Context p(*profiler, "Camera Blur");
 					// FIXME: better (correctly constructed) radial blur algorithm
-					handle = cameraBlur->Filter(handle, sceneDef.radialBlur);
+					handle = cameraBlur->Filter(
+					  handle, std::min(settings.r_cameraBlur * 0.2f, 1.0f), sceneDef.radialBlur);
 				}
 
 				if (settings.r_bloom) {

diff --git a/Sources/Draw/GLSettings.h b/Sources/Draw/GLSettings.h
@@ -29,7 +29,7 @@ namespace spades {
 
 			TypedItemHandle<bool> r_blitFramebuffer     { *this, "r_blitFramebuffer" };
 			TypedItemHandle<bool> r_bloom               { *this, "r_bloom" };
-			TypedItemHandle<bool> r_cameraBlur          { *this, "r_cameraBlur", ItemFlags::Latch };
+			TypedItemHandle<float> r_cameraBlur         { *this, "r_cameraBlur" };
 			TypedItemHandle<bool> r_colorCorrection     { *this, "r_colorCorrection" };
 			TypedItemHandle<bool> r_debugTiming         { *this, "r_debugTiming" };
 			TypedItemHandle<bool> r_debugTimingOutputScreen { *this, "r_debugTimingOutputScreen" };