noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Revert "Change curve range for particle multipliers"

Browse Source 
This reverts commit c6021f1e5b.

(cherry picked from commit ba5a0758e9a492e87dc79b057cc3c7119e055eec)
This commit is contained in:
Thaddeus Crews
2026-02-10 09:58:58 -06:00
parent 0591470c36
commit 8c223270f2
3 changed files with 82 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
scene/2d/cpu_particles_2d.cpp
View File

@@ -396,25 +396,42 @@ void CPUParticles2D::set_param_curve(Parameter p_param, const Ref<Curve> &p_curv
curve_parameters[p_param] = p_curve; curve_parameters[p_param] = p_curve;
switch (p_param) { switch (p_param) {
case PARAM_ANGULAR_VELOCITY: case PARAM_INITIAL_LINEAR_VELOCITY: {
case PARAM_ORBIT_VELOCITY: //do none for this one
case PARAM_LINEAR_ACCEL: } break;
case PARAM_RADIAL_ACCEL: case PARAM_ANGULAR_VELOCITY: {
case PARAM_TANGENTIAL_ACCEL: _adjust_curve_range(p_curve, -360, 360);
case PARAM_ANGLE: } break;
case PARAM_ORBIT_VELOCITY: {
_adjust_curve_range(p_curve, -500, 500);
} break;
case PARAM_LINEAR_ACCEL: {
_adjust_curve_range(p_curve, -200, 200);
} break;
case PARAM_RADIAL_ACCEL: {
_adjust_curve_range(p_curve, -200, 200);
} break;
case PARAM_TANGENTIAL_ACCEL: {
_adjust_curve_range(p_curve, -200, 200);
} break;
case PARAM_DAMPING: {
_adjust_curve_range(p_curve, 0, 100);
} break;
case PARAM_ANGLE: {
_adjust_curve_range(p_curve, -360, 360);
} break;
case PARAM_SCALE: {
} break;
case PARAM_HUE_VARIATION: { case PARAM_HUE_VARIATION: {
_adjust_curve_range(p_curve, -1, 1); _adjust_curve_range(p_curve, -1, 1);
} break; } break;
case PARAM_DAMPING: case PARAM_ANIM_SPEED: {
case PARAM_SCALE: _adjust_curve_range(p_curve, 0, 200);
case PARAM_ANIM_SPEED: } break;
case PARAM_ANIM_OFFSET: { case PARAM_ANIM_OFFSET: {
_adjust_curve_range(p_curve, 0, 1);
} break;
case PARAM_INITIAL_LINEAR_VELOCITY:
case PARAM_MAX: {
// No curve available.
} break; } break;
default: {
}
} }
update_configuration_warnings(); update_configuration_warnings();

45
scene/3d/cpu_particles_3d.cpp
View File

@@ -336,25 +336,42 @@ void CPUParticles3D::set_param_curve(Parameter p_param, const Ref<Curve> &p_curv
curve_parameters[p_param] = p_curve; curve_parameters[p_param] = p_curve;
switch (p_param) { switch (p_param) {
case PARAM_ANGULAR_VELOCITY: case PARAM_INITIAL_LINEAR_VELOCITY: {
case PARAM_ORBIT_VELOCITY: //do none for this one
case PARAM_LINEAR_ACCEL: } break;
case PARAM_RADIAL_ACCEL: case PARAM_ANGULAR_VELOCITY: {
case PARAM_TANGENTIAL_ACCEL: _adjust_curve_range(p_curve, -360, 360);
case PARAM_ANGLE: } break;
case PARAM_ORBIT_VELOCITY: {
_adjust_curve_range(p_curve, -500, 500);
} break;
case PARAM_LINEAR_ACCEL: {
_adjust_curve_range(p_curve, -200, 200);
} break;
case PARAM_RADIAL_ACCEL: {
_adjust_curve_range(p_curve, -200, 200);
} break;
case PARAM_TANGENTIAL_ACCEL: {
_adjust_curve_range(p_curve, -200, 200);
} break;
case PARAM_DAMPING: {
_adjust_curve_range(p_curve, 0, 100);
} break;
case PARAM_ANGLE: {
_adjust_curve_range(p_curve, -360, 360);
} break;
case PARAM_SCALE: {
} break;
case PARAM_HUE_VARIATION: { case PARAM_HUE_VARIATION: {
_adjust_curve_range(p_curve, -1, 1); _adjust_curve_range(p_curve, -1, 1);
} break; } break;
case PARAM_DAMPING: case PARAM_ANIM_SPEED: {
case PARAM_SCALE: _adjust_curve_range(p_curve, 0, 200);
case PARAM_ANIM_SPEED: } break;
case PARAM_ANIM_OFFSET: { case PARAM_ANIM_OFFSET: {
_adjust_curve_range(p_curve, 0, 1);
} break;
case PARAM_INITIAL_LINEAR_VELOCITY:
case PARAM_MAX: {
// No curve available.
} break; } break;
default: {
}
} }
update_configuration_warnings(); update_configuration_warnings();

38
scene/resources/particle_process_material.cpp
View File

@@ -1461,34 +1461,37 @@ void ParticleProcessMaterial::set_param_texture(Parameter p_param, const Ref<Tex
Variant tex_rid = p_texture.is_valid() ? Variant(p_texture->get_rid()) : Variant(); Variant tex_rid = p_texture.is_valid() ? Variant(p_texture->get_rid()) : Variant();
switch (p_param) { switch (p_param) {
case PARAM_INITIAL_LINEAR_VELOCITY: {
//do none for this one
} break;
case PARAM_ANGULAR_VELOCITY: { case PARAM_ANGULAR_VELOCITY: {
RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->angular_velocity_texture, tex_rid); RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->angular_velocity_texture, tex_rid);
_adjust_curve_range(p_texture, -1, 1); _adjust_curve_range(p_texture, -360, 360);
} break; } break;
case PARAM_ORBIT_VELOCITY: { case PARAM_ORBIT_VELOCITY: {
RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->orbit_velocity_texture, tex_rid); RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->orbit_velocity_texture, tex_rid);
_adjust_curve_range(p_texture, -1, 1); _adjust_curve_range(p_texture, -2, 2);
notify_property_list_changed(); notify_property_list_changed();
} break; } break;
case PARAM_LINEAR_ACCEL: { case PARAM_LINEAR_ACCEL: {
RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->linear_accel_texture, tex_rid); RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->linear_accel_texture, tex_rid);
_adjust_curve_range(p_texture, -1, 1); _adjust_curve_range(p_texture, -200, 200);
} break; } break;
case PARAM_RADIAL_ACCEL: { case PARAM_RADIAL_ACCEL: {
RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->radial_accel_texture, tex_rid); RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->radial_accel_texture, tex_rid);
_adjust_curve_range(p_texture, -1, 1); _adjust_curve_range(p_texture, -200, 200);
} break; } break;
case PARAM_TANGENTIAL_ACCEL: { case PARAM_TANGENTIAL_ACCEL: {
RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->tangent_accel_texture, tex_rid); RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->tangent_accel_texture, tex_rid);
_adjust_curve_range(p_texture, -1, 1); _adjust_curve_range(p_texture, -200, 200);
} break; } break;
case PARAM_DAMPING: { case PARAM_DAMPING: {
RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->damping_texture, tex_rid); RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->damping_texture, tex_rid);
_adjust_curve_range(p_texture, 0, 1); _adjust_curve_range(p_texture, 0, 100);
} break; } break;
case PARAM_ANGLE: { case PARAM_ANGLE: {
RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->angle_texture, tex_rid); RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->angle_texture, tex_rid);
_adjust_curve_range(p_texture, -1, 1); _adjust_curve_range(p_texture, -360, 360);
} break; } break;
case PARAM_SCALE: { case PARAM_SCALE: {
RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->scale_texture, tex_rid); RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->scale_texture, tex_rid);
@@ -1500,36 +1503,35 @@ void ParticleProcessMaterial::set_param_texture(Parameter p_param, const Ref<Tex
} break; } break;
case PARAM_ANIM_SPEED: { case PARAM_ANIM_SPEED: {
RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->anim_speed_texture, tex_rid); RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->anim_speed_texture, tex_rid);
_adjust_curve_range(p_texture, 0, 1); _adjust_curve_range(p_texture, 0, 200);
} break; } break;
case PARAM_ANIM_OFFSET: { case PARAM_ANIM_OFFSET: {
RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->anim_offset_texture, tex_rid); RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->anim_offset_texture, tex_rid);
_adjust_curve_range(p_texture, 0, 1);
} break; } break;
case PARAM_TURB_INFLUENCE_OVER_LIFE: { case PARAM_TURB_INFLUENCE_OVER_LIFE: {
RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->turbulence_influence_over_life, tex_rid); RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->turbulence_influence_over_life, tex_rid);
_adjust_curve_range(p_texture, 0, 1); _adjust_curve_range(p_texture, 0, 1);
} break; } break;
case PARAM_TURB_VEL_INFLUENCE: {
// Can't happen, but silences warning
} break;
case PARAM_TURB_INIT_DISPLACEMENT: {
// Can't happen, but silences warning
} break;
case PARAM_RADIAL_VELOCITY: { case PARAM_RADIAL_VELOCITY: {
RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->radial_velocity_texture, tex_rid); RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->radial_velocity_texture, tex_rid);
_adjust_curve_range(p_texture, 0, 1);
} break; } break;
case PARAM_SCALE_OVER_VELOCITY: { case PARAM_SCALE_OVER_VELOCITY: {
RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->scale_over_velocity_texture, tex_rid); RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->scale_over_velocity_texture, tex_rid);
_adjust_curve_range(p_texture, 0, 1); _adjust_curve_range(p_texture, 0, 3);
notify_property_list_changed(); notify_property_list_changed();
} break; } break;
case PARAM_DIRECTIONAL_VELOCITY: { case PARAM_DIRECTIONAL_VELOCITY: {
RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->directional_velocity_texture, tex_rid); RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->directional_velocity_texture, tex_rid);
_adjust_curve_range(p_texture, 0, 1);
notify_property_list_changed(); notify_property_list_changed();
} break; } break;
case PARAM_INITIAL_LINEAR_VELOCITY: case PARAM_MAX:
case PARAM_TURB_VEL_INFLUENCE: break; // Can't happen, but silences warning
case PARAM_TURB_INIT_DISPLACEMENT:
case PARAM_MAX: {
// No curve available.
} break;
} }
_queue_shader_change(); _queue_shader_change();