Improve 2D Particle Emission Mask dialog#101165
Merged
Repiteo merged 1 commit intogodotengine:masterfrom Nov 13, 2025
Merged
Conversation
timoschwarzer
force-pushed
the
feature/2d-particle-emission-textures-refactor
branch
from
ab89aee to
5b20953
Compare
timoschwarzer
force-pushed
the
feature/2d-particle-emission-textures-refactor
branch
from
5b20953 to
257d9bb
Compare
timoschwarzer
force-pushed
the
feature/2d-particle-emission-textures-refactor
branch
from
257d9bb to
70f59ed
Compare
Contributor
Author
|
Rebased. I would appreciate it if this could be added to the 4.6 milestone and reviewed to keep further conflicts at a minimum. 👀 |
timoschwarzer
force-pushed
the
feature/2d-particle-emission-textures-refactor
branch
2 times, most recently
from
3a51794 to
97b9c83
Compare
Member
|
I think the placeholder for Mask Texture field is unnecessary. Also the path seems to never get cleared; shouldn't accepting/canceling clear it? For some reason the dialog has empty space at the bottom instead of shrinking to minimum size: |
KoBeWi
reviewed
Jul 22, 2025
KoBeWi
reviewed
Jul 22, 2025
KoBeWi
reviewed
Jul 22, 2025
KoBeWi
reviewed
Jul 22, 2025
KoBeWi
reviewed
Jul 22, 2025
timoschwarzer
force-pushed
the
feature/2d-particle-emission-textures-refactor
branch
from
97b9c83 to
cfe0888
Compare
Contributor
Author
|
I made the dialog resize automatically and it is reset when selecting another node, so you can adjust the particle mask settings for the same node again without needing to select textures and options again. |
KoBeWi
reviewed
Jul 23, 2025
KoBeWi
reviewed
Jul 23, 2025
KoBeWi
reviewed
Jul 23, 2025
timoschwarzer
force-pushed
the
feature/2d-particle-emission-textures-refactor
branch
2 times, most recently
from
f657a89 to
b98d1fc
Compare
KoBeWi
reviewed
Jul 23, 2025
timoschwarzer
force-pushed
the
feature/2d-particle-emission-textures-refactor
branch
3 times, most recently
from
4d2c1f4 to
1d1cdd9
Compare
KoBeWi
approved these changes
Jul 23, 2025
timoschwarzer
force-pushed
the
feature/2d-particle-emission-textures-refactor
branch
from
1d1cdd9 to
e1d43ef
Compare
# Conflicts: # editor/scene/2d/particles_2d_editor_plugin.cpp
timoschwarzer
force-pushed
the
feature/2d-particle-emission-textures-refactor
branch
from
e1d43ef to
a9dab2b
Compare
Contributor
Author
|
Rebased |
Contributor
|
Thanks! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
In this PR I reworked the 2D particles emission mask dialog (C/GPUParticles2D → Load Emission Mask in the 2D viewport).
Screencast.From.2025-01-05.23-34-47.mp4
Before, it was only possible to let Godot generate an emission direction texture when using the "Directed Border Pixels" mode. With this PR, you can specify a custom normal map to use. Additionally, the "Centered" checkbox is now checked by default because all other emission shapes are also centered by default.
I refactored some code as well because I found some parts of it hard to read and understand due to undocumented abbreviations.
If you want to test this, make sure to also merge #101162 because emission mask textures are currently broken for GPUParticles2D.