Skip to content

Fix generated light probes placing too close to manual light probes - #83497

Merged
akien-mga merged 1 commit into
godotengine:masterfrom
grenappels:probe_distance_fix
Aug 16, 2024
Merged

Fix generated light probes placing too close to manual light probes#83497
akien-mga merged 1 commit into
godotengine:masterfrom
grenappels:probe_distance_fix

Conversation

@grenappels

Copy link
Copy Markdown
Contributor

This is extracted from a conversation here: #83420.

While poking around in lightmap_gi, I noticed there is code to avoid generating probes too close to manually placed probes, but it was doing an is_equal_approx check against the two positions instead of a distance check, so this was never being triggered. I changed it to a distance check so the behavior is as expected now:

probes_by_approx
probes_by_dist_good

@grenappels
grenappels requested a review from a team as a code owner October 17, 2023 13:00
@akien-mga akien-mga added this to the 4.2 milestone Oct 17, 2023
@akien-mga
akien-mga requested a review from a team October 17, 2023 13:04
@YuriSizov YuriSizov modified the milestones: 4.2, 4.3 Nov 13, 2023
@clayjohn clayjohn modified the milestones: 4.3, 4.4 Jul 24, 2024
@clayjohn clayjohn added the cherrypick:4.3 Considered for cherry-picking into a future 4.3.x release label Jul 24, 2024

@clayjohn clayjohn left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This seems to have slipped through the cracks. My apologies.

The code seems reasonable and fairly low risk. So let's go ahead and merge this earlier in the 4.4 dev cycle

@akien-mga
akien-mga merged commit a3266e2 into godotengine:master Aug 16, 2024
@akien-mga

Copy link
Copy Markdown
Member

Thanks! And congrats for your first merged Godot contribution 🎉

@akien-mga

Copy link
Copy Markdown
Member

Cherry-picked for 4.3.1.

@akien-mga akien-mga removed the cherrypick:4.3 Considered for cherry-picking into a future 4.3.x release label Sep 16, 2024
BendyLand pushed a commit to BendyLand/voltaire that referenced this pull request Aug 2, 2026
Fix generated light probes placing too close to manual light probes
BendyLand pushed a commit to BendyLand/voltaire that referenced this pull request Aug 2, 2026
Fix generated light probes placing too close to manual light probes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants