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

Fix friction being in the correct if/else branch #84028

Merged
merged 1 commit into from
Oct 30, 2023

Conversation

QbieShay
Copy link
Contributor

Closes #84009

Sorry for the regression

scene/resources/particle_process_material.cpp Outdated Show resolved Hide resolved
scene/resources/particle_process_material.cpp Outdated Show resolved Hide resolved
scene/resources/particle_process_material.cpp Outdated Show resolved Hide resolved
@QbieShay
Copy link
Contributor Author

Done!

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 to me, i double checked the math and it seems to line up with the old damping.

Tested locally and it seems fine to me. I'm not really knowledgeable enough to say if it is correct or not.

I left one little nitpick to clean the code up a bit and reuse the v variable since we have it calculated anyway

scene/resources/particle_process_material.cpp Outdated Show resolved Hide resolved
Co-authored-by: Rémi Verschelde <rverschelde@gmail.com>
@QbieShay
Copy link
Contributor Author

Updated

@akien-mga akien-mga merged commit ceaa833 into godotengine:master Oct 30, 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.

ParticleProcessMaterial ignores the value set for particle_flag_damping_as_friction
3 participants