EEVEE-Next: Make Ambient Occlusion Pass use Horizon Scan #114150

Merged

Clément Foucault merged 24 commits from fclem/blender:eevee-next-horizon-scan into main

2023-11-02 19:22:11 +01:00

Clément Foucault commented

2023-10-25 14:25:46 +02:00

Member

This adds a new way of computing occlusion using visibility bitmask. To
make it more algorithm agnostic, we name it horizon scan.
This cleans-up / simplify the code compared to the Horizon based solution.
There is no more trickery for fading influence of distant samples which
makes the result match cycles closer.

This introduces a new thickness option. Maintaining it relatively low
makes it possible to avoid over occlusion because of in front geometry.
Making it too low will cause under occlusion.

Related #112979

	Image
Cycles
EEVEE (Legacy)
EEVEE (New)

This adds a new way of computing occlusion using visibility bitmask. To make it more algorithm agnostic, we name it horizon scan. This cleans-up / simplify the code compared to the Horizon based solution. There is no more trickery for fading influence of distant samples which makes the result match cycles closer. This introduces a new thickness option. Maintaining it relatively low makes it possible to avoid over occlusion because of in front geometry. Making it too low will cause under occlusion. Related #112979 | | Image | | -------- | -------- | | Cycles | ![Capture d’écran du 2023-10-25 21-47-18](/attachments/177b23e9-5404-44bd-a395-09690c8963de)| | EEVEE (Legacy) | ![Capture d’écran du 2023-10-25 21-48-59](/attachments/aa2c8f4f-62de-4190-a6a8-29335b14907f)| | EEVEE (New)|![Capture d’écran du 2023-10-25 21-48-51](/attachments/99c1191c-1fd2-4c3e-8ac9-4c854ff284c5) |

Capture d’écran du 2023-10-25 21-48-59.png

146 KiB

Capture d’écran du 2023-10-25 21-48-51.png

141 KiB

Capture d’écran du 2023-10-25 21-47-18.png

165 KiB

Capture d’écran du 2023-10-25 21-48-59.png

146 KiB

Capture d’écran du 2023-10-25 21-48-59.png

Clément Foucault added this to the 4.1 milestone 2023-10-25 14:25:46 +02:00

Clément Foucault added the

EEVEE & Viewport

labels 2023-10-25 14:25:46 +02:00

Clément Foucault added 12 commits 2023-10-25 14:25:59 +02:00

39c97c1450 Experiment by refactoring AO lib

181aeaee9f Make visibility bitmask work

0035bb74ab Add thickness property

90ae0ec090 Cleanup GLSL implementation

047caa2c78 Add slope aware bias

727486d471 Scale AO result by 1% to fight precision issues

a2907b82de Add cosine weighted occlusion. Return color directly.

a0cb21fc4d Add correct rejection logic

e51aeb96f2 Rename thickness to global_thickness

457467860b Rename some variable and add angular bias which fixes some self occlusion.

1ef1a6da60 Cleanup

729c3d7ddb Merge branch 'main' into eevee-next-horizon-scan

Clément Foucault added 3 commits 2023-10-25 17:31:59 +02:00

4e276516a8 Add proper test and split eval and lib functions

659c8a070f Rename RNA memebers to horizon prefix

3d6920cf67 Add versioning for thickness

Clément Foucault added 4 commits 2023-10-25 21:01:25 +02:00

ac5815eb20 Refactor code and use correct ray bounds

34e6c95e92 Isolate segment clipping

b42bda414b Add bias option

d1c94992f0 Add correct sphere intersection

Clément Foucault added 1 commit 2023-10-25 21:28:01 +02:00

buildbot/vexp-code-patch-coordinator Build done. Details

2c2f531c3c Fix wrong Ray type

Clément Foucault referenced this pull request

2023-10-25 21:55:58 +02:00

EEVEE-Next Horizon Based Global Illumination #112979

Clément Foucault changed title from ~~WIP: EEVEE-Next: Make Ambient Occlusion Pass use Horizon Scan~~ to EEVEE-Next: Make Ambient Occlusion Pass use Horizon Scan

2023-10-25 22:01:46 +02:00

Clément Foucault commented

2023-10-25 22:02:00 +02:00

Author

Member

@blender-bot build

@blender-bot build

Clément Foucault requested review from Miguel Pozo 2023-10-25 22:02:11 +02:00

Clément Foucault added 2 commits 2023-10-25 22:12:47 +02:00

85e1a076e6 Cleanup AO shader

dfc6903c39 Cleanup comments

Miguel Pozo requested changes 2023-10-26 17:52:48 +02:00

Miguel Pozo left a comment

Member

I've only skimmed the actual scan implementation, but the results look fine, so I'd assume it's fine. XD

You have not removed the previous implementation, and the AO node still uses it.
Is this intended?

I've only skimmed the actual scan implementation, but the results look fine, so I'd assume it's fine. XD You have not removed the previous implementation, and the AO node still uses it. Is this intended?

scripts/startup/bl_ui/properties_render.py

						
				@ -194,3 +194,3 @@

				        col = layout.column()

				        col.prop(props, "gtao_quality", text="Precision")

				        col.prop(props, "horizon_quality", text="Precision")

Miguel Pozo commented

