Finish migrating motion_blur_tile_level & quality to ProjectSettings

Author: HydrogenC

editor/editor_node.cpp

@@ -468,6 +468,10 @@ void EditorNode::_update_from_settings() {
 		scene_root->propagate_notification(Control::NOTIFICATION_LAYOUT_DIRECTION_CHANGED);
 	}
 
+	RS::MotionBlurQuality motion_blur_quality = RS::MotionBlurQuality(int(GLOBAL_GET("rendering/camera/motion_blur/motion_blur_quality")));
+	RS::get_singleton()->camera_attributes_set_motion_blur_quality(motion_blur_quality);
+	RS::MotionBlurTileSize motion_blur_tile_size = RS::MotionBlurTileSize(int(GLOBAL_GET("rendering/camera/motion_blur/motion_blur_tile_size")));
+	RS::get_singleton()->camera_attributes_set_motion_blur_tile_size(motion_blur_tile_size);
 	RS::DOFBokehShape dof_shape = RS::DOFBokehShape(int(GLOBAL_GET("rendering/camera/depth_of_field/depth_of_field_bokeh_shape")));
 	RS::get_singleton()->camera_attributes_set_dof_blur_bokeh_shape(dof_shape);
 	RS::DOFBlurQuality dof_quality = RS::DOFBlurQuality(int(GLOBAL_GET("rendering/camera/depth_of_field/depth_of_field_bokeh_quality")));

scene/resources/camera_attributes.cpp

@@ -159,38 +159,8 @@ bool CameraAttributesPractical::is_motion_blur_enabled() const {
 	return motion_blur_enabled;
 }
 
-void CameraAttributesPractical::set_motion_blur_tile_level(int p_tile_level) {
-	p_tile_level = CLAMP(p_tile_level, RS::MOTION_BLUR_TILE_LEVEL_SMALL, RS::MOTION_BLUR_TILE_LEVEL_EXTRA_LARGE);
-	if (motion_blur_tile_level == p_tile_level) {
-		return;
-	}
-	motion_blur_tile_level = p_tile_level;
-	_update_motion_blur();
-}
-
-int CameraAttributesPractical::get_motion_blur_tile_level() const {
-	return motion_blur_tile_level;
-}
-
-void CameraAttributesPractical::set_motion_blur_quality(int p_quality) {
-	p_quality = CLAMP(p_quality, RS::MOTION_BLUR_QUALITY_LOW, RS::MOTION_BLUR_QUALITY_HIGH);
-	RS::MotionBlurQuality quality = (RS::MotionBlurQuality)p_quality;
-	if (motion_blur_quality == quality) {
-		return;
-	}
-	motion_blur_quality = quality;
-	_update_motion_blur();
-}
-
-int CameraAttributesPractical::get_motion_blur_quality() const {
-	return motion_blur_quality;
-}
-
 void CameraAttributesPractical::set_motion_blur_intensity(float p_intensity) {
 	p_intensity = MAX(0.0f, p_intensity);
-	if (motion_blur_intensity == p_intensity) {
-		return;
-	}
 	motion_blur_intensity = p_intensity;
 	_update_motion_blur();
 }
@@ -200,7 +170,7 @@ float CameraAttributesPractical::get_motion_blur_intensity() const {
 }
 
 void CameraAttributesPractical::set_motion_blur_clamp_velocities_to_tile(bool p_clamp_velocities_to_tile) {
-	if (motion_blur_clamp_velocities_to_tile = p_clamp_velocities_to_tile) {
+	if (motion_blur_clamp_velocities_to_tile == p_clamp_velocities_to_tile) {
 		return;
 	}
 	motion_blur_clamp_velocities_to_tile = p_clamp_velocities_to_tile;
@@ -323,8 +293,6 @@ void CameraAttributesPractical::_update_motion_blur() {
 			get_rid(),
 			motion_blur_enabled,
 			motion_blur_intensity,
-			(RS::MotionBlurTileLevel)motion_blur_tile_level,
-			(RS::MotionBlurQuality)motion_blur_quality,
 			motion_blur_clamp_velocities_to_tile,
 			motion_blur_custom_curve_rid);
 }
@@ -397,10 +365,6 @@ void CameraAttributesPractical::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("is_motion_blur_enabled"), &CameraAttributesPractical::is_motion_blur_enabled);
 	ClassDB::bind_method(D_METHOD("set_motion_blur_intensity", "intensity"), &CameraAttributesPractical::set_motion_blur_intensity);
 	ClassDB::bind_method(D_METHOD("get_motion_blur_intensity"), &CameraAttributesPractical::get_motion_blur_intensity);
