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

Particles: Fix directed points not working, and fix friction formula #83831

Merged
merged 1 commit into from
Oct 24, 2023

Conversation

QbieShay
Copy link
Contributor

Fixes #83811

Fixes friction formula. It was supposed to be like this when i made it, but i just lost track of it so it stayed with a wrong formula. Video comparison:
Left current, Right updated.
https://github.com/godotengine/godot/assets/7917475/1b485e35-66dd-4801-b713-00d6b9aa5bba

Credit to @RPicster for the formula

@QbieShay QbieShay added this to the 4.2 milestone Oct 23, 2023
@QbieShay QbieShay requested a review from a team October 23, 2023 10:03
@AThousandShips AThousandShips changed the title Fixed directed points not working, and fixig friction formula Fixed directed points not working, and fixing friction formula Oct 23, 2023
Copy link
Member

@AThousandShips AThousandShips left a comment

Choose a reason for hiding this comment

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

Style looks good, can't comment on the functionality

@akien-mga akien-mga changed the title Fixed directed points not working, and fixing friction formula Particles: Fix directed points not working, and fix friction formula Oct 23, 2023
Copy link
Member

@clayjohn clayjohn left a comment

Choose a reason for hiding this comment

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

Looks good.

For a future PR we need to go back and clean up emission_tex_size and just store the size. Each call to textureSize() has the same cost as a texture read, which adds a lot to the cost of particles. But since this is an existing issue in the code, let's do that in a follow up PR

@akien-mga akien-mga merged commit e8d57af into godotengine:master Oct 24, 2023
15 checks passed
@akien-mga
Copy link
Member

Thanks!

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.

In 4.2 GPUParticles3D using Directed Points emission shape doesn't affect particle initial direction
4 participants