2023-10-26 17:40:04 +02:00

Member

Since 80a8368b88, there's no way to set the AO distance from the UI!

Also, I don't think Horizon Scan is a great name for the user side.
Could these settings get merged with the Screen Tracing ones?

Since 80a8368b88, there's no way to set the AO distance from the UI! Also, I don't think *Horizon Scan* is a great name for the user side. Could these settings get merged with the *Screen Tracing* ones?

Clément Foucault commented

2023-10-29 09:33:58 +01:00

Author

Member

Since 80a8368b88, there's no way to set the AO distance from the UI!

It has been move to the view layer panel since it is only related to the occlusion pass. There is a todo to move the parameter to the view-layer datablock itself.

Could these settings get merged with the Screen Tracing ones?

I am also thinking of this. But that would be part of another PR.

> Since 80a8368b88, there's no way to set the AO distance from the UI! It has been move to the view layer panel since it is only related to the occlusion pass. There is a todo to move the parameter to the view-layer datablock itself. > Could these settings get merged with the Screen Tracing ones? I am also thinking of this. But that would be part of another PR.

fclem marked this conversation as resolved

source/blender/draw/engines/eevee_next/shaders/eevee_ambient_occlusion_pass_comp.glsl

						
				@ -36,1 +45,3 @@

				      data, texel, V, N, Ng, 0.0, visibility, unused_visibility_error_out, unused_bent_normal_out);

				  /* We can have some float imprecision because of the weighted accumulation. */

				  if (ambient_occlusion.r >= 0.98) {

				    ambient_occlusion = vec3(1.0);

Miguel Pozo commented

2023-10-26 17:45:33 +02:00

Member

I haven't really noticed any visual issues.
But maybe it might be better to scale it uniformly instead?

ambient_occlusion = saturate(ambient_occlusion / 0.98)

I haven't really noticed any visual issues. But maybe it might be better to scale it uniformly instead? ``` ambient_occlusion = saturate(ambient_occlusion / 0.98) ```

pragma37 marked this conversation as resolved

source/blender/draw/engines/eevee_next/shaders/eevee_horizon_scan_lib.glsl

						
				@ -0,0 +57,4 @@

				   * distribution in `horizon_scan_angles_to_bitmask()` but that requires more computation per

				   * samples. The quality difference does not justify it currently. */

				#if 0 /* Reference. */

Miguel Pozo commented

2023-10-26 17:48:00 +02:00

Member

IIRC, some preprocessors freak out when there's a directive and a comment in the same line.

IIRC, some preprocessors freak out when there's a directive and a comment in the same line.

Clément Foucault commented

2023-11-01 12:34:33 +01:00

Author

Member

The search regex (#if).*(\/\*) over all glsl files finds 32 matches. So I'm pretty sure it works.

The search regex `(#if).*(\/\*)` over all glsl files finds 32 matches. So I'm pretty sure it works.

fclem marked this conversation as resolved

Clément Foucault added 1 commit 2023-11-02 18:44:42 +01:00

970cccb478 Adress review

Clément Foucault commented

2023-11-02 18:45:56 +01:00

Author

Member

@blender-bot build

@blender-bot build

Clément Foucault added 1 commit 2023-11-02 18:45:57 +01:00

buildbot/vexp-code-patch-coordinator Build done. Details

8a8a30cc5b Merge branch 'main' into eevee-next-horizon-scan

# Conflicts:
#	source/blender/blenloader/intern/versioning_400.cc

Clément Foucault requested review from Miguel Pozo 2023-11-02 18:46:07 +01:00

Clément Foucault commented

2023-11-02 18:47:28 +01:00

Author

Member

The AO node is to be handled in another patch. Currently, inverted normals are not working. So this should be fixed before this replace the AO node.

The AO node is to be handled in another patch. Currently, inverted normals are not working. So this should be fixed before this replace the AO node.

Miguel Pozo approved these changes 2023-11-02 18:49:27 +01:00

Clément Foucault merged commit 0684b68eb4 into main

2023-11-02 19:22:11 +01:00

Clément Foucault referenced this issue from a commit

2023-11-02 19:22:11 +01:00

EEVEE-Next: Make Ambient Occlusion Pass use Horizon Scan

Clément Foucault deleted branch eevee-next-horizon-scan

2023-11-02 19:22:13 +01:00

Sign in to join this conversation.

No reviewers

No Label

Animation & Rigging

Asset Browser Project Overview

Automated Testing

Blender Asset Bundle

Dependency Graph

Development Management

EEVEE & Viewport

Images & Movies

Motion Tracking

Nodes & Physics

Pipeline, Assets & IO

Platforms, Builds & Tests

Render & Cycles

Render Pipeline

Sculpt, Paint & Texture

Video Sequencer

Virtual Reality

Blender 2.8 Project

Milestone 1: Basic, Local Asset Browser

Good First Issue

Animation & Rigging

Development Management

EEVEE & Viewport

Nodes & Physics

Pipeline, Assets & IO

Platforms, Builds & Tests

Render & Cycles

Sculpt, Paint & Texture

Needs Info from Developers

Needs Information from User

No Milestone

No project

No Assignees

2 Participants

Notifications

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: blender/blender#114150

No description provided.