-	ClassDB::bind_method(D_METHOD("set_motion_blur_tile_level", "tile_level"), &CameraAttributesPractical::set_motion_blur_tile_level);
-	ClassDB::bind_method(D_METHOD("get_motion_blur_tile_level"), &CameraAttributesPractical::get_motion_blur_tile_level);
-	ClassDB::bind_method(D_METHOD("set_motion_blur_quality", "quality"), &CameraAttributesPractical::set_motion_blur_quality);
-	ClassDB::bind_method(D_METHOD("get_motion_blur_quality"), &CameraAttributesPractical::get_motion_blur_quality);
 	ClassDB::bind_method(D_METHOD("set_motion_blur_clamp_velocities_to_tile", "clamp_velocities_to_tile"), &CameraAttributesPractical::set_motion_blur_clamp_velocities_to_tile);
 	ClassDB::bind_method(D_METHOD("is_motion_blur_clamp_velocities_to_tile"), &CameraAttributesPractical::is_motion_blur_clamp_velocities_to_tile);
 	ClassDB::bind_method(D_METHOD("set_motion_blur_custom_curve", "custom_curve"), &CameraAttributesPractical::set_motion_blur_custom_curve);
@@ -431,9 +395,7 @@ void CameraAttributesPractical::_bind_methods() {
 
 	ADD_GROUP("Motion Blur", "motion_blur_");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "motion_blur_enabled"), "set_motion_blur_enabled", "is_motion_blur_enabled");
-	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "motion_blur_intensity", PROPERTY_HINT_RANGE, "0.0,1.0,0.01,or_greater"), "set_motion_blur_intensity", "get_motion_blur_intensity");
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "motion_blur_tile_level", PROPERTY_HINT_ENUM, "Small,Medium,Large,Extra Large"), "set_motion_blur_tile_level", "get_motion_blur_tile_level");
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "motion_blur_quality", PROPERTY_HINT_ENUM, "Low,Medium,High"), "set_motion_blur_quality", "get_motion_blur_quality");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "motion_blur_intensity", PROPERTY_HINT_RANGE, "0.0,5.0,0.01,or_greater"), "set_motion_blur_intensity", "get_motion_blur_intensity");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "motion_blur_clamp_velocities_to_tile"), "set_motion_blur_clamp_velocities_to_tile", "is_motion_blur_clamp_velocities_to_tile");
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "motion_blur_custom_curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_motion_blur_custom_curve", "get_motion_blur_custom_curve");
 

scene/resources/camera_attributes.h

