diff options
Diffstat (limited to 'servers/rendering/storage/camera_attributes_storage.cpp')
| -rw-r--r-- | servers/rendering/storage/camera_attributes_storage.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/servers/rendering/storage/camera_attributes_storage.cpp b/servers/rendering/storage/camera_attributes_storage.cpp index d7f438a68c..2fece3ce0f 100644 --- a/servers/rendering/storage/camera_attributes_storage.cpp +++ b/servers/rendering/storage/camera_attributes_storage.cpp @@ -64,7 +64,7 @@ void RendererCameraAttributes::camera_attributes_set_dof_blur_bokeh_shape(RS::DO void RendererCameraAttributes::camera_attributes_set_dof_blur(RID p_camera_attributes, bool p_far_enable, float p_far_distance, float p_far_transition, bool p_near_enable, float p_near_distance, float p_near_transition, float p_amount) { CameraAttributes *cam_attributes = camera_attributes_owner.get_or_null(p_camera_attributes); - ERR_FAIL_COND(!cam_attributes); + ERR_FAIL_NULL(cam_attributes); #ifdef DEBUG_ENABLED if (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility" && (p_far_enable || p_near_enable)) { WARN_PRINT_ONCE_ED("DoF blur is only available when using the Forward+ or Mobile rendering backends."); @@ -83,63 +83,63 @@ void RendererCameraAttributes::camera_attributes_set_dof_blur(RID p_camera_attri bool RendererCameraAttributes::camera_attributes_get_dof_far_enabled(RID p_camera_attributes) { CameraAttributes *cam_attributes = camera_attributes_owner.get_or_null(p_camera_attributes); - ERR_FAIL_COND_V(!cam_attributes, false); + ERR_FAIL_NULL_V(cam_attributes, false); return cam_attributes->dof_blur_far_enabled; } float RendererCameraAttributes::camera_attributes_get_dof_far_distance(RID p_camera_attributes) { CameraAttributes *cam_attributes = camera_attributes_owner.get_or_null(p_camera_attributes); - ERR_FAIL_COND_V(!cam_attributes, 0.0); + ERR_FAIL_NULL_V(cam_attributes, 0.0); return cam_attributes->dof_blur_far_distance; } float RendererCameraAttributes::camera_attributes_get_dof_far_transition(RID p_camera_attributes) { CameraAttributes *cam_attributes = camera_attributes_owner.get_or_null(p_camera_attributes); - ERR_FAIL_COND_V(!cam_attributes, 0.0); + ERR_FAIL_NULL_V(cam_attributes, 0.0); return cam_attributes->dof_blur_far_transition; } bool RendererCameraAttributes::camera_attributes_get_dof_near_enabled(RID p_camera_attributes) { CameraAttributes *cam_attributes = camera_attributes_owner.get_or_null(p_camera_attributes); - ERR_FAIL_COND_V(!cam_attributes, false); + ERR_FAIL_NULL_V(cam_attributes, false); return cam_attributes->dof_blur_near_enabled; } float RendererCameraAttributes::camera_attributes_get_dof_near_distance(RID p_camera_attributes) { CameraAttributes *cam_attributes = camera_attributes_owner.get_or_null(p_camera_attributes); - ERR_FAIL_COND_V(!cam_attributes, 0.0); + ERR_FAIL_NULL_V(cam_attributes, 0.0); return cam_attributes->dof_blur_near_distance; } float RendererCameraAttributes::camera_attributes_get_dof_near_transition(RID p_camera_attributes) { CameraAttributes *cam_attributes = camera_attributes_owner.get_or_null(p_camera_attributes); - ERR_FAIL_COND_V(!cam_attributes, 0.0); + ERR_FAIL_NULL_V(cam_attributes, 0.0); return cam_attributes->dof_blur_near_transition; } float RendererCameraAttributes::camera_attributes_get_dof_blur_amount(RID p_camera_attributes) { CameraAttributes *cam_attributes = camera_attributes_owner.get_or_null(p_camera_attributes); - ERR_FAIL_COND_V(!cam_attributes, 0.0); + ERR_FAIL_NULL_V(cam_attributes, 0.0); return cam_attributes->dof_blur_amount; } void RendererCameraAttributes::camera_attributes_set_exposure(RID p_camera_attributes, float p_multiplier, float p_exposure_normalization) { CameraAttributes *cam_attributes = camera_attributes_owner.get_or_null(p_camera_attributes); - ERR_FAIL_COND(!cam_attributes); + ERR_FAIL_NULL(cam_attributes); cam_attributes->exposure_multiplier = p_multiplier; cam_attributes->exposure_normalization = p_exposure_normalization; } float RendererCameraAttributes::camera_attributes_get_exposure_normalization_factor(RID p_camera_attributes) { CameraAttributes *cam_attributes = camera_attributes_owner.get_or_null(p_camera_attributes); - ERR_FAIL_COND_V(!cam_attributes, 1.0); + ERR_FAIL_NULL_V(cam_attributes, 1.0); return cam_attributes->exposure_multiplier * cam_attributes->exposure_normalization; } void RendererCameraAttributes::camera_attributes_set_auto_exposure(RID p_camera_attributes, bool p_enable, float p_min_sensitivity, float p_max_sensitivity, float p_speed, float p_scale) { CameraAttributes *cam_attributes = camera_attributes_owner.get_or_null(p_camera_attributes); - ERR_FAIL_COND(!cam_attributes); + ERR_FAIL_NULL(cam_attributes); if (!cam_attributes->use_auto_exposure && p_enable) { cam_attributes->auto_exposure_version = ++auto_exposure_counter; } @@ -157,30 +157,30 @@ void RendererCameraAttributes::camera_attributes_set_auto_exposure(RID p_camera_ float RendererCameraAttributes::camera_attributes_get_auto_exposure_min_sensitivity(RID p_camera_attributes) { CameraAttributes *cam_attributes = camera_attributes_owner.get_or_null(p_camera_attributes); - ERR_FAIL_COND_V(!cam_attributes, 0.0); + ERR_FAIL_NULL_V(cam_attributes, 0.0); return cam_attributes->auto_exposure_min_sensitivity; } float RendererCameraAttributes::camera_attributes_get_auto_exposure_max_sensitivity(RID p_camera_attributes) { CameraAttributes *cam_attributes = camera_attributes_owner.get_or_null(p_camera_attributes); - ERR_FAIL_COND_V(!cam_attributes, 0.0); + ERR_FAIL_NULL_V(cam_attributes, 0.0); return cam_attributes->auto_exposure_max_sensitivity; } float RendererCameraAttributes::camera_attributes_get_auto_exposure_adjust_speed(RID p_camera_attributes) { CameraAttributes *cam_attributes = camera_attributes_owner.get_or_null(p_camera_attributes); - ERR_FAIL_COND_V(!cam_attributes, 0.0); + ERR_FAIL_NULL_V(cam_attributes, 0.0); return cam_attributes->auto_exposure_adjust_speed; } float RendererCameraAttributes::camera_attributes_get_auto_exposure_scale(RID p_camera_attributes) { CameraAttributes *cam_attributes = camera_attributes_owner.get_or_null(p_camera_attributes); - ERR_FAIL_COND_V(!cam_attributes, 0.0); + ERR_FAIL_NULL_V(cam_attributes, 0.0); return cam_attributes->auto_exposure_scale; } uint64_t RendererCameraAttributes::camera_attributes_get_auto_exposure_version(RID p_camera_attributes) { CameraAttributes *cam_attributes = camera_attributes_owner.get_or_null(p_camera_attributes); - ERR_FAIL_COND_V(!cam_attributes, 0); + ERR_FAIL_NULL_V(cam_attributes, 0); return cam_attributes->auto_exposure_version; } |