godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #41145 from nekomatata/cpu-particle-emission-mask-velocity

Browse Source 
Fix 2D Particle velocity with directed emission mask
This commit is contained in:
Rémi Verschelde 2020-08-11 17:02:44 +02:00 committed by GitHub
commit 6a181efaf3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scene/2d/cpu_particles_2d.cpp
View File

@ -749,7 +749,11 @@ void CPUParticles2D::_particles_process(float p_delta) {
p.transform[2] = emission_points.get(random_idx); p.transform[2] = emission_points.get(random_idx);
if (emission_shape == EMISSION_SHAPE_DIRECTED_POINTS && emission_normals.size() == pc) { if (emission_shape == EMISSION_SHAPE_DIRECTED_POINTS && emission_normals.size() == pc) {
p.velocity = emission_normals.get(random_idx); Vector2 normal = emission_normals.get(random_idx);
Transform2D m2;
m2.set_axis(0, normal);
m2.set_axis(1, normal.tangent());
p.velocity = m2.basis_xform(p.velocity);
} }
if (emission_colors.size() == pc) { if (emission_colors.size() == pc) {

16
scene/3d/cpu_particles_3d.cpp
View File

@ -726,13 +726,15 @@ void CPUParticles3D::_particles_process(float p_delta) {
if (emission_shape == EMISSION_SHAPE_DIRECTED_POINTS && emission_normals.size() == pc) { if (emission_shape == EMISSION_SHAPE_DIRECTED_POINTS && emission_normals.size() == pc) {
if (flags[FLAG_DISABLE_Z]) { if (flags[FLAG_DISABLE_Z]) {
/* Vector3 normal = emission_normals.get(random_idx);
mat2 rotm; Vector2 normal_2d(normal.x, normal.y);
"; Transform2D m2;
rotm[0] = texelFetch(emission_texture_normal, emission_tex_ofs, 0).xy; m2.set_axis(0, normal_2d);
rotm[1] = rotm[0].yx * vec2(1.0, -1.0); m2.set_axis(1, normal_2d.tangent());
VELOCITY.xy = rotm * VELOCITY.xy; Vector2 velocity_2d(p.velocity.x, p.velocity.y);
*/ velocity_2d = m2.basis_xform(velocity_2d);
p.velocity.x = velocity_2d.x;
p.velocity.y = velocity_2d.y;
} else { } else {
Vector3 normal = emission_normals.get(random_idx); Vector3 normal = emission_normals.get(random_idx);
Vector3 v0 = Math::abs(normal.z) < 0.999 ? Vector3(0.0, 0.0, 1.0) : Vector3(0, 1.0, 0.0); Vector3 v0 = Math::abs(normal.z) < 0.999 ? Vector3(0.0, 0.0, 1.0) : Vector3(0, 1.0, 0.0);