Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a global illumination demo (4.0-dev) #718

Merged

Conversation

Calinou
Copy link
Member

@Calinou Calinou commented Apr 5, 2022

Port of the 3.x global illumination demo, with SDFGI support added and screen-space lighting effect options added (SSAO, SSIL, or both).

Lightmap options were removed as I couldn't get both indirect-only and fully baked lightmaps to work for now. They can be readded in the future.
Edit: Readded in #718.

See #697.

2022-04-06_00 19 52

@Calinou Calinou added the update label Apr 5, 2022
@Calinou Calinou force-pushed the add-global-illumination-demo-2-4.0 branch 2 times, most recently from 6c2e7b2 to 4d4fbeb Compare April 5, 2022 23:20
@aaronfranke aaronfranke added this to the 4.0 milestone Apr 5, 2022
@aaronfranke
Copy link
Member

This PR has conflicts, it needs to be rebased (you can probably rebase everything in favor of your branch). Also, the commit on this PR says it's unverified, did your GPG key expire?

Port of the 3.x global illumination demo, with SDFGI support added
and screen-space lighting effect options added (SSAO, SSIL, or both).

Lightmap options were removed as I couldn't get both indirect-only
and fully baked lightmaps to work for now. They can be readded in the
future.
@Calinou Calinou force-pushed the add-global-illumination-demo-2-4.0 branch from 4d4fbeb to 31b962a Compare April 6, 2022 15:45
@Calinou
Copy link
Member Author

Calinou commented Apr 6, 2022

This PR has conflicts, it needs to be rebased (you can probably rebase everything in favor of your branch). Also, the commit on this PR says it's unverified, did your GPG key expire?

Fixed. I tried to rebase this way yesterday, but I rebased against master instead of 4.0-dev.

@aaronfranke aaronfranke merged commit 560ea5a into godotengine:4.0-dev Apr 25, 2022
0,
Input.get_axis(&"move_forward", &"move_back")
Input.get_action_strength("move_back") - Input.get_action_strength("move_forward")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wait, why did you change this? Input.get_axis(&"move_forward", &"move_back") is what we want.

Copy link
Member Author

@Calinou Calinou Apr 25, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's likely accidental, as I don't remember performing this change.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants