Merge pull request #45497 from Chaosus/fix_particles_3.2
[3.2] Fix particles not properly updated by their lifetime
This commit is contained in:
commit
30fd2f171d
|
@ -715,6 +715,8 @@ void CPUParticles2D::_particles_process(float p_delta) {
|
||||||
restart = true;
|
restart = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
float tv = 0.0;
|
||||||
|
|
||||||
if (restart) {
|
if (restart) {
|
||||||
|
|
||||||
if (!emitting) {
|
if (!emitting) {
|
||||||
|
@ -730,12 +732,12 @@ void CPUParticles2D::_particles_process(float p_delta) {
|
||||||
|
|
||||||
float tex_angle = 0.0;
|
float tex_angle = 0.0;
|
||||||
if (curve_parameters[PARAM_ANGLE].is_valid()) {
|
if (curve_parameters[PARAM_ANGLE].is_valid()) {
|
||||||
tex_angle = curve_parameters[PARAM_ANGLE]->interpolate(0);
|
tex_angle = curve_parameters[PARAM_ANGLE]->interpolate(tv);
|
||||||
}
|
}
|
||||||
|
|
||||||
float tex_anim_offset = 0.0;
|
float tex_anim_offset = 0.0;
|
||||||
if (curve_parameters[PARAM_ANGLE].is_valid()) {
|
if (curve_parameters[PARAM_ANGLE].is_valid()) {
|
||||||
tex_anim_offset = curve_parameters[PARAM_ANGLE]->interpolate(0);
|
tex_anim_offset = curve_parameters[PARAM_ANGLE]->interpolate(tv);
|
||||||
}
|
}
|
||||||
|
|
||||||
p.seed = Math::rand();
|
p.seed = Math::rand();
|
||||||
|
@ -810,60 +812,62 @@ void CPUParticles2D::_particles_process(float p_delta) {
|
||||||
continue;
|
continue;
|
||||||
} else if (p.time > p.lifetime) {
|
} else if (p.time > p.lifetime) {
|
||||||
p.active = false;
|
p.active = false;
|
||||||
|
tv = 1.0;
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
uint32_t alt_seed = p.seed;
|
uint32_t alt_seed = p.seed;
|
||||||
|
|
||||||
p.time += local_delta;
|
p.time += local_delta;
|
||||||
p.custom[1] = p.time / lifetime;
|
p.custom[1] = p.time / lifetime;
|
||||||
|
tv = p.time / p.lifetime;
|
||||||
|
|
||||||
float tex_linear_velocity = 0.0;
|
float tex_linear_velocity = 0.0;
|
||||||
if (curve_parameters[PARAM_INITIAL_LINEAR_VELOCITY].is_valid()) {
|
if (curve_parameters[PARAM_INITIAL_LINEAR_VELOCITY].is_valid()) {
|
||||||
tex_linear_velocity = curve_parameters[PARAM_INITIAL_LINEAR_VELOCITY]->interpolate(p.custom[1]);
|
tex_linear_velocity = curve_parameters[PARAM_INITIAL_LINEAR_VELOCITY]->interpolate(tv);
|
||||||
}
|
}
|
||||||
|
|
||||||
float tex_orbit_velocity = 0.0;
|
float tex_orbit_velocity = 0.0;
|
||||||
if (curve_parameters[PARAM_ORBIT_VELOCITY].is_valid()) {
|
if (curve_parameters[PARAM_ORBIT_VELOCITY].is_valid()) {
|
||||||
tex_orbit_velocity = curve_parameters[PARAM_ORBIT_VELOCITY]->interpolate(p.custom[1]);
|
tex_orbit_velocity = curve_parameters[PARAM_ORBIT_VELOCITY]->interpolate(tv);
|
||||||
}
|
}
|
||||||
|
|
||||||
float tex_angular_velocity = 0.0;
|
float tex_angular_velocity = 0.0;
|
||||||
if (curve_parameters[PARAM_ANGULAR_VELOCITY].is_valid()) {
|
if (curve_parameters[PARAM_ANGULAR_VELOCITY].is_valid()) {
|
||||||
tex_angular_velocity = curve_parameters[PARAM_ANGULAR_VELOCITY]->interpolate(p.custom[1]);
|
tex_angular_velocity = curve_parameters[PARAM_ANGULAR_VELOCITY]->interpolate(tv);
|
||||||
}
|
}
|
||||||
|
|
||||||
float tex_linear_accel = 0.0;
|
float tex_linear_accel = 0.0;
|
||||||
if (curve_parameters[PARAM_LINEAR_ACCEL].is_valid()) {
|
if (curve_parameters[PARAM_LINEAR_ACCEL].is_valid()) {
|
||||||
tex_linear_accel = curve_parameters[PARAM_LINEAR_ACCEL]->interpolate(p.custom[1]);
|
tex_linear_accel = curve_parameters[PARAM_LINEAR_ACCEL]->interpolate(tv);
|
||||||
}
|
}
|
||||||
|
|
||||||
float tex_tangential_accel = 0.0;
|
float tex_tangential_accel = 0.0;
|
||||||
if (curve_parameters[PARAM_TANGENTIAL_ACCEL].is_valid()) {
|
if (curve_parameters[PARAM_TANGENTIAL_ACCEL].is_valid()) {
|
||||||
tex_tangential_accel = curve_parameters[PARAM_TANGENTIAL_ACCEL]->interpolate(p.custom[1]);
|
tex_tangential_accel = curve_parameters[PARAM_TANGENTIAL_ACCEL]->interpolate(tv);
|
||||||
}
|
}
|
||||||
|
|
||||||
float tex_radial_accel = 0.0;
|
float tex_radial_accel = 0.0;
|
||||||
if (curve_parameters[PARAM_RADIAL_ACCEL].is_valid()) {
|
if (curve_parameters[PARAM_RADIAL_ACCEL].is_valid()) {
|
||||||
tex_radial_accel = curve_parameters[PARAM_RADIAL_ACCEL]->interpolate(p.custom[1]);
|
tex_radial_accel = curve_parameters[PARAM_RADIAL_ACCEL]->interpolate(tv);
|
||||||
}
|
}
|
||||||
|
|
||||||
float tex_damping = 0.0;
|
float tex_damping = 0.0;
|
||||||
if (curve_parameters[PARAM_DAMPING].is_valid()) {
|
if (curve_parameters[PARAM_DAMPING].is_valid()) {
|
||||||
tex_damping = curve_parameters[PARAM_DAMPING]->interpolate(p.custom[1]);
|
tex_damping = curve_parameters[PARAM_DAMPING]->interpolate(tv);
|
||||||
}
|
}
|
||||||
|
|
||||||
float tex_angle = 0.0;
|
float tex_angle = 0.0;
|
||||||
if (curve_parameters[PARAM_ANGLE].is_valid()) {
|
if (curve_parameters[PARAM_ANGLE].is_valid()) {
|
||||||
tex_angle = curve_parameters[PARAM_ANGLE]->interpolate(p.custom[1]);
|
tex_angle = curve_parameters[PARAM_ANGLE]->interpolate(tv);
|
||||||
}
|
}
|
||||||
float tex_anim_speed = 0.0;
|
float tex_anim_speed = 0.0;
|
||||||
if (curve_parameters[PARAM_ANIM_SPEED].is_valid()) {
|
if (curve_parameters[PARAM_ANIM_SPEED].is_valid()) {
|
||||||
tex_anim_speed = curve_parameters[PARAM_ANIM_SPEED]->interpolate(p.custom[1]);
|
tex_anim_speed = curve_parameters[PARAM_ANIM_SPEED]->interpolate(tv);
|
||||||
}
|
}
|
||||||
|
|
||||||
float tex_anim_offset = 0.0;
|
float tex_anim_offset = 0.0;
|
||||||
if (curve_parameters[PARAM_ANIM_OFFSET].is_valid()) {
|
if (curve_parameters[PARAM_ANIM_OFFSET].is_valid()) {
|
||||||
tex_anim_offset = curve_parameters[PARAM_ANIM_OFFSET]->interpolate(p.custom[1]);
|
tex_anim_offset = curve_parameters[PARAM_ANIM_OFFSET]->interpolate(tv);
|
||||||
}
|
}
|
||||||
|
|
||||||
Vector2 force = gravity;
|
Vector2 force = gravity;
|
||||||
|
@ -916,12 +920,12 @@ void CPUParticles2D::_particles_process(float p_delta) {
|
||||||
|
|
||||||
float tex_scale = 1.0;
|
float tex_scale = 1.0;
|
||||||
if (curve_parameters[PARAM_SCALE].is_valid()) {
|
if (curve_parameters[PARAM_SCALE].is_valid()) {
|
||||||
tex_scale = curve_parameters[PARAM_SCALE]->interpolate(p.custom[1]);
|
tex_scale = curve_parameters[PARAM_SCALE]->interpolate(tv);
|
||||||
}
|
}
|
||||||
|
|
||||||
float tex_hue_variation = 0.0;
|
float tex_hue_variation = 0.0;
|
||||||
if (curve_parameters[PARAM_HUE_VARIATION].is_valid()) {
|
if (curve_parameters[PARAM_HUE_VARIATION].is_valid()) {
|
||||||
tex_hue_variation = curve_parameters[PARAM_HUE_VARIATION]->interpolate(p.custom[1]);
|
tex_hue_variation = curve_parameters[PARAM_HUE_VARIATION]->interpolate(tv);
|
||||||
}
|
}
|
||||||
|
|
||||||
float hue_rot_angle = (parameters[PARAM_HUE_VARIATION] + tex_hue_variation) * Math_PI * 2.0 * Math::lerp(1.0f, p.hue_rot_rand * 2.0f - 1.0f, randomness[PARAM_HUE_VARIATION]);
|
float hue_rot_angle = (parameters[PARAM_HUE_VARIATION] + tex_hue_variation) * Math_PI * 2.0 * Math::lerp(1.0f, p.hue_rot_rand * 2.0f - 1.0f, randomness[PARAM_HUE_VARIATION]);
|
||||||
|
@ -940,7 +944,7 @@ void CPUParticles2D::_particles_process(float p_delta) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (color_ramp.is_valid()) {
|
if (color_ramp.is_valid()) {
|
||||||
p.color = color_ramp->get_color_at_offset(p.custom[1]) * color;
|
p.color = color_ramp->get_color_at_offset(tv) * color;
|
||||||
} else {
|
} else {
|
||||||
p.color = color;
|
p.color = color;
|
||||||
}
|
}
|
||||||
|
|
|
@ -680,6 +680,8 @@ void CPUParticles::_particles_process(float p_delta) {
|
||||||
restart = true;
|
restart = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
float tv = 0.0;
|
||||||
|
|
||||||
if (restart) {
|
if (restart) {
|
||||||
|
|
||||||
if (!emitting) {
|
if (!emitting) {
|
||||||
|
@ -695,12 +697,12 @@ void CPUParticles::_particles_process(float p_delta) {
|
||||||
|
|
||||||
float tex_angle = 0.0;
|
float tex_angle = 0.0;
|
||||||
if (curve_parameters[PARAM_ANGLE].is_valid()) {
|
if (curve_parameters[PARAM_ANGLE].is_valid()) {
|
||||||
tex_angle = curve_parameters[PARAM_ANGLE]->interpolate(0);
|
tex_angle = curve_parameters[PARAM_ANGLE]->interpolate(tv);
|
||||||
}
|
}
|
||||||
|
|
||||||
float tex_anim_offset = 0.0;
|
float tex_anim_offset = 0.0;
|
||||||
if (curve_parameters[PARAM_ANGLE].is_valid()) {
|
if (curve_parameters[PARAM_ANGLE].is_valid()) {
|
||||||
tex_anim_offset = curve_parameters[PARAM_ANGLE]->interpolate(0);
|
tex_anim_offset = curve_parameters[PARAM_ANGLE]->interpolate(tv);
|
||||||
}
|
}
|
||||||
|
|
||||||
p.seed = Math::rand();
|
p.seed = Math::rand();
|
||||||
|
@ -806,62 +808,64 @@ void CPUParticles::_particles_process(float p_delta) {
|
||||||
continue;
|
continue;
|
||||||
} else if (p.time > p.lifetime) {
|
} else if (p.time > p.lifetime) {
|
||||||
p.active = false;
|
p.active = false;
|
||||||
|
tv = 1.0;
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
uint32_t alt_seed = p.seed;
|
uint32_t alt_seed = p.seed;
|
||||||
|
|
||||||
p.time += local_delta;
|
p.time += local_delta;
|
||||||
p.custom[1] = p.time / lifetime;
|
p.custom[1] = p.time / lifetime;
|
||||||
|
tv = p.time / p.lifetime;
|
||||||
|
|
||||||
float tex_linear_velocity = 0.0;
|
float tex_linear_velocity = 0.0;
|
||||||
if (curve_parameters[PARAM_INITIAL_LINEAR_VELOCITY].is_valid()) {
|
if (curve_parameters[PARAM_INITIAL_LINEAR_VELOCITY].is_valid()) {
|
||||||
tex_linear_velocity = curve_parameters[PARAM_INITIAL_LINEAR_VELOCITY]->interpolate(p.custom[1]);
|
tex_linear_velocity = curve_parameters[PARAM_INITIAL_LINEAR_VELOCITY]->interpolate(tv);
|
||||||
}
|
}
|
||||||
|
|
||||||
float tex_orbit_velocity = 0.0;
|
float tex_orbit_velocity = 0.0;
|
||||||
if (flags[FLAG_DISABLE_Z]) {
|
if (flags[FLAG_DISABLE_Z]) {
|
||||||
if (curve_parameters[PARAM_ORBIT_VELOCITY].is_valid()) {
|
if (curve_parameters[PARAM_ORBIT_VELOCITY].is_valid()) {
|
||||||
tex_orbit_velocity = curve_parameters[PARAM_ORBIT_VELOCITY]->interpolate(p.custom[1]);
|
tex_orbit_velocity = curve_parameters[PARAM_ORBIT_VELOCITY]->interpolate(tv);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
float tex_angular_velocity = 0.0;
|
float tex_angular_velocity = 0.0;
|
||||||
if (curve_parameters[PARAM_ANGULAR_VELOCITY].is_valid()) {
|
if (curve_parameters[PARAM_ANGULAR_VELOCITY].is_valid()) {
|
||||||
tex_angular_velocity = curve_parameters[PARAM_ANGULAR_VELOCITY]->interpolate(p.custom[1]);
|
tex_angular_velocity = curve_parameters[PARAM_ANGULAR_VELOCITY]->interpolate(tv);
|
||||||
}
|
}
|
||||||
|
|
||||||
float tex_linear_accel = 0.0;
|
float tex_linear_accel = 0.0;
|
||||||
if (curve_parameters[PARAM_LINEAR_ACCEL].is_valid()) {
|
if (curve_parameters[PARAM_LINEAR_ACCEL].is_valid()) {
|
||||||
tex_linear_accel = curve_parameters[PARAM_LINEAR_ACCEL]->interpolate(p.custom[1]);
|
tex_linear_accel = curve_parameters[PARAM_LINEAR_ACCEL]->interpolate(tv);
|
||||||
}
|
}
|
||||||
|
|
||||||
float tex_tangential_accel = 0.0;
|
float tex_tangential_accel = 0.0;
|
||||||
if (curve_parameters[PARAM_TANGENTIAL_ACCEL].is_valid()) {
|
if (curve_parameters[PARAM_TANGENTIAL_ACCEL].is_valid()) {
|
||||||
tex_tangential_accel = curve_parameters[PARAM_TANGENTIAL_ACCEL]->interpolate(p.custom[1]);
|
tex_tangential_accel = curve_parameters[PARAM_TANGENTIAL_ACCEL]->interpolate(tv);
|
||||||
}
|
}
|
||||||
|
|
||||||
float tex_radial_accel = 0.0;
|
float tex_radial_accel = 0.0;
|
||||||
if (curve_parameters[PARAM_RADIAL_ACCEL].is_valid()) {
|
if (curve_parameters[PARAM_RADIAL_ACCEL].is_valid()) {
|
||||||
tex_radial_accel = curve_parameters[PARAM_RADIAL_ACCEL]->interpolate(p.custom[1]);
|
tex_radial_accel = curve_parameters[PARAM_RADIAL_ACCEL]->interpolate(tv);
|
||||||
}
|
}
|
||||||
|
|
||||||
float tex_damping = 0.0;
|
float tex_damping = 0.0;
|
||||||
if (curve_parameters[PARAM_DAMPING].is_valid()) {
|
if (curve_parameters[PARAM_DAMPING].is_valid()) {
|
||||||
tex_damping = curve_parameters[PARAM_DAMPING]->interpolate(p.custom[1]);
|
tex_damping = curve_parameters[PARAM_DAMPING]->interpolate(tv);
|
||||||
}
|
}
|
||||||
|
|
||||||
float tex_angle = 0.0;
|
float tex_angle = 0.0;
|
||||||
if (curve_parameters[PARAM_ANGLE].is_valid()) {
|
if (curve_parameters[PARAM_ANGLE].is_valid()) {
|
||||||
tex_angle = curve_parameters[PARAM_ANGLE]->interpolate(p.custom[1]);
|
tex_angle = curve_parameters[PARAM_ANGLE]->interpolate(tv);
|
||||||
}
|
}
|
||||||
float tex_anim_speed = 0.0;
|
float tex_anim_speed = 0.0;
|
||||||
if (curve_parameters[PARAM_ANIM_SPEED].is_valid()) {
|
if (curve_parameters[PARAM_ANIM_SPEED].is_valid()) {
|
||||||
tex_anim_speed = curve_parameters[PARAM_ANIM_SPEED]->interpolate(p.custom[1]);
|
tex_anim_speed = curve_parameters[PARAM_ANIM_SPEED]->interpolate(tv);
|
||||||
}
|
}
|
||||||
|
|
||||||
float tex_anim_offset = 0.0;
|
float tex_anim_offset = 0.0;
|
||||||
if (curve_parameters[PARAM_ANIM_OFFSET].is_valid()) {
|
if (curve_parameters[PARAM_ANIM_OFFSET].is_valid()) {
|
||||||
tex_anim_offset = curve_parameters[PARAM_ANIM_OFFSET]->interpolate(p.custom[1]);
|
tex_anim_offset = curve_parameters[PARAM_ANIM_OFFSET]->interpolate(tv);
|
||||||
}
|
}
|
||||||
|
|
||||||
Vector3 force = gravity;
|
Vector3 force = gravity;
|
||||||
|
@ -925,12 +929,12 @@ void CPUParticles::_particles_process(float p_delta) {
|
||||||
|
|
||||||
float tex_scale = 1.0;
|
float tex_scale = 1.0;
|
||||||
if (curve_parameters[PARAM_SCALE].is_valid()) {
|
if (curve_parameters[PARAM_SCALE].is_valid()) {
|
||||||
tex_scale = curve_parameters[PARAM_SCALE]->interpolate(p.custom[1]);
|
tex_scale = curve_parameters[PARAM_SCALE]->interpolate(tv);
|
||||||
}
|
}
|
||||||
|
|
||||||
float tex_hue_variation = 0.0;
|
float tex_hue_variation = 0.0;
|
||||||
if (curve_parameters[PARAM_HUE_VARIATION].is_valid()) {
|
if (curve_parameters[PARAM_HUE_VARIATION].is_valid()) {
|
||||||
tex_hue_variation = curve_parameters[PARAM_HUE_VARIATION]->interpolate(p.custom[1]);
|
tex_hue_variation = curve_parameters[PARAM_HUE_VARIATION]->interpolate(tv);
|
||||||
}
|
}
|
||||||
|
|
||||||
float hue_rot_angle = (parameters[PARAM_HUE_VARIATION] + tex_hue_variation) * Math_PI * 2.0 * Math::lerp(1.0f, p.hue_rot_rand * 2.0f - 1.0f, randomness[PARAM_HUE_VARIATION]);
|
float hue_rot_angle = (parameters[PARAM_HUE_VARIATION] + tex_hue_variation) * Math_PI * 2.0 * Math::lerp(1.0f, p.hue_rot_rand * 2.0f - 1.0f, randomness[PARAM_HUE_VARIATION]);
|
||||||
|
@ -949,7 +953,7 @@ void CPUParticles::_particles_process(float p_delta) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (color_ramp.is_valid()) {
|
if (color_ramp.is_valid()) {
|
||||||
p.color = color_ramp->get_color_at_offset(p.custom[1]) * color;
|
p.color = color_ramp->get_color_at_offset(tv) * color;
|
||||||
} else {
|
} else {
|
||||||
p.color = color;
|
p.color = color;
|
||||||
}
|
}
|
||||||
|
|
|
@ -292,8 +292,10 @@ void ParticlesMaterial::_update_shader() {
|
||||||
code += " ivec2 emission_tex_ofs = ivec2(point % emission_tex_size.x, point / emission_tex_size.x);\n";
|
code += " ivec2 emission_tex_ofs = ivec2(point % emission_tex_size.x, point / emission_tex_size.x);\n";
|
||||||
}
|
}
|
||||||
code += " bool restart = false;\n";
|
code += " bool restart = false;\n";
|
||||||
|
code += " float tv = 0.0;\n";
|
||||||
code += " if (CUSTOM.y > CUSTOM.w) {\n";
|
code += " if (CUSTOM.y > CUSTOM.w) {\n";
|
||||||
code += " restart = true;\n";
|
code += " restart = true;\n";
|
||||||
|
code += " tv = 1.0;\n";
|
||||||
code += " }\n\n";
|
code += " }\n\n";
|
||||||
code += " if (RESTART || restart) {\n";
|
code += " if (RESTART || restart) {\n";
|
||||||
|
|
||||||
|
@ -388,56 +390,57 @@ void ParticlesMaterial::_update_shader() {
|
||||||
code += " } else {\n";
|
code += " } else {\n";
|
||||||
|
|
||||||
code += " CUSTOM.y += DELTA / LIFETIME;\n";
|
code += " CUSTOM.y += DELTA / LIFETIME;\n";
|
||||||
|
code += " tv = CUSTOM.y / CUSTOM.w;\n";
|
||||||
if (tex_parameters[PARAM_INITIAL_LINEAR_VELOCITY].is_valid())
|
if (tex_parameters[PARAM_INITIAL_LINEAR_VELOCITY].is_valid())
|
||||||
code += " float tex_linear_velocity = textureLod(linear_velocity_texture, vec2(CUSTOM.y, 0.0), 0.0).r;\n";
|
code += " float tex_linear_velocity = textureLod(linear_velocity_texture, vec2(tv, 0.0), 0.0).r;\n";
|
||||||
else
|
else
|
||||||
code += " float tex_linear_velocity = 0.0;\n";
|
code += " float tex_linear_velocity = 0.0;\n";
|
||||||
|
|
||||||
if (flags[FLAG_DISABLE_Z]) {
|
if (flags[FLAG_DISABLE_Z]) {
|
||||||
|
|
||||||
if (tex_parameters[PARAM_ORBIT_VELOCITY].is_valid())
|
if (tex_parameters[PARAM_ORBIT_VELOCITY].is_valid())
|
||||||
code += " float tex_orbit_velocity = textureLod(orbit_velocity_texture, vec2(CUSTOM.y, 0.0), 0.0).r;\n";
|
code += " float tex_orbit_velocity = textureLod(orbit_velocity_texture, vec2(tv, 0.0), 0.0).r;\n";
|
||||||
else
|
else
|
||||||
code += " float tex_orbit_velocity = 0.0;\n";
|
code += " float tex_orbit_velocity = 0.0;\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (tex_parameters[PARAM_ANGULAR_VELOCITY].is_valid())
|
if (tex_parameters[PARAM_ANGULAR_VELOCITY].is_valid())
|
||||||
code += " float tex_angular_velocity = textureLod(angular_velocity_texture, vec2(CUSTOM.y, 0.0), 0.0).r;\n";
|
code += " float tex_angular_velocity = textureLod(angular_velocity_texture, vec2(tv, 0.0), 0.0).r;\n";
|
||||||
else
|
else
|
||||||
code += " float tex_angular_velocity = 0.0;\n";
|
code += " float tex_angular_velocity = 0.0;\n";
|
||||||
|
|
||||||
if (tex_parameters[PARAM_LINEAR_ACCEL].is_valid())
|
if (tex_parameters[PARAM_LINEAR_ACCEL].is_valid())
|
||||||
code += " float tex_linear_accel = textureLod(linear_accel_texture, vec2(CUSTOM.y, 0.0), 0.0).r;\n";
|
code += " float tex_linear_accel = textureLod(linear_accel_texture, vec2(tv, 0.0), 0.0).r;\n";
|
||||||
else
|
else
|
||||||
code += " float tex_linear_accel = 0.0;\n";
|
code += " float tex_linear_accel = 0.0;\n";
|
||||||
|
|
||||||
if (tex_parameters[PARAM_RADIAL_ACCEL].is_valid())
|
if (tex_parameters[PARAM_RADIAL_ACCEL].is_valid())
|
||||||
code += " float tex_radial_accel = textureLod(radial_accel_texture, vec2(CUSTOM.y, 0.0), 0.0).r;\n";
|
code += " float tex_radial_accel = textureLod(radial_accel_texture, vec2(tv, 0.0), 0.0).r;\n";
|
||||||
else
|
else
|
||||||
code += " float tex_radial_accel = 0.0;\n";
|
code += " float tex_radial_accel = 0.0;\n";
|
||||||
|
|
||||||
if (tex_parameters[PARAM_TANGENTIAL_ACCEL].is_valid())
|
if (tex_parameters[PARAM_TANGENTIAL_ACCEL].is_valid())
|
||||||
code += " float tex_tangent_accel = textureLod(tangent_accel_texture, vec2(CUSTOM.y, 0.0), 0.0).r;\n";
|
code += " float tex_tangent_accel = textureLod(tangent_accel_texture, vec2(tv, 0.0), 0.0).r;\n";
|
||||||
else
|
else
|
||||||
code += " float tex_tangent_accel = 0.0;\n";
|
code += " float tex_tangent_accel = 0.0;\n";
|
||||||
|
|
||||||
if (tex_parameters[PARAM_DAMPING].is_valid())
|
if (tex_parameters[PARAM_DAMPING].is_valid())
|
||||||
code += " float tex_damping = textureLod(damping_texture, vec2(CUSTOM.y, 0.0), 0.0).r;\n";
|
code += " float tex_damping = textureLod(damping_texture, vec2(tv, 0.0), 0.0).r;\n";
|
||||||
else
|
else
|
||||||
code += " float tex_damping = 0.0;\n";
|
code += " float tex_damping = 0.0;\n";
|
||||||
|
|
||||||
if (tex_parameters[PARAM_ANGLE].is_valid())
|
if (tex_parameters[PARAM_ANGLE].is_valid())
|
||||||
code += " float tex_angle = textureLod(angle_texture, vec2(CUSTOM.y, 0.0), 0.0).r;\n";
|
code += " float tex_angle = textureLod(angle_texture, vec2(tv, 0.0), 0.0).r;\n";
|
||||||
else
|
else
|
||||||
code += " float tex_angle = 0.0;\n";
|
code += " float tex_angle = 0.0;\n";
|
||||||
|
|
||||||
if (tex_parameters[PARAM_ANIM_SPEED].is_valid())
|
if (tex_parameters[PARAM_ANIM_SPEED].is_valid())
|
||||||
code += " float tex_anim_speed = textureLod(anim_speed_texture, vec2(CUSTOM.y, 0.0), 0.0).r;\n";
|
code += " float tex_anim_speed = textureLod(anim_speed_texture, vec2(tv, 0.0), 0.0).r;\n";
|
||||||
else
|
else
|
||||||
code += " float tex_anim_speed = 0.0;\n";
|
code += " float tex_anim_speed = 0.0;\n";
|
||||||
|
|
||||||
if (tex_parameters[PARAM_ANIM_OFFSET].is_valid())
|
if (tex_parameters[PARAM_ANIM_OFFSET].is_valid())
|
||||||
code += " float tex_anim_offset = textureLod(anim_offset_texture, vec2(CUSTOM.y, 0.0), 0.0).r;\n";
|
code += " float tex_anim_offset = textureLod(anim_offset_texture, vec2(tv, 0.0), 0.0).r;\n";
|
||||||
else
|
else
|
||||||
code += " float tex_anim_offset = 0.0;\n";
|
code += " float tex_anim_offset = 0.0;\n";
|
||||||
|
|
||||||
|
@ -495,12 +498,12 @@ void ParticlesMaterial::_update_shader() {
|
||||||
// apply color
|
// apply color
|
||||||
// apply hue rotation
|
// apply hue rotation
|
||||||
if (tex_parameters[PARAM_SCALE].is_valid())
|
if (tex_parameters[PARAM_SCALE].is_valid())
|
||||||
code += " float tex_scale = textureLod(scale_texture, vec2(CUSTOM.y, 0.0), 0.0).r;\n";
|
code += " float tex_scale = textureLod(scale_texture, vec2(tv, 0.0), 0.0).r;\n";
|
||||||
else
|
else
|
||||||
code += " float tex_scale = 1.0;\n";
|
code += " float tex_scale = 1.0;\n";
|
||||||
|
|
||||||
if (tex_parameters[PARAM_HUE_VARIATION].is_valid())
|
if (tex_parameters[PARAM_HUE_VARIATION].is_valid())
|
||||||
code += " float tex_hue_variation = textureLod(hue_variation_texture, vec2(CUSTOM.y, 0.0), 0.0).r;\n";
|
code += " float tex_hue_variation = textureLod(hue_variation_texture, vec2(tv, 0.0), 0.0).r;\n";
|
||||||
else
|
else
|
||||||
code += " float tex_hue_variation = 0.0;\n";
|
code += " float tex_hue_variation = 0.0;\n";
|
||||||
|
|
||||||
|
@ -520,7 +523,7 @@ void ParticlesMaterial::_update_shader() {
|
||||||
code += " vec4(1.250, -1.050, -0.203, 0.0),\n";
|
code += " vec4(1.250, -1.050, -0.203, 0.0),\n";
|
||||||
code += " vec4(0.000, 0.000, 0.000, 0.0)) * hue_rot_s;\n";
|
code += " vec4(0.000, 0.000, 0.000, 0.0)) * hue_rot_s;\n";
|
||||||
if (color_ramp.is_valid()) {
|
if (color_ramp.is_valid()) {
|
||||||
code += " COLOR = hue_rot_mat * textureLod(color_ramp, vec2(CUSTOM.y, 0.0), 0.0);\n";
|
code += " COLOR = hue_rot_mat * textureLod(color_ramp, vec2(tv, 0.0), 0.0);\n";
|
||||||
} else {
|
} else {
|
||||||
code += " COLOR = hue_rot_mat * color_value;\n";
|
code += " COLOR = hue_rot_mat * color_value;\n";
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue