Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-07 13:49:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change curve range for particle multipliers

Browse source 
Fixes #91404
Curves are applied as a multiplier, so ranges [-1, 1] or [0, 1] make much more sense than ranges like [-360, 360] or [0, 100]. The actual range is selected with separate min and max parameters.
This commit is contained in:
aXu-AP 2024-05-04 13:12:27 +03:00 • committed by Thaddeus Crews
parent fbc9539764
commit c6021f1e5b
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
3 changed files with 46 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

45
scene/2d/cpu_particles_2d.cpp
View file

@ -396,42 +396,25 @@ 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_INITIAL_LINEAR_VELOCITY: { case PARAM_ANGULAR_VELOCITY:
//do none for this one case PARAM_ORBIT_VELOCITY:
} break; case PARAM_LINEAR_ACCEL:
case PARAM_ANGULAR_VELOCITY: { case PARAM_RADIAL_ACCEL:
_adjust_curve_range(p_curve, -360, 360); case PARAM_TANGENTIAL_ACCEL:
} break; case PARAM_ANGLE:
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_ANIM_SPEED: { case PARAM_DAMPING:
_adjust_curve_range(p_curve, 0, 200); case PARAM_SCALE:
} break; case PARAM_ANIM_SPEED:
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,42 +336,25 @@ 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_INITIAL_LINEAR_VELOCITY: { case PARAM_ANGULAR_VELOCITY:
//do none for this one case PARAM_ORBIT_VELOCITY:
} break; case PARAM_LINEAR_ACCEL:
case PARAM_ANGULAR_VELOCITY: { case PARAM_RADIAL_ACCEL:
_adjust_curve_range(p_curve, -360, 360); case PARAM_TANGENTIAL_ACCEL:
} break; case PARAM_ANGLE:
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_ANIM_SPEED: { case PARAM_DAMPING:
_adjust_curve_range(p_curve, 0, 200); case PARAM_SCALE:
} break; case PARAM_ANIM_SPEED:
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,37 +1461,34 @@ 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, -360, 360); _adjust_curve_range(p_texture, -1, 1);
} 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, -2, 2); _adjust_curve_range(p_texture, -1, 1);
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, -200, 200); _adjust_curve_range(p_texture, -1, 1);
} 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, -200, 200); _adjust_curve_range(p_texture, -1, 1);
} 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, -200, 200); _adjust_curve_range(p_texture, -1, 1);
} 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, 100); _adjust_curve_range(p_texture, 0, 1);
} 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, -360, 360); _adjust_curve_range(p_texture, -1, 1);
} 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);
@ -1503,35 +1500,36 @@ 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, 200); _adjust_curve_range(p_texture, 0, 1);
} 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, 3); _adjust_curve_range(p_texture, 0, 1);
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_MAX: case PARAM_INITIAL_LINEAR_VELOCITY:
break; // Can't happen, but silences warning case PARAM_TURB_VEL_INFLUENCE:
case PARAM_TURB_INIT_DISPLACEMENT:
case PARAM_MAX: {
// No curve available.
} break;
} }
_queue_shader_change(); _queue_shader_change();