@@ -80,13 +80,9 @@ class CameraAttributesPractical : public CameraAttributes {
 
 private:
 	// Motion blur
-	int motion_blur_tile_level = 1;
-	int motion_blur_quality = 1;
 	bool motion_blur_enabled = false;
 	float motion_blur_intensity = 1.0;
-	bool motion_blur_jitter_tiles = true;
 	bool motion_blur_clamp_velocities_to_tile = false;
-	bool motion_blur_velocity_depth_test = true;
 	Ref<Curve> motion_blur_custom_curve = Ref<Curve>();
 	RID motion_blur_custom_curve_rid = RID();
 	void _update_motion_blur();
@@ -113,10 +109,6 @@ class CameraAttributesPractical : public CameraAttributes {
 	// Motion blur
 	void set_motion_blur_enabled(bool p_enabled);
 	bool is_motion_blur_enabled() const;
-	void set_motion_blur_tile_level(int p_tile_level);
-	int get_motion_blur_tile_level() const;
-	void set_motion_blur_quality(int p_quality);
-	int get_motion_blur_quality() const;
 	void set_motion_blur_intensity(float p_intensity);
 	float get_motion_blur_intensity() const;
 	void set_motion_blur_clamp_velocities_to_tile(bool p_clamp_velocities_to_tile);

servers/rendering/renderer_rd/effects/motion_blur.cpp

@@ -239,21 +239,21 @@ void RendererRD::MotionBlur::recreate_pipelines() {
 
 void RendererRD::MotionBlur::motion_blur_compute(Ref<RenderSceneBuffersRD> p_render_buffers, RID p_camera_attributes, RenderSceneDataRD *p_scene_data, bool transparent_bg, CopyEffects *p_copy_effects) {
 	int new_tile_size;
-	switch (RSG::camera_attributes->camera_attributes_get_motion_blur_tile_level(p_camera_attributes)) {
-		case RS::MOTION_BLUR_TILE_LEVEL_SMALL:
+	switch (RSG::camera_attributes->camera_attributes_get_motion_blur_tile_size()) {
+		case RS::MOTION_BLUR_TILE_SIZE_SMALL:
 			new_tile_size = 20;
 			break;
-		case RS::MOTION_BLUR_TILE_LEVEL_MEDIUM:
+		case RS::MOTION_BLUR_TILE_SIZE_MEDIUM:
 			new_tile_size = 40;
 			break;
-		case RS::MOTION_BLUR_TILE_LEVEL_LARGE:
+		case RS::MOTION_BLUR_TILE_SIZE_LARGE:
 			new_tile_size = 60;
 			break;
-		case RS::MOTION_BLUR_TILE_LEVEL_EXTRA_LARGE:
+		case RS::MOTION_BLUR_TILE_SIZE_EXTRA_LARGE:
 			new_tile_size = 80;
 			break;
 		default:
-			WARN_PRINT_ONCE("Unknown motion blur tile level.");
+			WARN_PRINT_ONCE("Unknown motion blur tile size.");
 			new_tile_size = 40;
 			break;
 	}
@@ -287,7 +287,7 @@ void RendererRD::MotionBlur::motion_blur_compute(Ref<RenderSceneBuffersRD> p_ren
 		// Framerate independent
 		intensity *= p_scene_data->time_step / (1.f / 30);
 		int sample_count;
-		switch (RSG::camera_attributes->camera_attributes_get_motion_blur_quality(p_camera_attributes)) {
+		switch (RSG::camera_attributes->camera_attributes_get_motion_blur_quality()) {
 			case RenderingServer::MOTION_BLUR_QUALITY_LOW:
 				sample_count = 4;
 				break;

servers/rendering/renderer_rd/renderer_scene_render_rd.cpp

@@ -1713,6 +1713,9 @@ void RendererSceneRenderRD::init() {
 		RendererRD::Fog::get_singleton()->init_fog_shader(RendererRD::LightStorage::get_singleton()->get_max_directional_lights(), get_roughness_layers(), is_using_radiance_octmap_array());
 	}
 
+	RSG::camera_attributes->camera_attributes_set_motion_blur_quality(RS::MotionBlurQuality(int(GLOBAL_GET("rendering/camera/motion_blur/motion_blur_quality"))));
+	RSG::camera_attributes->camera_attributes_set_motion_blur_tile_size(RS::MotionBlurTileSize(int(GLOBAL_GET("rendering/camera/motion_blur/motion_blur_tile_size"))));
+
 	RSG::camera_attributes->camera_attributes_set_dof_blur_bokeh_shape(RS::DOFBokehShape(int(GLOBAL_GET("rendering/camera/depth_of_field/depth_of_field_bokeh_shape"))));
 	RSG::camera_attributes->camera_attributes_set_dof_blur_quality(RS::DOFBlurQuality(int(GLOBAL_GET("rendering/camera/depth_of_field/depth_of_field_bokeh_quality"))), GLOBAL_GET("rendering/camera/depth_of_field/depth_of_field_use_jitter"));
 	use_physical_light_units = GLOBAL_GET("rendering/lights_and_shadows/use_physical_light_units");

servers/rendering/rendering_server.cpp

@@ -3217,12 +3217,12 @@ void RenderingServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("camera_attributes_set_dof_blur_quality", "quality", "use_jitter"), &RenderingServer::camera_attributes_set_dof_blur_quality);
 	ClassDB::bind_method(D_METHOD("camera_attributes_set_dof_blur_bokeh_shape", "shape"), &RenderingServer::camera_attributes_set_dof_blur_bokeh_shape);
 	ClassDB::bind_method(D_METHOD("camera_attributes_set_motion_blur_quality", "quality"), &RenderingServer::camera_attributes_set_motion_blur_quality);
-	ClassDB::bind_method(D_METHOD("camera_attributes_set_motion_blur_tile_level", "tile_level"), &RenderingServer::camera_attributes_set_motion_blur_tile_level);
+	ClassDB::bind_method(D_METHOD("camera_attributes_set_motion_blur_tile_size", "tile_size"), &RenderingServer::camera_attributes_set_motion_blur_tile_size);
 
 	ClassDB::bind_method(D_METHOD("camera_attributes_set_dof_blur", "camera_attributes", "far_enable", "far_distance", "far_transition", "near_enable", "near_distance", "near_transition", "amount"), &RenderingServer::camera_attributes_set_dof_blur);
 	ClassDB::bind_method(D_METHOD("camera_attributes_set_exposure", "camera_attributes", "multiplier", "normalization"), &RenderingServer::camera_attributes_set_exposure);
 	ClassDB::bind_method(D_METHOD("camera_attributes_set_auto_exposure", "camera_attributes", "enable", "min_sensitivity", "max_sensitivity", "speed", "scale"), &RenderingServer::camera_attributes_set_auto_exposure);
-	ClassDB::bind_method(D_METHOD("camera_attributes_set_motion_blur", "camera_attributes", "enabled", "intensity", "tile_level", "quality", "clamp_velocities_to_tile", "custom_curve"), &RenderingServer::camera_attributes_set_motion_blur);
+	ClassDB::bind_method(D_METHOD("camera_attributes_set_motion_blur", "camera_attributes", "enabled", "intensity", "clamp_velocities_to_tile", "custom_curve"), &RenderingServer::camera_attributes_set_motion_blur);
 
 	BIND_ENUM_CONSTANT(DOF_BOKEH_BOX);
 	BIND_ENUM_CONSTANT(DOF_BOKEH_HEXAGON);
@@ -3237,10 +3237,10 @@ void RenderingServer::_bind_methods() {
 	BIND_ENUM_CONSTANT(MOTION_BLUR_QUALITY_MEDIUM);
 	BIND_ENUM_CONSTANT(MOTION_BLUR_QUALITY_HIGH);
 
-	BIND_ENUM_CONSTANT(MOTION_BLUR_TILE_LEVEL_SMALL);
-	BIND_ENUM_CONSTANT(MOTION_BLUR_TILE_LEVEL_MEDIUM);
-	BIND_ENUM_CONSTANT(MOTION_BLUR_TILE_LEVEL_LARGE);
-	BIND_ENUM_CONSTANT(MOTION_BLUR_TILE_LEVEL_EXTRA_LARGE);
+	BIND_ENUM_CONSTANT(MOTION_BLUR_TILE_SIZE_SMALL);
+	BIND_ENUM_CONSTANT(MOTION_BLUR_TILE_SIZE_MEDIUM);
+	BIND_ENUM_CONSTANT(MOTION_BLUR_TILE_SIZE_LARGE);
+	BIND_ENUM_CONSTANT(MOTION_BLUR_TILE_SIZE_EXTRA_LARGE);
 
 	/* SCENARIO */
 
@@ -3761,6 +3761,9 @@ void RenderingServer::init() {
 	GLOBAL_DEF_RST("rendering/textures/default_filters/use_nearest_mipmap_filter", false);
 	GLOBAL_DEF(PropertyInfo(Variant::INT, "rendering/textures/default_filters/anisotropic_filtering_level", PROPERTY_HINT_ENUM, String::utf8("Disabled (Fastest),2× (Faster),4× (Fast),8× (Average),16× (Slow)")), 2);
 
+	GLOBAL_DEF(PropertyInfo(Variant::INT, "rendering/camera/motion_blur/motion_blur_tile_size", PROPERTY_HINT_ENUM, "Small,Medium,Large,Extra Large"), 1);
+	GLOBAL_DEF(PropertyInfo(Variant::INT, "rendering/camera/motion_blur/motion_blur_quality", PROPERTY_HINT_ENUM, "Low (Fast),Medium (Average),High (Slow)"), 1);
+
 	GLOBAL_DEF(PropertyInfo(Variant::INT, "rendering/camera/depth_of_field/depth_of_field_bokeh_shape", PROPERTY_HINT_ENUM, "Box (Fast),Hexagon (Average),Circle (Slowest)"), 1);
 	GLOBAL_DEF(PropertyInfo(Variant::INT, "rendering/camera/depth_of_field/depth_of_field_bokeh_quality", PROPERTY_HINT_ENUM, "Very Low (Fastest),Low (Fast),Medium (Average),High (Slow)"), 1);
 	GLOBAL_DEF("rendering/camera/depth_of_field/depth_of_field_use_jitter", false);

servers/rendering/rendering_server.h

@@ -1404,17 +1404,17 @@ class RenderingServer : public Object {
 		MOTION_BLUR_QUALITY_HIGH,
 	};
 
-	enum MotionBlurTileLevel {
-		MOTION_BLUR_TILE_LEVEL_SMALL,
-		MOTION_BLUR_TILE_LEVEL_MEDIUM,
-		MOTION_BLUR_TILE_LEVEL_LARGE,
-		MOTION_BLUR_TILE_LEVEL_EXTRA_LARGE,
+	enum MotionBlurTileSize {
+		MOTION_BLUR_TILE_SIZE_SMALL,
+		MOTION_BLUR_TILE_SIZE_MEDIUM,
+		MOTION_BLUR_TILE_SIZE_LARGE,
+		MOTION_BLUR_TILE_SIZE_EXTRA_LARGE,
 	};
 
-	virtual void camera_attributes_set_motion_blur(RID p_camera_attributes, bool p_enable, float p_intensity, MotionBlurTileLevel p_tile_level, MotionBlurQuality p_quality, bool p_clamp_velocities_to_tile, RID p_custom_curve) = 0;
+	virtual void camera_attributes_set_motion_blur(RID p_camera_attributes, bool p_enable, float p_intensity, bool p_clamp_velocities_to_tile, RID p_custom_curve) = 0;
 
-	virtual void camera_attributes_set_motion_blur_quality(MotionBlurQuality p_quality);
-	virtual void camera_attributes_set_motion_blur_tile_level(MotionBlurTileLevel p_tile_level);
+	virtual void camera_attributes_set_motion_blur_quality(MotionBlurQuality p_quality) = 0;
+	virtual void camera_attributes_set_motion_blur_tile_size(MotionBlurTileSize p_tile_size) = 0;
 
 	enum DOFBlurQuality {
 		DOF_BLUR_QUALITY_VERY_LOW,
@@ -2023,7 +2023,7 @@ VARIANT_ENUM_CAST(RenderingServer::EnvironmentSDFGIFramesToUpdateLight);
 VARIANT_ENUM_CAST(RenderingServer::EnvironmentSDFGIYScale);
 VARIANT_ENUM_CAST(RenderingServer::SubSurfaceScatteringQuality);
 VARIANT_ENUM_CAST(RenderingServer::MotionBlurQuality);
-VARIANT_ENUM_CAST(RenderingServer::MotionBlurTileLevel);
+VARIANT_ENUM_CAST(RenderingServer::MotionBlurTileSize);
 VARIANT_ENUM_CAST(RenderingServer::DOFBlurQuality);
 VARIANT_ENUM_CAST(RenderingServer::DOFBokehShape);
 VARIANT_ENUM_CAST(RenderingServer::ShadowQuality);

servers/rendering/rendering_server_default.h

@@ -871,7 +871,10 @@ class RenderingServerDefault : public RenderingServer {
 
 	FUNCRIDSPLIT(camera_attributes)
 
-	FUNC7(camera_attributes_set_motion_blur, RID, bool, float, MotionBlurTileLevel, MotionBlurQuality, bool, RID)
+	FUNC1(camera_attributes_set_motion_blur_quality, MotionBlurQuality)
+	FUNC1(camera_attributes_set_motion_blur_tile_size, MotionBlurTileSize)
+
+	FUNC5(camera_attributes_set_motion_blur, RID, bool, float, bool, RID)
 
 	FUNC2(camera_attributes_set_dof_blur_quality, DOFBlurQuality, bool)
 	FUNC1(camera_attributes_set_dof_blur_bokeh_shape, DOFBokehShape)

servers/rendering/storage/camera_attributes_storage.cpp

@@ -53,7 +53,15 @@ void RendererCameraAttributes::camera_attributes_free(RID p_rid) {
 	camera_attributes_owner.free(p_rid);
 }
 
-void RendererCameraAttributes::camera_attributes_set_motion_blur(RID p_camera_attributes, bool p_enable, float p_intensity, RS::MotionBlurTileLevel p_tile_level, RS::MotionBlurQuality p_quality, bool p_clamp_velocities_to_tile, RID p_custom_curve) {
+void RendererCameraAttributes::camera_attributes_set_motion_blur_quality(RenderingServer::MotionBlurQuality p_quality) {
+	motion_blur_quality = p_quality;
+}
+
+void RendererCameraAttributes::camera_attributes_set_motion_blur_tile_size(RenderingServer::MotionBlurTileSize p_tile_size) {
+	motion_blur_tile_size = p_tile_size;
+}
+
+void RendererCameraAttributes::camera_attributes_set_motion_blur(RID p_camera_attributes, bool p_enable, float p_intensity, bool p_clamp_velocities_to_tile, RID p_custom_curve) {
 	CameraAttributes *cam_attributes = camera_attributes_owner.get_or_null(p_camera_attributes);
 	ERR_FAIL_NULL(cam_attributes);
 #ifdef DEBUG_ENABLED
@@ -63,8 +71,6 @@ void RendererCameraAttributes::camera_attributes_set_motion_blur(RID p_camera_at
 #endif
 	cam_attributes->motion_blur_enabled = p_enable;
 	cam_attributes->motion_blur_intensity = p_intensity;
-	cam_attributes->motion_blur_tile_level = p_tile_level;
-	cam_attributes->motion_blur_quality = p_quality;
 	cam_attributes->motion_blur_custom_curve = p_custom_curve;
 	cam_attributes->motion_blur_clamp_velocities_to_tile = p_clamp_velocities_to_tile;
 }
@@ -75,18 +81,6 @@ float RendererCameraAttributes::camera_attributes_get_motion_blur_intensity(RID
 	return cam_attributes->motion_blur_intensity;
 }
 
-RS::MotionBlurTileLevel RendererCameraAttributes::camera_attributes_get_motion_blur_tile_level(RID p_camera_attributes) {
-	CameraAttributes *cam_attributes = camera_attributes_owner.get_or_null(p_camera_attributes);
-	ERR_FAIL_NULL_V(cam_attributes, RenderingServer::MOTION_BLUR_TILE_LEVEL_MEDIUM);
-	return cam_attributes->motion_blur_tile_level;
-}
-
-RS::MotionBlurQuality RendererCameraAttributes::camera_attributes_get_motion_blur_quality(RID p_camera_attributes) {
-	CameraAttributes *cam_attributes = camera_attributes_owner.get_or_null(p_camera_attributes);
-	ERR_FAIL_NULL_V(cam_attributes, RenderingServer::MOTION_BLUR_QUALITY_MEDIUM);
-	return cam_attributes->motion_blur_quality;
-}
-
 bool RendererCameraAttributes::camera_attributes_get_motion_blur_clamp_velocities_to_tile(RID p_camera_attributes) {
 	CameraAttributes *cam_attributes = camera_attributes_owner.get_or_null(p_camera_attributes);
 	ERR_FAIL_NULL_V(cam_attributes, false);