Browse Source

Merge pull request #29958 from akien-mga/keep-calm-and-do-particles

Particles: Fix uninitialized angular velocity, fix inconsistency in linear velocity between CPU and GPU Particles
Rémi Verschelde 6 years ago
parent
commit
34224d5ce5

+ 2 - 2
scene/2d/cpu_particles_2d.cpp

@@ -1391,10 +1391,10 @@ CPUParticles2D::CPUParticles2D() {
 
 	set_spread(45);
 	set_flatness(0);
-	set_param(PARAM_INITIAL_LINEAR_VELOCITY, 1);
+	set_param(PARAM_INITIAL_LINEAR_VELOCITY, 0);
+	set_param(PARAM_ANGULAR_VELOCITY, 0);
 	set_param(PARAM_ORBIT_VELOCITY, 0);
 	set_param(PARAM_LINEAR_ACCEL, 0);
-	set_param(PARAM_ANGULAR_VELOCITY, 0);
 	set_param(PARAM_RADIAL_ACCEL, 0);
 	set_param(PARAM_TANGENTIAL_ACCEL, 0);
 	set_param(PARAM_DAMPING, 0);

+ 2 - 1
scene/3d/cpu_particles.cpp

@@ -1459,7 +1459,8 @@ CPUParticles::CPUParticles() {
 
 	set_spread(45);
 	set_flatness(0);
-	set_param(PARAM_INITIAL_LINEAR_VELOCITY, 1);
+	set_param(PARAM_INITIAL_LINEAR_VELOCITY, 0);
+	set_param(PARAM_ANGULAR_VELOCITY, 0);
 	set_param(PARAM_ORBIT_VELOCITY, 0);
 	set_param(PARAM_LINEAR_ACCEL, 0);
 	set_param(PARAM_RADIAL_ACCEL, 0);

+ 1 - 0
scene/resources/particles_material.cpp

@@ -1202,6 +1202,7 @@ ParticlesMaterial::ParticlesMaterial() :
 	set_spread(45);
 	set_flatness(0);
 	set_param(PARAM_INITIAL_LINEAR_VELOCITY, 0);
+	set_param(PARAM_ANGULAR_VELOCITY, 0);
 	set_param(PARAM_ORBIT_VELOCITY, 0);
 	set_param(PARAM_LINEAR_ACCEL, 0);
 	set_param(PARAM_RADIAL_ACCEL, 0);