diff options
Diffstat (limited to 'scene/resources/particle_process_material.cpp')
| -rw-r--r-- | scene/resources/particle_process_material.cpp | 1218 |
1 files changed, 789 insertions, 429 deletions
diff --git a/scene/resources/particle_process_material.cpp b/scene/resources/particle_process_material.cpp index dbb286c6e7..3e710e1f27 100644 --- a/scene/resources/particle_process_material.cpp +++ b/scene/resources/particle_process_material.cpp @@ -50,6 +50,7 @@ void ParticleProcessMaterial::init_shaders() { shader_names->initial_angle_min = "initial_angle_min"; shader_names->angular_velocity_min = "angular_velocity_min"; shader_names->orbit_velocity_min = "orbit_velocity_min"; + shader_names->radial_velocity_min = "radial_velocity_min"; shader_names->linear_accel_min = "linear_accel_min"; shader_names->radial_accel_min = "radial_accel_min"; shader_names->tangent_accel_min = "tangent_accel_min"; @@ -58,11 +59,14 @@ void ParticleProcessMaterial::init_shaders() { shader_names->hue_variation_min = "hue_variation_min"; shader_names->anim_speed_min = "anim_speed_min"; shader_names->anim_offset_min = "anim_offset_min"; + shader_names->directional_velocity_min = "directional_velocity_min"; + shader_names->scale_over_velocity_min = "scale_over_velocity_min"; shader_names->initial_linear_velocity_max = "initial_linear_velocity_max"; shader_names->initial_angle_max = "initial_angle_max"; shader_names->angular_velocity_max = "angular_velocity_max"; shader_names->orbit_velocity_max = "orbit_velocity_max"; + shader_names->radial_velocity_max = "radial_velocity_max"; shader_names->linear_accel_max = "linear_accel_max"; shader_names->radial_accel_max = "radial_accel_max"; shader_names->tangent_accel_max = "tangent_accel_max"; @@ -71,22 +75,32 @@ void ParticleProcessMaterial::init_shaders() { shader_names->hue_variation_max = "hue_variation_max"; shader_names->anim_speed_max = "anim_speed_max"; shader_names->anim_offset_max = "anim_offset_max"; + shader_names->directional_velocity_max = "directional_velocity_max"; + shader_names->scale_over_velocity_max = "scale_over_velocity_max"; shader_names->angle_texture = "angle_texture"; shader_names->angular_velocity_texture = "angular_velocity_texture"; - shader_names->orbit_velocity_texture = "orbit_velocity_texture"; + shader_names->orbit_velocity_texture = "orbit_velocity_curve"; + shader_names->radial_velocity_texture = "radial_velocity_curve"; shader_names->linear_accel_texture = "linear_accel_texture"; shader_names->radial_accel_texture = "radial_accel_texture"; shader_names->tangent_accel_texture = "tangent_accel_texture"; shader_names->damping_texture = "damping_texture"; - shader_names->scale_texture = "scale_texture"; + shader_names->scale_texture = "scale_curve"; shader_names->hue_variation_texture = "hue_variation_texture"; shader_names->anim_speed_texture = "anim_speed_texture"; shader_names->anim_offset_texture = "anim_offset_texture"; + shader_names->directional_velocity_texture = "directional_velocity_curve"; + shader_names->scale_over_velocity_texture = "scale_over_velocity_curve"; shader_names->color = "color_value"; shader_names->color_ramp = "color_ramp"; + shader_names->alpha_ramp = "alpha_curve"; + shader_names->emission_ramp = "emission_curve"; shader_names->color_initial_ramp = "color_initial_ramp"; + shader_names->velocity_limit_curve = "velocity_limit_curve"; + shader_names->inherit_emitter_velocity_ratio = "inherit_emitter_velocity_ratio"; + shader_names->velocity_pivot = "velocity_pivot"; shader_names->emission_sphere_radius = "emission_sphere_radius"; shader_names->emission_box_extents = "emission_box_extents"; @@ -98,6 +112,8 @@ void ParticleProcessMaterial::init_shaders() { shader_names->emission_ring_height = "emission_ring_height"; shader_names->emission_ring_radius = "emission_ring_radius"; shader_names->emission_ring_inner_radius = "emission_ring_inner_radius"; + shader_names->emission_shape_offset = "emission_shape_offset"; + shader_names->emission_shape_scale = "emission_shape_scale"; shader_names->turbulence_enabled = "turbulence_enabled"; shader_names->turbulence_noise_strength = "turbulence_noise_strength"; @@ -134,7 +150,7 @@ void ParticleProcessMaterial::_update_shader() { dirty_materials->remove(&element); MaterialKey mk = _compute_key(); - if (mk.key == current_key.key) { + if (mk == current_key) { return; //no update required in the end } @@ -160,6 +176,7 @@ void ParticleProcessMaterial::_update_shader() { String code = "// NOTE: Shader automatically converted from " VERSION_NAME " " VERSION_FULL_CONFIG "'s ParticleProcessMaterial.\n\n"; code += "shader_type particles;\n"; + code += "render_mode disable_velocity;\n"; if (collision_scale) { code += "render_mode collision_use_scale;\n"; @@ -168,32 +185,61 @@ void ParticleProcessMaterial::_update_shader() { code += "uniform vec3 direction;\n"; code += "uniform float spread;\n"; code += "uniform float flatness;\n"; + + code += "uniform float inherit_emitter_velocity_ratio = 0;\n"; + code += "uniform float initial_linear_velocity_min;\n"; - code += "uniform float initial_angle_min;\n"; + code += "uniform float initial_linear_velocity_max;\n"; + + code += "uniform float directional_velocity_min;\n"; + code += "uniform float directional_velocity_max;\n"; + code += "uniform float angular_velocity_min;\n"; + code += "uniform float angular_velocity_max;\n"; + code += "uniform float orbit_velocity_min;\n"; + code += "uniform float orbit_velocity_max;\n"; + + code += "uniform float radial_velocity_min;\n"; + code += "uniform float radial_velocity_max;\n"; + code += "uniform float linear_accel_min;\n"; + code += "uniform float linear_accel_max;\n"; + code += "uniform float radial_accel_min;\n"; + code += "uniform float radial_accel_max;\n"; + code += "uniform float tangent_accel_min;\n"; + code += "uniform float tangent_accel_max;\n"; + code += "uniform float damping_min;\n"; - code += "uniform float scale_min;\n"; - code += "uniform float hue_variation_min;\n"; - code += "uniform float anim_speed_min;\n"; - code += "uniform float anim_offset_min;\n"; + code += "uniform float damping_max;\n"; - code += "uniform float initial_linear_velocity_max;\n"; + code += "uniform float initial_angle_min;\n"; code += "uniform float initial_angle_max;\n"; - code += "uniform float angular_velocity_max;\n"; - code += "uniform float orbit_velocity_max;\n"; - code += "uniform float linear_accel_max;\n"; - code += "uniform float radial_accel_max;\n"; - code += "uniform float tangent_accel_max;\n"; - code += "uniform float damping_max;\n"; + + code += "uniform float scale_min;\n"; code += "uniform float scale_max;\n"; + + code += "uniform float hue_variation_min;\n"; code += "uniform float hue_variation_max;\n"; + + code += "uniform float anim_speed_min;\n"; code += "uniform float anim_speed_max;\n"; + + code += "uniform float anim_offset_min;\n"; code += "uniform float anim_offset_max;\n"; + code += "uniform float lifetime_randomness;\n"; + code += "uniform vec3 emission_shape_offset = vec3(0.);\n"; + code += "uniform vec3 emission_shape_scale = vec3(1.);\n"; + + code += "uniform vec3 velocity_pivot = vec3(0.);\n"; + + if (tex_parameters[PARAM_SCALE_OVER_VELOCITY].is_valid()) { + code += "uniform float scale_over_velocity_min = 0.0;\n"; + code += "uniform float scale_over_velocity_max = 5.0;\n"; + } switch (emission_shape) { case EMISSION_SHAPE_POINT: { @@ -254,12 +300,18 @@ void ParticleProcessMaterial::_update_shader() { if (color_initial_ramp.is_valid()) { code += "uniform sampler2D color_initial_ramp : repeat_disable;\n"; } + if (alpha_curve.is_valid()) { + code += "uniform sampler2D alpha_curve : repeat_disable;\n"; + } + if (emission_curve.is_valid()) { + code += "uniform sampler2D emission_curve : repeat_disable;\n"; + } if (tex_parameters[PARAM_INITIAL_LINEAR_VELOCITY].is_valid()) { code += "uniform sampler2D linear_velocity_texture : repeat_disable;\n"; } if (tex_parameters[PARAM_ORBIT_VELOCITY].is_valid()) { - code += "uniform sampler2D orbit_velocity_texture : repeat_disable;\n"; + code += "uniform sampler2D orbit_velocity_curve : repeat_disable;\n"; } if (tex_parameters[PARAM_ANGULAR_VELOCITY].is_valid()) { code += "uniform sampler2D angular_velocity_texture : repeat_disable;\n"; @@ -280,16 +332,28 @@ void ParticleProcessMaterial::_update_shader() { code += "uniform sampler2D angle_texture : repeat_disable;\n"; } if (tex_parameters[PARAM_SCALE].is_valid()) { - code += "uniform sampler2D scale_texture : repeat_disable;\n"; + code += "uniform sampler2D scale_curve : repeat_disable;\n"; } if (tex_parameters[PARAM_HUE_VARIATION].is_valid()) { - code += "uniform sampler2D hue_variation_texture : repeat_disable;\n"; + code += "uniform sampler2D hue_rot_curve : repeat_disable;\n"; } if (tex_parameters[PARAM_ANIM_SPEED].is_valid()) { - code += "uniform sampler2D anim_speed_texture : repeat_disable;\n"; + code += "uniform sampler2D animation_speed_curve : repeat_disable;\n"; } if (tex_parameters[PARAM_ANIM_OFFSET].is_valid()) { - code += "uniform sampler2D anim_offset_texture : repeat_disable;\n"; + code += "uniform sampler2D animation_offset_curve : repeat_disable;\n"; + } + if (tex_parameters[PARAM_RADIAL_VELOCITY].is_valid()) { + code += "uniform sampler2D radial_velocity_curve : repeat_disable;\n"; + } + if (tex_parameters[PARAM_SCALE_OVER_VELOCITY].is_valid()) { + code += "uniform sampler2D scale_over_velocity_curve : repeat_disable;\n"; + } + if (tex_parameters[PARAM_DIRECTIONAL_VELOCITY].is_valid()) { + code += "uniform sampler2D directional_velocity_curve: repeat_disable;\n"; + } + if (velocity_limit_curve.is_valid()) { + code += "uniform sampler2D velocity_limit_curve: repeat_disable;\n"; } if (collision_mode == COLLISION_RIGID) { @@ -390,6 +454,23 @@ void ParticleProcessMaterial::_update_shader() { code += " return noise_direction;\n"; code += "}\n"; } + code += "vec4 rotate_hue(vec4 current_color, float hue_rot_angle){\n"; + code += " float hue_rot_c = cos(hue_rot_angle);\n"; + code += " float hue_rot_s = sin(hue_rot_angle);\n"; + code += " mat4 hue_rot_mat = mat4(vec4(0.299, 0.587, 0.114, 0.0),\n"; + code += " vec4(0.299, 0.587, 0.114, 0.0),\n"; + code += " vec4(0.299, 0.587, 0.114, 0.0),\n"; + code += " vec4(0.000, 0.000, 0.000, 1.0)) +\n"; + code += " mat4(vec4(0.701, -0.587, -0.114, 0.0),\n"; + code += " vec4(-0.299, 0.413, -0.114, 0.0),\n"; + code += " vec4(-0.300, -0.588, 0.886, 0.0),\n"; + code += " vec4(0.000, 0.000, 0.000, 0.0)) * hue_rot_c +\n"; + code += " mat4(vec4(0.168, 0.330, -0.497, 0.0),\n"; + code += " vec4(-0.328, 0.035, 0.292, 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 += " return hue_rot_mat * current_color;\n"; + code += "}\n"; //need a random function code += "\n\n"; @@ -421,398 +502,528 @@ void ParticleProcessMaterial::_update_shader() { code += "}\n"; code += "\n"; - code += "void start() {\n"; - code += " uint base_number = NUMBER;\n"; - code += " uint alt_seed = hash(base_number + uint(1) + RANDOM_SEED);\n"; - code += " float angle_rand = rand_from_seed(alt_seed);\n"; - code += " float scale_rand = rand_from_seed(alt_seed);\n"; - code += " float hue_rot_rand = rand_from_seed(alt_seed);\n"; - code += " float anim_offset_rand = rand_from_seed(alt_seed);\n"; - if (color_initial_ramp.is_valid()) { - code += " float color_initial_rand = rand_from_seed(alt_seed);\n"; + code += "struct DisplayParameters{\n"; + code += " vec3 scale;\n"; + code += " float hue_rotation;\n"; + code += " float animation_speed;\n"; + code += " float animation_offset;\n"; + code += " float lifetime;\n"; + code += " vec4 color;\n"; + code += "};\n"; + code += "\n"; + code += "struct DynamicsParameters{\n"; + code += " float angle;\n"; + code += " float angular_velocity;\n"; + code += " float initial_velocity_multiplier;\n"; + code += " float directional_velocity;\n"; + code += " float radial_velocity;\n"; + code += " float orbit_velocity;\n"; + if (turbulence_enabled) { + code += " float turb_influence;\n"; + } + code += "};\n"; + code += "struct PhysicalParameters{\n"; + code += " float linear_accel;\n"; + code += " float radial_accel;\n"; + code += " float tangent_accel;\n"; + code += " float damping;\n"; + code += "};\n"; + + code += "\n"; + code += "void calculate_initial_physical_params(inout PhysicalParameters params, inout uint alt_seed){\n"; + code += " params.linear_accel = mix(linear_accel_min, linear_accel_min ,rand_from_seed(alt_seed));\n"; + code += " params.radial_accel = mix(radial_accel_min, radial_accel_min,rand_from_seed(alt_seed));\n"; + code += " params.tangent_accel = mix(tangent_accel_min, tangent_accel_max,rand_from_seed(alt_seed));\n"; + code += " params.damping = mix(damping_min, damping_max,rand_from_seed(alt_seed));\n"; + code += "}\n"; + code += "\n"; + code += "void calculate_initial_dynamics_params(inout DynamicsParameters params,inout uint alt_seed){\n"; + code += " // -------------------- DO NOT REORDER OPERATIONS, IT BREAKS VISUAL COMPATIBILITY\n"; + code += " // -------------------- ADD NEW OPERATIONS AT THE BOTTOM\n"; + code += " params.angle = mix(initial_angle_min, initial_angle_max, rand_from_seed(alt_seed));\n"; + code += " params.angular_velocity = mix(angular_velocity_min, angular_velocity_max, rand_from_seed(alt_seed));\n"; + code += " params.initial_velocity_multiplier = mix(initial_linear_velocity_min, initial_linear_velocity_max,rand_from_seed(alt_seed));\n"; + code += " params.directional_velocity = mix(directional_velocity_min, directional_velocity_max,rand_from_seed(alt_seed));\n"; + code += " params.radial_velocity = mix(radial_velocity_min, radial_velocity_max,rand_from_seed(alt_seed));\n"; + code += " params.orbit_velocity = mix(orbit_velocity_min, orbit_velocity_max,rand_from_seed(alt_seed));\n"; + if (turbulence_enabled) { + code += " params.turb_influence = mix(turbulence_influence_min,turbulence_influence_max,rand_from_seed(alt_seed));\n"; } + code += "}\n"; + code += "void calculate_initial_display_params(inout DisplayParameters params,inout uint alt_seed){\n"; + code += " // -------------------- DO NOT REORDER OPERATIONS, IT BREAKS VISUAL COMPATIBILITY\n"; + code += " // -------------------- ADD NEW OPERATIONS AT THE BOTTOM\n"; code += " float pi = 3.14159;\n"; code += " float degree_to_rad = pi / 180.0;\n"; - code += "\n"; - if (emission_shape == EMISSION_SHAPE_POINTS || emission_shape == EMISSION_SHAPE_DIRECTED_POINTS) { + code += " params.scale = vec3(mix(scale_min, scale_max, rand_from_seed(alt_seed)));\n"; + code += " params.scale = sign(params.scale) * max(abs(params.scale), 0.001);\n"; + code += " params.hue_rotation = pi * 2.0 * mix(hue_variation_min, hue_variation_max, rand_from_seed(alt_seed));\n"; + code += " params.animation_speed = mix(anim_speed_min, anim_speed_max, rand_from_seed(alt_seed));\n"; + code += " params.animation_offset = mix(anim_offset_min, anim_offset_max, rand_from_seed(alt_seed));\n"; + code += " params.lifetime = (1.0 - lifetime_randomness * rand_from_seed(alt_seed));\n"; + code += " params.color = color_value;\n"; + if (color_initial_ramp.is_valid()) { + code += " params.color = texture(color_initial_ramp, vec2(rand_from_seed(alt_seed)));\n"; + } + if (emission_color_texture.is_valid() && (emission_shape == EMISSION_SHAPE_POINTS || emission_shape == EMISSION_SHAPE_DIRECTED_POINTS)) { code += " int point = min(emission_texture_point_count - 1, int(rand_from_seed(alt_seed) * float(emission_texture_point_count)));\n"; code += " ivec2 emission_tex_size = textureSize(emission_texture_points, 0);\n"; code += " ivec2 emission_tex_ofs = ivec2(point % emission_tex_size.x, point / emission_tex_size.x);\n"; + code += " parameters.color *= texelFetch(emission_texture_color, emission_tex_ofs, 0);\n"; } - if (tex_parameters[PARAM_ANGLE].is_valid()) { - code += " float tex_angle = textureLod(angle_texture, vec2(0.0, 0.0), 0.0).r;\n"; - } else { - code += " float tex_angle = 1.0;\n"; - } + code += "}\n"; - if (tex_parameters[PARAM_ANIM_OFFSET].is_valid()) { - code += " float tex_anim_offset = textureLod(anim_offset_texture, vec2(0.0, 0.0), 0.0).r;\n"; - } else { - code += " float tex_anim_offset = 1.0;\n"; + // process display parameters that are bound solely by lifetime + code += "void process_display_param(inout DisplayParameters parameters, float lifetime){\n"; + code += " // compile-time add textures\n"; + if (tex_parameters[PARAM_SCALE].is_valid()) { + code += " parameters.scale *= texture(scale_curve, vec2(lifetime)).rgb;\n"; } - - code += " float spread_rad = spread * degree_to_rad;\n"; - - code += " if (RESTART_VELOCITY) {\n"; - - if (tex_parameters[PARAM_INITIAL_LINEAR_VELOCITY].is_valid()) { - code += " float tex_linear_velocity = textureLod(linear_velocity_texture, vec2(0.0, 0.0), 0.0).r;\n"; - } else { - code += " float tex_linear_velocity = 1.0;\n"; + if (tex_parameters[PARAM_HUE_VARIATION].is_valid()) { + code += " parameters.hue_rotation *= texture(hue_rot_curve, vec2(lifetime)).r;\n"; } - - if (particle_flags[PARTICLE_FLAG_DISABLE_Z]) { - code += " {\n"; - code += " float angle1_rad = rand_from_seed_m1_p1(alt_seed) * spread_rad;\n"; - code += " angle1_rad += direction.x != 0.0 ? atan(direction.y, direction.x) : sign(direction.y) * (pi / 2.0);\n"; - code += " vec3 rot = vec3(cos(angle1_rad), sin(angle1_rad), 0.0);\n"; - code += " VELOCITY = rot * mix(initial_linear_velocity_min,initial_linear_velocity_max, rand_from_seed(alt_seed));\n"; - code += " }\n"; - - } else { - //initiate velocity spread in 3D - code += " {\n"; - code += " float angle1_rad = rand_from_seed_m1_p1(alt_seed) * spread_rad;\n"; - code += " float angle2_rad = rand_from_seed_m1_p1(alt_seed) * spread_rad * (1.0 - flatness);\n"; - code += " vec3 direction_xz = vec3(sin(angle1_rad), 0.0, cos(angle1_rad));\n"; - code += " vec3 direction_yz = vec3(0.0, sin(angle2_rad), cos(angle2_rad));\n"; - code += " direction_yz.z = direction_yz.z / max(0.0001,sqrt(abs(direction_yz.z))); // better uniform distribution\n"; - code += " vec3 spread_direction = vec3(direction_xz.x * direction_yz.z, direction_yz.y, direction_xz.z * direction_yz.z);\n"; - code += " vec3 direction_nrm = length(direction) > 0.0 ? normalize(direction) : vec3(0.0, 0.0, 1.0);\n"; - code += " // rotate spread to direction\n"; - code += " vec3 binormal = cross(vec3(0.0, 1.0, 0.0), direction_nrm);\n"; - code += " if (length(binormal) < 0.0001) {\n"; - code += " // direction is parallel to Y. Choose Z as the binormal.\n"; - code += " binormal = vec3(0.0, 0.0, 1.0);\n"; - code += " }\n"; - code += " binormal = normalize(binormal);\n"; - code += " vec3 normal = cross(binormal, direction_nrm);\n"; - code += " spread_direction = binormal * spread_direction.x + normal * spread_direction.y + direction_nrm * spread_direction.z;\n"; - code += " VELOCITY = spread_direction * mix(initial_linear_velocity_min, initial_linear_velocity_max,rand_from_seed(alt_seed));\n"; - code += " }\n"; + if (tex_parameters[PARAM_ANIM_OFFSET].is_valid()) { + code += " parameters.animation_offset += texture(animation_offset_curve, vec2(lifetime)).r;\n"; } - code += " }\n"; - - code += " float base_angle = (tex_angle) * mix(initial_angle_min, initial_angle_max, angle_rand);\n"; - code += " CUSTOM.x = base_angle * degree_to_rad;\n"; // angle - code += " CUSTOM.y = 0.0;\n"; // phase - code += " CUSTOM.w = (1.0 - lifetime_randomness * rand_from_seed(alt_seed));\n"; - code += " CUSTOM.z = (tex_anim_offset) * mix(anim_offset_min, anim_offset_max, anim_offset_rand);\n\n"; // animation offset (0-1) - - code += " if (RESTART_ROT_SCALE) {\n"; - code += " TRANSFORM[0].xyz = vec3(1.0, 0.0, 0.0);\n"; - code += " TRANSFORM[1].xyz = vec3(0.0, 1.0, 0.0);\n"; - code += " TRANSFORM[2].xyz = vec3(0.0, 0.0, 1.0);\n"; - code += " }\n\n"; - - code += " if (RESTART_POSITION) {\n"; - - switch (emission_shape) { - case EMISSION_SHAPE_POINT: { - //do none, identity (will later be multiplied by emission transform) - code += " TRANSFORM[3].xyz = vec3(0.0, 0.0, 0.0);\n"; - } break; - case EMISSION_SHAPE_SPHERE: { - code += " float s = rand_from_seed(alt_seed) * 2.0 - 1.0;\n"; - code += " float t = rand_from_seed(alt_seed) * 2.0 * pi;\n"; - code += " float p = rand_from_seed(alt_seed);\n"; - code += " float radius = emission_sphere_radius * sqrt(1.0 - s * s);\n"; - code += " TRANSFORM[3].xyz = mix(vec3(0.0, 0.0, 0.0), vec3(radius * cos(t), radius * sin(t), emission_sphere_radius * s), p);\n"; - } break; - case EMISSION_SHAPE_SPHERE_SURFACE: { - code += " float s = rand_from_seed(alt_seed) * 2.0 - 1.0;\n"; - code += " float t = rand_from_seed(alt_seed) * 2.0 * pi;\n"; - code += " float radius = emission_sphere_radius * sqrt(1.0 - s * s);\n"; - code += " TRANSFORM[3].xyz = vec3(radius * cos(t), radius * sin(t), emission_sphere_radius * s);\n"; - } break; - case EMISSION_SHAPE_BOX: { - code += " TRANSFORM[3].xyz = vec3(rand_from_seed(alt_seed) * 2.0 - 1.0, rand_from_seed(alt_seed) * 2.0 - 1.0, rand_from_seed(alt_seed) * 2.0 - 1.0) * emission_box_extents;\n"; - } break; - case EMISSION_SHAPE_POINTS: - case EMISSION_SHAPE_DIRECTED_POINTS: { - code += " TRANSFORM[3].xyz = texelFetch(emission_texture_points, emission_tex_ofs, 0).xyz;\n"; - - if (emission_shape == EMISSION_SHAPE_DIRECTED_POINTS) { - if (particle_flags[PARTICLE_FLAG_DISABLE_Z]) { - code += " {\n"; - code += " mat2 rotm;"; - code += " rotm[0] = texelFetch(emission_texture_normal, emission_tex_ofs, 0).xy;\n"; - code += " rotm[1] = rotm[0].yx * vec2(1.0, -1.0);\n"; - code += " if (RESTART_VELOCITY) VELOCITY.xy = rotm * VELOCITY.xy;\n"; - code += " }\n"; - } else { - code += " {\n"; - code += " vec3 normal = texelFetch(emission_texture_normal, emission_tex_ofs, 0).xyz;\n"; - code += " vec3 v0 = abs(normal.z) < 0.999 ? vec3(0.0, 0.0, 1.0) : vec3(0.0, 1.0, 0.0);\n"; - code += " vec3 tangent = normalize(cross(v0, normal));\n"; - code += " vec3 bitangent = normalize(cross(tangent, normal));\n"; - code += " if (RESTART_VELOCITY) VELOCITY = mat3(tangent, bitangent, normal) * VELOCITY;\n"; - code += " }\n"; - } - } - } break; - case EMISSION_SHAPE_RING: { - code += " float ring_spawn_angle = rand_from_seed(alt_seed) * 2.0 * pi;\n"; - code += " float ring_random_radius = rand_from_seed(alt_seed) * (emission_ring_radius - emission_ring_inner_radius) + emission_ring_inner_radius;\n"; - code += " vec3 axis = normalize(emission_ring_axis);\n"; - code += " vec3 ortho_axis = vec3(0.0);\n"; - code += " if (axis == vec3(1.0, 0.0, 0.0)) {\n"; - code += " ortho_axis = cross(axis, vec3(0.0, 1.0, 0.0));\n"; - code += " } else {\n"; - code += " ortho_axis = cross(axis, vec3(1.0, 0.0, 0.0));\n"; - code += " }\n"; - code += " ortho_axis = normalize(ortho_axis);\n"; - code += " float s = sin(ring_spawn_angle);\n"; - code += " float c = cos(ring_spawn_angle);\n"; - code += " float oc = 1.0 - c;\n"; - code += " ortho_axis = mat3(\n"; - code += " vec3(c + axis.x * axis.x * oc, axis.x * axis.y * oc - axis.z * s, axis.x * axis.z *oc + axis.y * s),\n"; - code += " vec3(axis.x * axis.y * oc + s * axis.z, c + axis.y * axis.y * oc, axis.y * axis.z * oc - axis.x * s),\n"; - code += " vec3(axis.z * axis.x * oc - axis.y * s, axis.z * axis.y * oc + axis.x * s, c + axis.z * axis.z * oc)\n"; - code += " ) * ortho_axis;\n"; - code += " ortho_axis = normalize(ortho_axis);\n"; - code += " TRANSFORM[3].xyz = ortho_axis * ring_random_radius + (rand_from_seed(alt_seed) * emission_ring_height - emission_ring_height / 2.0) * axis;\n"; - } break; - case EMISSION_SHAPE_MAX: { // Max value for validity check. - break; - } + if (tex_parameters[PARAM_ANIM_SPEED].is_valid()) { + code += " parameters.animation_speed *= texture(animation_speed_curve, vec2(lifetime)).r;\n"; } - code += " if (RESTART_VELOCITY) VELOCITY = (EMISSION_TRANSFORM * vec4(VELOCITY, 0.0)).xyz;\n"; - // Apply noise/turbulence: initial displacement. - if (turbulence_enabled) { - code += " vec3 noise_direction = get_noise_direction(TRANSFORM[3].xyz);\n"; - code += " float turb_init_displacement = mix(turbulence_initial_displacement_min, turbulence_initial_displacement_max, rand_from_seed(alt_seed));"; - code += " TRANSFORM[3].xyz += noise_direction * turb_init_displacement;\n"; + if (color_ramp.is_valid()) { + code += " parameters.color *= texture(color_ramp, vec2(lifetime));\n"; } - code += " TRANSFORM = EMISSION_TRANSFORM * TRANSFORM;\n"; - if (particle_flags[PARTICLE_FLAG_DISABLE_Z]) { - code += " VELOCITY.z = 0.0;\n"; - code += " TRANSFORM[3].z = 0.0;\n"; + if (alpha_curve.is_valid()) { + code += " parameters.color.a *= texture(alpha_curve, vec2(lifetime)).r;\n"; } - code += " }\n"; - code += "}\n\n"; - - code += "void process() {\n"; - code += " uint base_number = NUMBER;\n"; - code += " uint alt_seed = hash(base_number + uint(1) + RANDOM_SEED);\n"; - code += " float angle_rand = rand_from_seed(alt_seed);\n"; - code += " float scale_rand = rand_from_seed(alt_seed);\n"; - code += " float hue_rot_rand = rand_from_seed(alt_seed);\n"; - code += " float anim_offset_rand = rand_from_seed(alt_seed);\n"; - if (color_initial_ramp.is_valid()) { - code += " float color_initial_rand = rand_from_seed(alt_seed);\n"; + code += " parameters.color = rotate_hue(parameters.color, parameters.hue_rotation);\n"; + if (emission_curve.is_valid()) { + code += " parameters.color.rgb *= 1.0 + texture(emission_curve, vec2(lifetime)).r;\n"; } + code += "}\n"; + + code += "vec3 calculate_initial_position(inout uint alt_seed) {\n"; code += " float pi = 3.14159;\n"; code += " float degree_to_rad = pi / 180.0;\n"; - code += "\n"; - - if (emission_shape == EMISSION_SHAPE_POINTS || emission_shape == EMISSION_SHAPE_DIRECTED_POINTS) { - code += " int point = min(emission_texture_point_count - 1, int(rand_from_seed(alt_seed) * float(emission_texture_point_count)));\n"; - code += " ivec2 emission_tex_size = textureSize(emission_texture_points, 0);\n"; - code += " ivec2 emission_tex_ofs = ivec2(point % emission_tex_size.x, point / emission_tex_size.x);\n"; + code += " vec3 pos = vec3(0.);\n"; + if (emission_shape == EMISSION_SHAPE_POINT) { + code += " pos = vec3(0.);\n"; } - - code += " CUSTOM.y += DELTA / LIFETIME;\n"; - code += " float tv = CUSTOM.y / CUSTOM.w;\n"; - if (tex_parameters[PARAM_INITIAL_LINEAR_VELOCITY].is_valid()) { - code += " float tex_linear_velocity = textureLod(linear_velocity_texture, vec2(tv, 0.0), 0.0).r;\n"; - } else { - code += " float tex_linear_velocity = 1.0;\n"; + if (emission_shape == EMISSION_SHAPE_SPHERE) { + code += " float s = rand_from_seed(alt_seed) * 2.0 - 1.0;\n"; + code += " float t = rand_from_seed(alt_seed) * 2.0 * pi;\n"; + code += " float p = rand_from_seed(alt_seed);\n"; + code += " float radius = emission_sphere_radius * sqrt(1.0 - s * s);\n"; + code += " pos = mix(vec3(0.0, 0.0, 0.0), vec3(radius * cos(t), radius * sin(t), emission_sphere_radius * s), p);\n"; } - if (particle_flags[PARTICLE_FLAG_DISABLE_Z]) { - if (tex_parameters[PARAM_ORBIT_VELOCITY].is_valid()) { - code += " float tex_orbit_velocity = textureLod(orbit_velocity_texture, vec2(tv, 0.0), 0.0).r;\n"; + if (emission_shape == EMISSION_SHAPE_SPHERE_SURFACE) { + code += " float s = rand_from_seed(alt_seed) * 2.0 - 1.0;\n"; + code += " float t = rand_from_seed(alt_seed) * 2.0 * pi;\n"; + code += " float radius = emission_sphere_radius * sqrt(1.0 - s * s);\n"; + code += " pos = vec3(radius * cos(t), radius * sin(t), emission_sphere_radius * s);\n"; + } + if (emission_shape == EMISSION_SHAPE_BOX) { + code += " pos = vec3(rand_from_seed(alt_seed) * 2.0 - 1.0, rand_from_seed(alt_seed) * 2.0 - 1.0, rand_from_seed(alt_seed) * 2.0 - 1.0) * emission_box_extents;\n"; + } + if (emission_shape == EMISSION_SHAPE_POINTS || emission_shape == EMISSION_SHAPE_DIRECTED_POINTS) { + code += " int point = min(emission_texture_point_count - 1, int(rand_from_seed(alt_seed) * float(emission_texture_point_count)));\n"; + code += " ivec2 emission_tex_size = textureSize(emission_texture_points, 0);\n"; + code += " ivec2 emission_tex_ofs = ivec2(point % emission_tex_size.x, point / emission_tex_size.x);\n"; + code += " pos = texelFetch(emission_texture_points, emission_tex_ofs, 0).xyz;\n"; + } + if (emission_shape == EMISSION_SHAPE_RING) { + code += " \n"; + code += " float ring_spawn_angle = rand_from_seed(alt_seed) * 2.0 * pi;\n"; + code += " float ring_random_radius = rand_from_seed(alt_seed) * (emission_ring_radius - emission_ring_inner_radius) + emission_ring_inner_radius;\n"; + code += " vec3 axis = normalize(emission_ring_axis);\n"; + code += " vec3 ortho_axis = vec3(0.0);\n"; + code += " if (axis == vec3(1.0, 0.0, 0.0)) {\n"; + code += " ortho_axis = cross(axis, vec3(0.0, 1.0, 0.0));\n"; + code += " } else {\n"; + code += " ortho_axis = cross(axis, vec3(1.0, 0.0, 0.0));\n"; + code += " }\n"; + code += " ortho_axis = normalize(ortho_axis);\n"; + code += " float s = sin(ring_spawn_angle);\n"; + code += " float c = cos(ring_spawn_angle);\n"; + code += " float oc = 1.0 - c;\n"; + code += " ortho_axis = mat3(\n"; + code += " vec3(c + axis.x * axis.x * oc, axis.x * axis.y * oc - axis.z * s, axis.x * axis.z *oc + axis.y * s),\n"; + code += " vec3(axis.x * axis.y * oc + s * axis.z, c + axis.y * axis.y * oc, axis.y * axis.z * oc - axis.x * s),\n"; + code += " vec3(axis.z * axis.x * oc - axis.y * s, axis.z * axis.y * oc + axis.x * s, c + axis.z * axis.z * oc)\n"; + code += " ) * ortho_axis;\n"; + code += " ortho_axis = normalize(ortho_axis);\n"; + code += " pos = ortho_axis * ring_random_radius + (rand_from_seed(alt_seed) * emission_ring_height - emission_ring_height / 2.0) * axis;\n"; + } + + code += " return pos * emission_shape_scale + emission_shape_offset;\n"; + code += "}\n"; + code += "\n"; + if (tex_parameters[PARAM_ORBIT_VELOCITY].is_valid() || particle_flags[PARTICLE_FLAG_DISABLE_Z]) { + code += "vec3 process_orbit_displacement(DynamicsParameters param, float lifetime, inout uint alt_seed, mat4 transform, mat4 emission_transform,float delta, float total_lifetime){\n"; + // No reason to run all these expensive calculation below if we have no orbit velocity + // HOWEVER + // May be a bad idea for fps consistency? + code += "if(abs(param.orbit_velocity) < 0.01){ return vec3(0.0);}\n"; + code += "\n"; + code += " vec3 displacement = vec3(0.);\n"; + code += " float pi = 3.14159;\n"; + code += " float degree_to_rad = pi / 180.0;\n"; + if (particle_flags[PARTICLE_FLAG_DISABLE_Z]) { + code += " float orbit_amount = param.orbit_velocity;\n"; + + if (tex_parameters[PARAM_ORBIT_VELOCITY].is_valid()) { + code += " orbit_amount *= texture(orbit_velocity_curve, vec2(lifetime)).r;\n"; + } + code += " if (orbit_amount != 0.0) {\n"; + code += " vec3 pos = transform[3].xyz;\n"; + code += " vec3 org = emission_transform[3].xyz;\n"; + code += " vec3 diff = pos - org;\n"; + code += " float ang = orbit_amount * delta * pi * 2.0;\n"; + code += " mat2 rot = mat2(vec2(cos(ang), -sin(ang)), vec2(sin(ang), cos(ang)));\n"; + code += " displacement.xy -= diff.xy;\n"; + code += " displacement.xy += rot * diff.xy;\n"; + code += " }\n"; } else { - code += " float tex_orbit_velocity = 1.0;\n"; + code += " vec3 orbit_velocities = vec3(param.orbit_velocity);\n"; + code += " orbit_velocities *= texture(orbit_velocity_curve, vec2(lifetime)).rgb;\n"; + + code += " orbit_velocities *= degree_to_rad;\n"; + code += " orbit_velocities *= delta/total_lifetime; // we wanna process those by the delta angle\n"; + code += " //vec3 local_velocity_pivot = ((emission_transform) * vec4(velocity_pivot,1.0)).xyz;\n"; + code += " // X axis\n"; + code += " vec3 local_pos = (inverse(emission_transform) * transform[3]).xyz;\n"; + code += " local_pos -= velocity_pivot;\n"; + code += " local_pos.x = 0.;\n"; + code += " mat3 x_rotation_mat = mat3(\n"; + code += " vec3(1.0,0.0,0.0),\n"; + code += " vec3(0.0, cos(orbit_velocities.x), sin(orbit_velocities.x)),\n"; + code += " vec3(0.0, -sin(orbit_velocities.x), cos(orbit_velocities.x))\n"; + code += " );\n"; + code += " vec3 new_pos = x_rotation_mat * local_pos;\n"; + code += " displacement = new_pos - local_pos;\n"; + code += "\n"; + code += " // Y axis\n"; + code += " local_pos = (inverse(emission_transform) * transform[3]).xyz;\n"; + code += " local_pos -= velocity_pivot;\n"; + code += " local_pos.y = 0.;\n"; + code += " mat3 y_rotation_mat = mat3(\n"; + code += " vec3(cos(orbit_velocities.y), 0.0, -sin(orbit_velocities.y)),\n"; + code += " vec3(0.0, 1.0,0.0),\n"; + code += " vec3(sin(orbit_velocities.y), 0.0, cos(orbit_velocities.y))\n"; + code += " );\n"; + code += " new_pos = y_rotation_mat * local_pos;\n"; + code += " displacement += new_pos - local_pos;\n"; + code += " // z axis\n"; + code += "\n"; + code += " local_pos = (inverse(emission_transform) * transform[3]).xyz;\n"; + code += " local_pos -= velocity_pivot;\n"; + code += " local_pos.z = 0.;\n"; + code += " mat3 z_rotation_mat = mat3(\n"; + code += " vec3(cos(orbit_velocities.z),-sin(orbit_velocities.z),0.0),\n"; + code += " vec3(-sin(orbit_velocities.z),cos(orbit_velocities.z), 0.0),\n"; + code += " vec3(0.0,0.0,1.0)\n"; + code += " );\n"; + code += " new_pos = z_rotation_mat * local_pos;\n"; + code += " displacement += new_pos - local_pos;\n"; + code += "\n"; } + code += " return (emission_transform * vec4(displacement, 0.0)).xyz;\n"; + code += "}\n"; + code += "\n"; + code += "\n"; } - if (tex_parameters[PARAM_ANGULAR_VELOCITY].is_valid()) { - code += " float tex_angular_velocity = textureLod(angular_velocity_texture, vec2(tv, 0.0), 0.0).r;\n"; - } else { - code += " float tex_angular_velocity = 1.0;\n"; + code += "vec3 get_random_direction_from_spread(inout uint alt_seed, float spread_angle){\n"; + code += " float pi = 3.14159;\n"; + code += " float degree_to_rad = pi / 180.0;\n"; + code += " vec3 velocity = vec3(0.);\n"; + code += " float spread_rad = spread_angle * degree_to_rad;\n"; + code += " float angle1_rad = rand_from_seed_m1_p1(alt_seed) * spread_rad;\n"; + code += " float angle2_rad = rand_from_seed_m1_p1(alt_seed) * spread_rad * (1.0 - flatness);\n"; + code += " vec3 direction_xz = vec3(sin(angle1_rad), 0.0, cos(angle1_rad));\n"; + code += " vec3 direction_yz = vec3(0.0, sin(angle2_rad), cos(angle2_rad));\n"; + code += " direction_yz.z = direction_yz.z / max(0.0001,sqrt(abs(direction_yz.z))); // better uniform distribution\n"; + code += " vec3 spread_direction = vec3(direction_xz.x * direction_yz.z, direction_yz.y, direction_xz.z * direction_yz.z);\n"; + code += " vec3 direction_nrm = length(direction) > 0.0 ? normalize(direction) : vec3(0.0, 0.0, 1.0);\n"; + code += " // rotate spread to direction\n"; + code += " vec3 binormal = cross(vec3(0.0, 1.0, 0.0), direction_nrm);\n"; + code += " if (length(binormal) < 0.0001) {\n"; + code += " // direction is parallel to Y. Choose Z as the binormal.\n"; + code += " binormal = vec3(0.0, 0.0, 1.0);\n"; + code += " }\n"; + code += " binormal = normalize(binormal);\n"; + code += " vec3 normal = cross(binormal, direction_nrm);\n"; + code += " spread_direction = binormal * spread_direction.x + normal * spread_direction.y + direction_nrm * spread_direction.z;\n"; + code += " return spread_direction;\n"; + + code += "}\n"; + + code += "vec3 process_radial_displacement(DynamicsParameters param, float lifetime, inout uint alt_seed, mat4 transform, mat4 emission_transform, float delta){\n"; + code += " vec3 radial_displacement = vec3(0.0);\n"; + code += " float radial_displacement_multiplier = 1.0;\n"; + if (tex_parameters[PARAM_RADIAL_VELOCITY].is_valid()) { + code += " radial_displacement_multiplier = texture(radial_velocity_curve, vec2(lifetime)).r;\n"; + } + code += " vec3 global_pivot = (emission_transform * vec4(velocity_pivot, 1.0)).xyz;\n"; + code += " if(length(transform[3].xyz - global_pivot) > 0.01){\n"; + code += " radial_displacement = normalize(transform[3].xyz - global_pivot) * radial_displacement_multiplier * param.radial_velocity;\n"; + code += " }else{radial_displacement = get_random_direction_from_spread(alt_seed, 360.0)* param.radial_velocity;} \n"; + code += " if (radial_displacement_multiplier * param.radial_velocity < 0.0){\n // Prevent inwards velocity to flicker once the point is reached."; + code += " if (length(radial_displacement) > 0.01){\n"; + code += " radial_displacement = normalize(radial_displacement) * min(abs((radial_displacement_multiplier * param.radial_velocity)), length(transform[3].xyz - global_pivot));\n"; + code += " }\n"; + code += " \n"; + code += " return radial_displacement * delta;\n"; + code += "}\n"; + if (tex_parameters[PARAM_DIRECTIONAL_VELOCITY].is_valid()) { + code += "vec3 process_directional_displacement(DynamicsParameters param, float lifetime_percent,mat4 transform, mat4 emission_transform, float delta){\n"; + code += " vec3 displacement = vec3(0.);\n"; + if (directional_velocity_global) { + code += " displacement = texture(directional_velocity_curve, vec2(lifetime_percent)).xyz * param.directional_velocity;\n"; + code += " displacement = (emission_transform * vec4(displacement, 0.0)).xyz;\n"; + } else { + code += " displacement = texture(directional_velocity_curve, vec2(lifetime_percent)).xyz * param.directional_velocity;\n"; + } + code += " return displacement * delta;\n"; + code += "}\n"; } + code += "\n"; + code += "void process_physical_parameters(inout PhysicalParameters params, float lifetime_percent){\n"; if (tex_parameters[PARAM_LINEAR_ACCEL].is_valid()) { - code += " float tex_linear_accel = textureLod(linear_accel_texture, vec2(tv, 0.0), 0.0).r;\n"; - } else { - code += " float tex_linear_accel = 1.0;\n"; + code += " params.linear_accel *= texture(linear_accel_texture, vec2(lifetime_percent)).r;\n"; } - if (tex_parameters[PARAM_RADIAL_ACCEL].is_valid()) { - code += " float tex_radial_accel = textureLod(radial_accel_texture, vec2(tv, 0.0), 0.0).r;\n"; - } else { - code += " float tex_radial_accel = 1.0;\n"; + code += " params.radial_accel *= texture(radial_accel_texture, vec2(lifetime_percent)).r;\n"; } - if (tex_parameters[PARAM_TANGENTIAL_ACCEL].is_valid()) { - code += " float tex_tangent_accel = textureLod(tangent_accel_texture, vec2(tv, 0.0), 0.0).r;\n"; - } else { - code += " float tex_tangent_accel = 1.0;\n"; + code += " params.tangent_accel *= texture(tangent_accel_texture, vec2(lifetime_percent)).r;\n"; } - if (tex_parameters[PARAM_DAMPING].is_valid()) { - code += " float tex_damping = textureLod(damping_texture, vec2(tv, 0.0), 0.0).r;\n"; - } else { - code += " float tex_damping = 1.0;\n"; + code += " params.damping *= texture(damping_texture, vec2(lifetime_percent)).r;\n"; } + code += " \n"; + code += "}\n"; + code += "\n"; - if (tex_parameters[PARAM_ANGLE].is_valid()) { - code += " float tex_angle = textureLod(angle_texture, vec2(tv, 0.0), 0.0).r;\n"; - } else { - code += " float tex_angle = 1.0;\n"; + code += "void start() {\n"; + code += " uint base_number = NUMBER;\n"; + code += " uint alt_seed = hash(base_number + uint(1) + RANDOM_SEED);\n"; + code += " if (rand_from_seed(alt_seed) > AMOUNT_RATIO) {\n"; + code += " ACTIVE = false;\n"; + code += " }\n"; + code += " DisplayParameters params;\n"; + code += " calculate_initial_display_params(params, alt_seed);\n"; + code += " // reset alt seed?\n"; + code += " // alt_seed = hash(base_number + uint(1) + RANDOM_SEED);\n"; + code += " DynamicsParameters dynamic_params;\n"; + code += " calculate_initial_dynamics_params(dynamic_params, alt_seed);\n"; + code += " PhysicalParameters physics_params;\n"; + code += " calculate_initial_physical_params(physics_params, alt_seed);\n"; + code += " process_display_param(params, 0.0);\n"; + code += " \n"; + code += " float pi = 3.14159;\n"; + code += " float degree_to_rad = pi / 180.0;\n"; + code += " \n"; + code += " if (RESTART_CUSTOM){\n"; + code += " CUSTOM = vec4(0.);\n"; + code += " CUSTOM.w = params.lifetime;\n"; + code += " CUSTOM.x = dynamic_params.angle;\n"; + code += " }\n"; + code += " if (RESTART_COLOR){\n"; + code += " COLOR = params.color;\n"; + code += " }\n"; + code += " if (RESTART_ROT_SCALE) {\n"; + code += " TRANSFORM[0].xyz = vec3(1.0, 0.0, 0.0);\n"; + code += " TRANSFORM[1].xyz = vec3(0.0, 1.0, 0.0);\n"; + code += " TRANSFORM[2].xyz = vec3(0.0, 0.0, 1.0);\n"; + code += " }\n"; + code += "\n"; + code += " if (RESTART_POSITION) {\n"; + code += " TRANSFORM[3].xyz = calculate_initial_position(alt_seed);\n"; + if (turbulence_enabled) { + code += " float initial_turbulence_displacement = mix(turbulence_initial_displacement_min, turbulence_initial_displacement_max, rand_from_seed(alt_seed));\n"; + code += " vec3 noise_direction = get_noise_direction(TRANSFORM[3].xyz);\n"; + code += " TRANSFORM[3].xyz += noise_direction * initial_turbulence_displacement;\n"; } - - if (tex_parameters[PARAM_ANIM_SPEED].is_valid()) { - code += " float tex_anim_speed = textureLod(anim_speed_texture, vec2(tv, 0.0), 0.0).r;\n"; - } else { - code += " float tex_anim_speed = 1.0;\n"; + code += " TRANSFORM = EMISSION_TRANSFORM * TRANSFORM;\n"; + code += " }\n"; + code += " if (RESTART_VELOCITY) {\n"; + code += " VELOCITY = get_random_direction_from_spread(alt_seed, spread) * dynamic_params.initial_velocity_multiplier;\n"; + code += " }\n"; + code += " process_display_param(params, 0.);\n"; + code += "// process_dynamic_parameters(dynamic_params, 0., alt_seed, TRANSFORM, EMISSION_TRANSFORM, DELTA);\n"; + code += " VELOCITY = (EMISSION_TRANSFORM * vec4(VELOCITY, 0.0)).xyz;\n"; + code += " VELOCITY += EMITTER_VELOCITY * inherit_emitter_velocity_ratio;\n"; + if (particle_flags[PARTICLE_FLAG_DISABLE_Z]) { + code += " VELOCITY.z = 0.;\n"; + code += " TRANSFORM[3].z = 0.;\n"; } + code += "}\n"; + code += "\n"; - if (tex_parameters[PARAM_ANIM_OFFSET].is_valid()) { - code += " float tex_anim_offset = textureLod(anim_offset_texture, vec2(tv, 0.0), 0.0).r;\n"; - } else { - code += " float tex_anim_offset = 1.0;\n"; + code += "void process() {\n"; + code += " uint base_number = NUMBER;\n"; + // TODO add optional determinism here + code += "// if (repeatable){\n"; + code += "// base_number = INDEX;\n"; + code += "// }\n"; + code += " uint alt_seed = hash(base_number + uint(1) + RANDOM_SEED);\n"; + code += " DisplayParameters params;\n"; + code += " calculate_initial_display_params(params, alt_seed);\n"; + code += " DynamicsParameters dynamic_params;\n"; + code += " calculate_initial_dynamics_params(dynamic_params, alt_seed);\n"; + code += " PhysicalParameters physics_params;\n"; + code += " calculate_initial_physical_params(physics_params, alt_seed);\n"; + code += " float pi = 3.14159;\n"; + code += " float degree_to_rad = pi / 180.0;\n"; + code += "\n"; + code += " CUSTOM.y += DELTA / LIFETIME;\n"; + code += " CUSTOM.y = mix(CUSTOM.y, 1.0, INTERPOLATE_TO_END);\n"; + code += " float lifetime_percent = CUSTOM.y/ params.lifetime;\n"; + code += " if (CUSTOM.y > CUSTOM.w) {\n"; + code += " ACTIVE = false;\n"; + code += " }\n"; + code += " \n"; + code += " \n"; + code += " \n"; + code += " // will use this later to calculate final displacement and orient the particle.\n"; + code += " vec3 starting_position = TRANSFORM[3].xyz;\n"; + code += " vec3 controlled_displacement = vec3(0.0);\n"; + code += " \n"; + code += "// VELOCITY += process_physics_parameters(dynamic_params, lifetime_percent, alt_seed, TRANSFORM, EMISSION_TRANSFORM, DELTA);\n"; + code += " \n"; + if (tex_parameters[PARAM_ORBIT_VELOCITY].is_valid() || particle_flags[PARTICLE_FLAG_DISABLE_Z]) { + code += " controlled_displacement += process_orbit_displacement(dynamic_params, lifetime_percent, alt_seed, TRANSFORM, EMISSION_TRANSFORM, DELTA, params.lifetime * LIFETIME);\n"; } - - code += " vec3 force = gravity;\n"; - code += " vec3 pos = TRANSFORM[3].xyz;\n"; - if (particle_flags[PARTICLE_FLAG_DISABLE_Z]) { - code += " pos.z = 0.0;\n"; - } - code += " // apply linear acceleration\n"; - code += " float linear_accel_rand = rand_from_seed(alt_seed);\n"; - code += " force += length(VELOCITY) > 0.0 ? normalize(VELOCITY) * tex_linear_accel * mix(linear_accel_min, linear_accel_max, linear_accel_rand) : vec3(0.0);\n"; - code += " // apply radial acceleration\n"; - code += " vec3 org = EMISSION_TRANSFORM[3].xyz;\n"; - code += " vec3 diff = pos - org;\n"; - code += " float radial_accel_rand = rand_from_seed(alt_seed);\n"; - code += " force += length(diff) > 0.0 ? normalize(diff) * tex_radial_accel * mix(radial_accel_min, radial_accel_max, radial_accel_rand) : vec3(0.0);\n"; - code += " // apply tangential acceleration;\n"; - code += " float tangent_accel_val = tex_tangent_accel * mix(tangent_accel_min, tangent_accel_max, rand_from_seed(alt_seed));\n"; + code += " // calculate all velocity\n"; + code += " \n"; + code += " controlled_displacement += process_radial_displacement(dynamic_params, lifetime_percent, alt_seed, TRANSFORM, EMISSION_TRANSFORM, DELTA);\n"; + code += " \n"; + if (tex_parameters[PARAM_DIRECTIONAL_VELOCITY].is_valid()) { + code += " controlled_displacement += process_directional_displacement(dynamic_params, lifetime_percent, TRANSFORM, EMISSION_TRANSFORM, DELTA);\n"; + } + code += " \n"; + code += " process_physical_parameters(physics_params, lifetime_percent);\n"; + code += " vec3 force;\n"; + code += " {\n"; + code += " // copied from previous version\n"; + code += " vec3 pos = TRANSFORM[3].xyz;\n"; + code += " force = gravity;\n"; + code += " // apply linear acceleration\n"; + code += " force += length(VELOCITY) > 0.0 ? normalize(VELOCITY) * physics_params.linear_accel : vec3(0.0);\n"; + code += " // apply radial acceleration\n"; + code += " vec3 org = EMISSION_TRANSFORM[3].xyz;\n"; + code += " vec3 diff = pos - org;\n"; + code += " force += length(diff) > 0.0 ? normalize(diff) * physics_params.radial_accel : vec3(0.0);\n"; + code += " // apply tangential acceleration;\n"; + code += " float tangent_accel_val = physics_params.tangent_accel;\n"; if (particle_flags[PARTICLE_FLAG_DISABLE_Z]) { - code += " force += length(diff.yx) > 0.0 ? vec3(normalize(diff.yx * vec2(-1.0, 1.0)), 0.0) * tangent_accel_val : vec3(0.0);\n"; - + code += " force += length(diff.yx) > 0.0 ? vec3(normalize(diff.yx * vec2(-1.0, 1.0)), 0.0) * tangent_accel_val : vec3(0.0);\n"; } else { - code += " vec3 crossDiff = cross(normalize(diff), normalize(gravity));\n"; - code += " force += length(crossDiff) > 0.0 ? normalize(crossDiff) * tangent_accel_val : vec3(0.0);\n"; + code += " vec3 crossDiff = cross(normalize(diff), normalize(gravity));\n"; + code += " force += length(crossDiff) > 0.0 ? normalize(crossDiff) * tangent_accel_val : vec3(0.0);\n"; } if (attractor_interaction_enabled) { - code += " force += ATTRACTOR_FORCE;\n\n"; + code += " force += ATTRACTOR_FORCE;\n"; } - - code += " // apply attractor forces\n"; - code += " VELOCITY += force * DELTA;\n"; - - if (tex_parameters[PARAM_INITIAL_LINEAR_VELOCITY].is_valid()) { - code += " VELOCITY = normalize(VELOCITY) * tex_linear_velocity;\n"; + code += "\n"; + code += " // apply attractor forces\n"; + if (particle_flags[PARTICLE_FLAG_DISABLE_Z]) { + code += " force.z = 0.;\n"; } - - // Apply noise/turbulence. + code += " VELOCITY += force * DELTA;\n"; + code += " }\n"; + code += " {\n"; + code += " // copied from previous version\n"; + code += " if (physics_params.damping > 0.0) {\n"; + if (!particle_flags[PARTICLE_FLAG_DAMPING_AS_FRICTION]) { + code += " float v = length(VELOCITY);\n"; + code += " v -= physics_params.damping * DELTA;\n"; + code += " if (v < 0.0) {\n"; + code += " VELOCITY = vec3(0.0);\n"; + code += " } else {\n"; + code += " VELOCITY = normalize(VELOCITY) * v;\n"; + code += " }\n"; + } else { + code += " if (length(VELOCITY) > 0.01){\n"; + code += " VELOCITY -= normalize(VELOCITY) * length(VELOCITY) * (physics_params.damping) * DELTA;\n"; + code += " }\n"; + } + code += " }\n"; + code += " \n"; + code += " }\n"; + code += " \n"; + if (collision_mode == COLLISION_RIGID) { + code += " if (COLLIDED) {\n"; + code += " if (length(VELOCITY) > 3.0) {\n"; + code += " TRANSFORM[3].xyz += COLLISION_NORMAL * COLLISION_DEPTH;\n"; + code += " VELOCITY -= COLLISION_NORMAL * dot(COLLISION_NORMAL, VELOCITY) * (1.0 + collision_bounce);\n"; + code += " VELOCITY = mix(VELOCITY,vec3(0.0),clamp(collision_friction, 0.0, 1.0));\n"; + code += " } else {\n"; + code += " VELOCITY = vec3(0.0);\n"; + // If turbulence is enabled, set the noise direction to up so the turbulence color is "neutral" + if (turbulence_enabled) { + code += " noise_direction = vec3(1.0, 0.0, 0.0);\n"; + } + code += " }\n"; + code += " }\n"; + } else if (collision_mode == COLLISION_HIDE_ON_CONTACT) { + code += " if (COLLIDED) {\n"; + code += " ACTIVE = false;\n"; + code += " }\n"; + } + code += " vec3 final_velocity = controlled_displacement/DELTA + VELOCITY;\n"; + code += " \n"; + code += " // turbulence before limiting\n"; if (turbulence_enabled) { - code += " // apply turbulence\n"; if (tex_parameters[PARAM_TURB_INFLUENCE_OVER_LIFE].is_valid()) { - code += " float turbulence_influence = textureLod(turbulence_influence_over_life, vec2(tv, 0.0), 0.0).r;\n"; + code += " float turbulence_influence = textureLod(turbulence_influence_over_life, vec2(lifetime_percent, 0.0), 0.0).r;\n"; } else { - code += " const float turbulence_influence = 1.0;\n"; - } - code += " \n"; - code += " vec3 noise_direction = get_noise_direction(TRANSFORM[3].xyz);\n"; - // If collision happened, turbulence is no longer applied. - // We don't need this check when the collision mode is "hide on contact", - // as the particle will be hidden anyway. - String extra_tab = ""; - if (collision_mode != COLLISION_RIGID) { - code += " if (!COLLIDED) {\n"; - extra_tab = " "; - } - code += extra_tab + " \n"; - code += extra_tab + " float vel_mag = length(VELOCITY);\n"; - code += extra_tab + " float vel_infl = clamp(mix(turbulence_influence_min, turbulence_influence_max, rand_from_seed(alt_seed)) * turbulence_influence, 0.0, 1.0);\n"; - code += extra_tab + " VELOCITY = mix(VELOCITY, normalize(noise_direction) * vel_mag * (1.0 + (1.0 - vel_infl) * 0.2), vel_infl);\n"; - if (collision_mode != COLLISION_RIGID) { - code += " }"; + code += " float turbulence_influence = 1.0;\n"; } + code += " \n"; + code += " vec3 noise_direction = get_noise_direction(TRANSFORM[3].xyz);\n"; + code += " if (!COLLIDED) {\n"; + code += " \n"; + code += " float vel_mag = length(final_velocity);\n"; + code += " float vel_infl = clamp(dynamic_params.turb_influence * turbulence_influence, 0.0,1.0);\n"; + code += " final_velocity = mix(final_velocity, normalize(noise_direction) * vel_mag * (1.0 + (1.0 - vel_infl) * 0.2), vel_infl);\n"; + code += " }\n"; } code += " \n"; - code += " // orbit velocity\n"; - if (particle_flags[PARTICLE_FLAG_DISABLE_Z]) { - code += " float orbit_amount = tex_orbit_velocity * mix(orbit_velocity_min, orbit_velocity_max, rand_from_seed(alt_seed));\n"; - code += " if (orbit_amount != 0.0) {\n"; - code += " float ang = orbit_amount * DELTA * pi * 2.0;\n"; - code += " mat2 rot = mat2(vec2(cos(ang), -sin(ang)), vec2(sin(ang), cos(ang)));\n"; - code += " TRANSFORM[3].xy -= diff.xy;\n"; - code += " TRANSFORM[3].xy += rot * diff.xy;\n"; + code += " // limit velocity\n"; + if (velocity_limit_curve.is_valid()) { + code += " if (length(final_velocity) > 0.001){\n"; + code += " final_velocity = normalize(final_velocity) * min(abs(length(final_velocity)), abs(texture(velocity_limit_curve, vec2(lifetime_percent)).r));\n"; code += " }\n"; } - - code += " float dmp = mix(damping_min, damping_max, rand_from_seed(alt_seed));\n"; - code += " if (dmp * tex_damping > 0.0) {\n"; - code += " float v = length(VELOCITY);\n"; - code += " float damp = tex_damping * dmp;\n"; - code += " v -= damp * DELTA;\n"; - code += " if (v < 0.0) {\n"; - code += " VELOCITY = vec3(0.0);\n"; - code += " } else {\n"; - code += " VELOCITY = normalize(VELOCITY) * v;\n"; - code += " }\n"; - code += " }\n"; - code += " float base_angle = (tex_angle) * mix(initial_angle_min, initial_angle_max, angle_rand);\n"; - code += " base_angle += CUSTOM.y * LIFETIME * (tex_angular_velocity) * mix(angular_velocity_min,angular_velocity_max, rand_from_seed(alt_seed));\n"; - code += " CUSTOM.x = base_angle * degree_to_rad;\n"; // angle - code += " CUSTOM.z = (tex_anim_offset) * mix(anim_offset_min, anim_offset_max, anim_offset_rand) + tv * tex_anim_speed * mix(anim_speed_min, anim_speed_max, rand_from_seed(alt_seed));\n"; // angle - - // apply color - // apply hue rotation - if (tex_parameters[PARAM_SCALE].is_valid()) { - code += " vec3 tex_scale = textureLod(scale_texture, vec2(tv, 0.0), 0.0).rgb;\n"; - } else { - code += " vec3 tex_scale = vec3(1.0);\n"; + code += " \n"; + if (particle_flags[PARTICLE_FLAG_DISABLE_Z]) { + code += " final_velocity.z = 0.;\n"; } - - if (tex_parameters[PARAM_HUE_VARIATION].is_valid()) { - code += " float tex_hue_variation = textureLod(hue_variation_texture, vec2(tv, 0.0), 0.0).r;\n"; - } else { - code += " float tex_hue_variation = 1.0;\n"; + code += " TRANSFORM[3].xyz += final_velocity * DELTA;\n"; + code += " \n"; + code += " \n"; + code += " process_display_param(params, lifetime_percent);\n"; + code += " \n"; + code += " float base_angle = dynamic_params.angle;\n"; + if (tex_parameters[PARAM_ANGLE].is_valid()) { + code += " base_angle *= texture(angle_texture, vec2(lifetime_percent)).r;\n"; } + if (tex_parameters[PARAM_ANGULAR_VELOCITY].is_valid()) { + code += " base_angle += CUSTOM.y * LIFETIME * dynamic_params.angular_velocity * texture(angular_velocity_texture, vec2(lifetime_percent)).r;\n"; - code += " float hue_rot_angle = (tex_hue_variation) * pi * 2.0 * mix(hue_variation_min, hue_variation_max, rand_from_seed(alt_seed));\n"; - code += " float hue_rot_c = cos(hue_rot_angle);\n"; - code += " float hue_rot_s = sin(hue_rot_angle);\n"; - code += " mat4 hue_rot_mat = mat4(vec4(0.299, 0.587, 0.114, 0.0),\n"; - code += " vec4(0.299, 0.587, 0.114, 0.0),\n"; - code += " vec4(0.299, 0.587, 0.114, 0.0),\n"; - code += " vec4(0.000, 0.000, 0.000, 1.0)) +\n"; - code += " mat4(vec4(0.701, -0.587, -0.114, 0.0),\n"; - code += " vec4(-0.299, 0.413, -0.114, 0.0),\n"; - code += " vec4(-0.300, -0.588, 0.886, 0.0),\n"; - code += " vec4(0.000, 0.000, 0.000, 0.0)) * hue_rot_c +\n"; - code += " mat4(vec4(0.168, 0.330, -0.497, 0.0),\n"; - code += " vec4(-0.328, 0.035, 0.292, 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"; - if (color_ramp.is_valid()) { - code += " COLOR = hue_rot_mat * textureLod(color_ramp, vec2(tv, 0.0), 0.0) * color_value;\n"; } else { - code += " COLOR = hue_rot_mat * color_value;\n"; - } - - if (color_initial_ramp.is_valid()) { - code += " vec4 start_color = textureLod(color_initial_ramp, vec2(color_initial_rand, 0.0), 0.0);\n"; - code += " COLOR *= start_color;\n"; - } - - if (emission_color_texture.is_valid() && (emission_shape == EMISSION_SHAPE_POINTS || emission_shape == EMISSION_SHAPE_DIRECTED_POINTS)) { - code += " COLOR *= texelFetch(emission_texture_color, emission_tex_ofs, 0);\n"; + code += " base_angle += CUSTOM.y * LIFETIME * dynamic_params.angular_velocity;\n"; } - code += "\n"; + code += " CUSTOM.x = base_angle * degree_to_rad;\n"; + code += " COLOR = params.color;\n"; if (particle_flags[PARTICLE_FLAG_DISABLE_Z]) { if (particle_flags[PARTICLE_FLAG_ALIGN_Y_TO_VELOCITY]) { - code += " if (length(VELOCITY) > 0.0) {\n"; - code += " TRANSFORM[1].xyz = normalize(VELOCITY);\n"; + code += " if (length(final_velocity) > 0.0) {\n"; + code += " TRANSFORM[1].xyz = normalize(final_velocity);\n"; code += " } else {\n"; code += " TRANSFORM[1].xyz = normalize(TRANSFORM[1].xyz);\n"; code += " }\n"; @@ -827,8 +1038,8 @@ void ParticleProcessMaterial::_update_shader() { } else { // orient particle Y towards velocity if (particle_flags[PARTICLE_FLAG_ALIGN_Y_TO_VELOCITY]) { - code += " if (length(VELOCITY) > 0.0) {\n"; - code += " TRANSFORM[1].xyz = normalize(VELOCITY);\n"; + code += " if (length(final_velocity) > 0.0) {\n"; + code += " TRANSFORM[1].xyz = normalize(final_velocity);\n"; code += " } else {\n"; code += " TRANSFORM[1].xyz = normalize(TRANSFORM[1].xyz);\n"; code += " }\n"; @@ -855,33 +1066,20 @@ void ParticleProcessMaterial::_update_shader() { if (particle_flags[PARTICLE_FLAG_DISABLE_Z]) { code += " TRANSFORM[3].z = 0.0;\n"; } - - // scale by scale - code += " float base_scale = mix(scale_min, scale_max, scale_rand);\n"; - code += " base_scale = sign(base_scale) * max(abs(base_scale), 0.001);\n"; - code += " TRANSFORM[0].xyz *= base_scale * sign(tex_scale.r) * max(abs(tex_scale.r), 0.001);\n"; - code += " TRANSFORM[1].xyz *= base_scale * sign(tex_scale.g) * max(abs(tex_scale.g), 0.001);\n"; - code += " TRANSFORM[2].xyz *= base_scale * sign(tex_scale.b) * max(abs(tex_scale.b), 0.001);\n"; - - if (collision_mode == COLLISION_RIGID) { - code += " if (COLLIDED) {\n"; - code += " if (length(VELOCITY) > 3.0) {\n"; - code += " TRANSFORM[3].xyz += COLLISION_NORMAL * COLLISION_DEPTH;\n"; - code += " VELOCITY -= COLLISION_NORMAL * dot(COLLISION_NORMAL, VELOCITY) * (1.0 + collision_bounce);\n"; - code += " VELOCITY = mix(VELOCITY,vec3(0.0),clamp(collision_friction, 0.0, 1.0));\n"; - code += " } else {\n"; - code += " VELOCITY = vec3(0.0);\n"; - // If turbulence is enabled, set the noise direction to up so the turbulence color is "neutral" - if (turbulence_enabled) { - code += " noise_direction = vec3(1.0, 0.0, 0.0);\n"; - } - code += " }\n"; - code += " }\n"; - } else if (collision_mode == COLLISION_HIDE_ON_CONTACT) { - code += " if (COLLIDED) {\n"; - code += " ACTIVE = false;\n"; - code += " }\n"; + if (tex_parameters[PARAM_SCALE_OVER_VELOCITY].is_valid()) { + code += " if(length(final_velocity) > 0.001){\n"; + code += " params.scale *= texture(scale_over_velocity_curve, vec2(clamp(length(final_velocity)/(scale_over_velocity_max - scale_over_velocity_min), 0.0,1.0), 0.0)).rgb;\n"; + code += " } else {params.scale *= texture(scale_over_velocity_curve, vec2(0.0)).rgb;}\n \n"; } + code += "// params.scale *= length(final_velocity)/100.0;\n"; + code += "\n"; + code += " TRANSFORM[0].xyz *= sign(params.scale.x) * max(abs(params.scale.x), 0.001);\n"; + code += " TRANSFORM[1].xyz *= sign(params.scale.y) * max(abs(params.scale.y), 0.001);\n"; + code += " TRANSFORM[2].xyz *= sign(params.scale.z) * max(abs(params.scale.z), 0.001);\n"; + code += " \n"; + code += " // \n"; + code += " CUSTOM.z = params.animation_offset + lifetime_percent * params.animation_speed;\n"; + code += " \n"; if (sub_emitter_mode != SUB_EMITTER_DISABLED && !RenderingServer::get_singleton()->is_low_end()) { code += " int emit_count = 0;\n"; @@ -975,6 +1173,15 @@ float ParticleProcessMaterial::get_flatness() const { return flatness; } +void ParticleProcessMaterial::set_velocity_pivot(const Vector3 &p_pivot) { + velocity_pivot = p_pivot; + RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->velocity_pivot, p_pivot); +} + +Vector3 ParticleProcessMaterial::get_velocity_pivot() { + return velocity_pivot; +} + void ParticleProcessMaterial::set_param_min(Parameter p_param, float p_value) { ERR_FAIL_INDEX(p_param, PARAM_MAX); @@ -1029,6 +1236,15 @@ void ParticleProcessMaterial::set_param_min(Parameter p_param, float p_value) { case PARAM_TURB_INFLUENCE_OVER_LIFE: { // Can't happen, but silences warning } break; + case PARAM_RADIAL_VELOCITY: { + RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->radial_velocity_min, p_value); + } break; + case PARAM_SCALE_OVER_VELOCITY: { + RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->scale_over_velocity_min, p_value); + } break; + case PARAM_DIRECTIONAL_VELOCITY: { + RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->directional_velocity_min, p_value); + } break; case PARAM_MAX: break; // Can't happen, but silences warning } @@ -1094,6 +1310,15 @@ void ParticleProcessMaterial::set_param_max(Parameter p_param, float p_value) { case PARAM_TURB_INFLUENCE_OVER_LIFE: { // Can't happen, but silences warning } break; + case PARAM_RADIAL_VELOCITY: { + RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->radial_velocity_max, p_value); + } break; + case PARAM_SCALE_OVER_VELOCITY: { + RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->scale_over_velocity_max, p_value); + } break; + case PARAM_DIRECTIONAL_VELOCITY: { + RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->directional_velocity_max, p_value); + } break; case PARAM_MAX: break; // Can't happen, but silences warning } @@ -1107,11 +1332,15 @@ float ParticleProcessMaterial::get_param_max(Parameter p_param) const { static void _adjust_curve_range(const Ref<Texture2D> &p_texture, float p_min, float p_max) { Ref<CurveTexture> curve_tex = p_texture; - if (!curve_tex.is_valid()) { + if (curve_tex.is_valid()) { + curve_tex->ensure_default_setup(p_min, p_max); + return; + } + Ref<CurveXYZTexture> curve_xyz_tex = p_texture; + if (curve_xyz_tex.is_valid()) { + curve_xyz_tex->ensure_default_setup(p_min, p_max); return; } - - curve_tex->ensure_default_setup(p_min, p_max); } void ParticleProcessMaterial::set_param_texture(Parameter p_param, const Ref<Texture2D> &p_texture) { @@ -1132,6 +1361,7 @@ void ParticleProcessMaterial::set_param_texture(Parameter p_param, const Ref<Tex case PARAM_ORBIT_VELOCITY: { RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->orbit_velocity_texture, tex_rid); _adjust_curve_range(p_texture, -500, 500); + notify_property_list_changed(); } break; case PARAM_LINEAR_ACCEL: { RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->linear_accel_texture, tex_rid); @@ -1178,6 +1408,18 @@ void ParticleProcessMaterial::set_param_texture(Parameter p_param, const Ref<Tex case PARAM_TURB_INIT_DISPLACEMENT: { // Can't happen, but silences warning } break; + case PARAM_RADIAL_VELOCITY: { + RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->radial_velocity_texture, tex_rid); + } break; + case PARAM_SCALE_OVER_VELOCITY: { + RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->scale_over_velocity_texture, tex_rid); + _adjust_curve_range(p_texture, 0, 3); + notify_property_list_changed(); + } break; + case PARAM_DIRECTIONAL_VELOCITY: { + RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->directional_velocity_texture, tex_rid); + notify_property_list_changed(); + } break; case PARAM_MAX: break; // Can't happen, but silences warning } @@ -1233,6 +1475,42 @@ void ParticleProcessMaterial::set_particle_flag(ParticleFlags p_particle_flag, b } } +void ParticleProcessMaterial::set_alpha_curve(const Ref<Texture2D> &p_texture) { + alpha_curve = p_texture; + RID tex_rid = p_texture.is_valid() ? p_texture->get_rid() : RID(); + RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->alpha_ramp, tex_rid); + _queue_shader_change(); + notify_property_list_changed(); +} + +Ref<Texture2D> ParticleProcessMaterial::get_alpha_curve() const { + return alpha_curve; +} + +void ParticleProcessMaterial::set_emission_curve(const Ref<Texture2D> &p_texture) { + emission_curve = p_texture; + RID tex_rid = p_texture.is_valid() ? p_texture->get_rid() : RID(); + RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->emission_ramp, tex_rid); + _queue_shader_change(); + notify_property_list_changed(); +} + +Ref<Texture2D> ParticleProcessMaterial::get_emission_curve() const { + return emission_curve; +} + +void ParticleProcessMaterial::set_velocity_limit_curve(const Ref<Texture2D> &p_texture) { + velocity_limit_curve = p_texture; + RID tex_rid = p_texture.is_valid() ? p_texture->get_rid() : RID(); + RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->velocity_limit_curve, tex_rid); + _queue_shader_change(); + notify_property_list_changed(); +} + +Ref<Texture2D> ParticleProcessMaterial::get_velocity_limit_curve() const { + return velocity_limit_curve; +} + bool ParticleProcessMaterial::get_particle_flag(ParticleFlags p_particle_flag) const { ERR_FAIL_INDEX_V(p_particle_flag, PARTICLE_FLAG_MAX, false); return particle_flags[p_particle_flag]; @@ -1299,6 +1577,11 @@ void ParticleProcessMaterial::set_emission_ring_inner_radius(real_t p_radius) { RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->emission_ring_inner_radius, p_radius); } +void ParticleProcessMaterial::set_inherit_velocity_ratio(double p_ratio) { + inherit_emitter_velocity_ratio = p_ratio; + RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->inherit_emitter_velocity_ratio, p_ratio); +} + ParticleProcessMaterial::EmissionShape ParticleProcessMaterial::get_emission_shape() const { return emission_shape; } @@ -1343,6 +1626,28 @@ real_t ParticleProcessMaterial::get_emission_ring_inner_radius() const { return emission_ring_inner_radius; } +void ParticleProcessMaterial::set_emission_shape_offset(const Vector3 &p_emission_shape_offset) { + emission_shape_offset = p_emission_shape_offset; + RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->emission_shape_offset, p_emission_shape_offset); +} + +Vector3 ParticleProcessMaterial::get_emission_shape_offset() const { + return emission_shape_offset; +} + +void ParticleProcessMaterial::set_emission_shape_scale(const Vector3 &p_emission_shape_scale) { + emission_shape_scale = p_emission_shape_scale; + RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->emission_shape_scale, p_emission_shape_scale); +} + +Vector3 ParticleProcessMaterial::get_emission_shape_scale() const { + return emission_shape_scale; +} + +double ParticleProcessMaterial::get_inherit_velocity_ratio() { + return inherit_emitter_velocity_ratio; +} + void ParticleProcessMaterial::set_turbulence_enabled(const bool p_turbulence_enabled) { turbulence_enabled = p_turbulence_enabled; RenderingServer::get_singleton()->material_set_param(_get_material(), shader_names->turbulence_enabled, turbulence_enabled); @@ -1459,10 +1764,6 @@ void ParticleProcessMaterial::_validate_property(PropertyInfo &p_property) const p_property.usage = PROPERTY_USAGE_NONE; } - if (p_property.name.begins_with("orbit_") && !particle_flags[PARTICLE_FLAG_DISABLE_Z]) { - p_property.usage = PROPERTY_USAGE_NONE; - } - if (!turbulence_enabled) { if (p_property.name == "turbulence_noise_strength" || p_property.name == "turbulence_noise_scale" || @@ -1484,6 +1785,15 @@ void ParticleProcessMaterial::_validate_property(PropertyInfo &p_property) const if (p_property.name == "collision_bounce" && collision_mode != COLLISION_RIGID) { p_property.usage = PROPERTY_USAGE_NONE; } + if ((p_property.name == "directional_velocity_min" || p_property.name == "directional_velocity_max") && !tex_parameters[PARAM_DIRECTIONAL_VELOCITY].is_valid()) { + p_property.usage = PROPERTY_USAGE_NONE; + } + if ((p_property.name == "scale_over_velocity_min" || p_property.name == "scale_over_velocity_max") && !tex_parameters[PARAM_SCALE_OVER_VELOCITY].is_valid()) { + p_property.usage = PROPERTY_USAGE_NO_EDITOR; + } + if ((p_property.name == "orbit_velocity_min" || p_property.name == "orbit_velocity_max") && (!tex_parameters[PARAM_ORBIT_VELOCITY].is_valid() && !particle_flags[PARTICLE_FLAG_DISABLE_Z])) { + p_property.usage = PROPERTY_USAGE_NO_EDITOR; + } } void ParticleProcessMaterial::set_sub_emitter_mode(SubEmitterMode p_sub_emitter_mode) { @@ -1588,6 +1898,9 @@ void ParticleProcessMaterial::_bind_methods() { ClassDB::bind_method(D_METHOD("set_direction", "degrees"), &ParticleProcessMaterial::set_direction); ClassDB::bind_method(D_METHOD("get_direction"), &ParticleProcessMaterial::get_direction); + ClassDB::bind_method(D_METHOD("set_inherit_velocity_ratio", "ratio"), &ParticleProcessMaterial::set_inherit_velocity_ratio); + ClassDB::bind_method(D_METHOD("get_inherit_velocity_ratio"), &ParticleProcessMaterial::get_inherit_velocity_ratio); + ClassDB::bind_method(D_METHOD("set_spread", "degrees"), &ParticleProcessMaterial::set_spread); ClassDB::bind_method(D_METHOD("get_spread"), &ParticleProcessMaterial::get_spread); @@ -1608,13 +1921,24 @@ void ParticleProcessMaterial::_bind_methods() { ClassDB::bind_method(D_METHOD("set_color_ramp", "ramp"), &ParticleProcessMaterial::set_color_ramp); ClassDB::bind_method(D_METHOD("get_color_ramp"), &ParticleProcessMaterial::get_color_ramp); + ClassDB::bind_method(D_METHOD("set_alpha_curve", "curve"), &ParticleProcessMaterial::set_alpha_curve); + ClassDB::bind_method(D_METHOD("get_alpha_curve"), &ParticleProcessMaterial::get_alpha_curve); + + ClassDB::bind_method(D_METHOD("set_emission_curve", "curve"), &ParticleProcessMaterial::set_emission_curve); + ClassDB::bind_method(D_METHOD("get_emission_curve"), &ParticleProcessMaterial::get_emission_curve); ClassDB::bind_method(D_METHOD("set_color_initial_ramp", "ramp"), &ParticleProcessMaterial::set_color_initial_ramp); ClassDB::bind_method(D_METHOD("get_color_initial_ramp"), &ParticleProcessMaterial::get_color_initial_ramp); + ClassDB::bind_method(D_METHOD("set_velocity_limit_curve", "curve"), &ParticleProcessMaterial::set_velocity_limit_curve); + ClassDB::bind_method(D_METHOD("get_velocity_limit_curve"), &ParticleProcessMaterial::get_velocity_limit_curve); + ClassDB::bind_method(D_METHOD("set_particle_flag", "particle_flag", "enable"), &ParticleProcessMaterial::set_particle_flag); ClassDB::bind_method(D_METHOD("get_particle_flag", "particle_flag"), &ParticleProcessMaterial::get_particle_flag); + ClassDB::bind_method(D_METHOD("set_velocity_pivot", "pivot"), &ParticleProcessMaterial::set_velocity_pivot); + ClassDB::bind_method(D_METHOD("get_velocity_pivot"), &ParticleProcessMaterial::get_velocity_pivot); + ClassDB::bind_method(D_METHOD("set_emission_shape", "shape"), &ParticleProcessMaterial::set_emission_shape); ClassDB::bind_method(D_METHOD("get_emission_shape"), &ParticleProcessMaterial::get_emission_shape); @@ -1648,6 +1972,12 @@ void ParticleProcessMaterial::_bind_methods() { ClassDB::bind_method(D_METHOD("set_emission_ring_inner_radius", "inner_radius"), &ParticleProcessMaterial::set_emission_ring_inner_radius); ClassDB::bind_method(D_METHOD("get_emission_ring_inner_radius"), &ParticleProcessMaterial::get_emission_ring_inner_radius); + ClassDB::bind_method(D_METHOD("set_emission_shape_offset", "emission_shape_offset"), &ParticleProcessMaterial::set_emission_shape_offset); + ClassDB::bind_method(D_METHOD("get_emission_shape_offset"), &ParticleProcessMaterial::get_emission_shape_offset); + + ClassDB::bind_method(D_METHOD("set_emission_shape_scale", "emission_shape_scale"), &ParticleProcessMaterial::set_emission_shape_scale); + ClassDB::bind_method(D_METHOD("get_emission_shape_scale"), &ParticleProcessMaterial::get_emission_shape_scale); + ClassDB::bind_method(D_METHOD("get_turbulence_enabled"), &ParticleProcessMaterial::get_turbulence_enabled); ClassDB::bind_method(D_METHOD("set_turbulence_enabled", "turbulence_enabled"), &ParticleProcessMaterial::set_turbulence_enabled); @@ -1699,10 +2029,16 @@ void ParticleProcessMaterial::_bind_methods() { ClassDB::bind_method(D_METHOD("set_collision_bounce", "bounce"), &ParticleProcessMaterial::set_collision_bounce); ClassDB::bind_method(D_METHOD("get_collision_bounce"), &ParticleProcessMaterial::get_collision_bounce); - ADD_GROUP("Time", ""); ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "lifetime_randomness", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_lifetime_randomness", "get_lifetime_randomness"); - - ADD_GROUP("Emission Shape", "emission_"); + ADD_GROUP("Particle Flags", "particle_flag_"); + ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "particle_flag_align_y"), "set_particle_flag", "get_particle_flag", PARTICLE_FLAG_ALIGN_Y_TO_VELOCITY); + ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "particle_flag_rotate_y"), "set_particle_flag", "get_particle_flag", PARTICLE_FLAG_ROTATE_Y); + ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "particle_flag_disable_z"), "set_particle_flag", "get_particle_flag", PARTICLE_FLAG_DISABLE_Z); + ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "particle_flag_damping_as_friction"), "set_particle_flag", "get_particle_flag", PARTICLE_FLAG_DAMPING_AS_FRICTION); + ADD_GROUP("Spawn", ""); + ADD_SUBGROUP("Position", ""); + ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "emission_shape_offset"), "set_emission_shape_offset", "get_emission_shape_offset"); + ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "emission_shape_scale"), "set_emission_shape_scale", "get_emission_shape_scale"); ADD_PROPERTY(PropertyInfo(Variant::INT, "emission_shape", PROPERTY_HINT_ENUM, "Point,Sphere,Sphere Surface,Box,Points,Directed Points,Ring"), "set_emission_shape", "get_emission_shape"); ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "emission_sphere_radius", PROPERTY_HINT_RANGE, "0.01,128,0.01,or_greater"), "set_emission_sphere_radius", "get_emission_sphere_radius"); ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "emission_box_extents"), "set_emission_box_extents", "get_emission_box_extents"); @@ -1714,60 +2050,87 @@ void ParticleProcessMaterial::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "emission_ring_height"), "set_emission_ring_height", "get_emission_ring_height"); ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "emission_ring_radius"), "set_emission_ring_radius", "get_emission_ring_radius"); ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "emission_ring_inner_radius"), "set_emission_ring_inner_radius", "get_emission_ring_inner_radius"); - ADD_GROUP("Particle Flags", "particle_flag_"); - ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "particle_flag_align_y"), "set_particle_flag", "get_particle_flag", PARTICLE_FLAG_ALIGN_Y_TO_VELOCITY); - ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "particle_flag_rotate_y"), "set_particle_flag", "get_particle_flag", PARTICLE_FLAG_ROTATE_Y); - ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "particle_flag_disable_z"), "set_particle_flag", "get_particle_flag", PARTICLE_FLAG_DISABLE_Z); - ADD_GROUP("Direction", ""); + ADD_SUBGROUP("Angle", ""); + ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angle_min", PROPERTY_HINT_RANGE, "-720,720,0.1,or_less,or_greater,degrees"), "set_param_min", "get_param_min", PARAM_ANGLE); + ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angle_max", PROPERTY_HINT_RANGE, "-720,720,0.1,or_less,or_greater,degrees"), "set_param_max", "get_param_max", PARAM_ANGLE); + ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "angle_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture"), "set_param_texture", "get_param_texture", PARAM_ANGLE); + ADD_SUBGROUP("Velocity", ""); + ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "inherit_velocity_ratio", PROPERTY_HINT_RANGE, "0.0,1.0,0.001,or_less,or_greater"), "set_inherit_velocity_ratio", "get_inherit_velocity_ratio"); + ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "velocity_pivot"), "set_velocity_pivot", "get_velocity_pivot"); ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "direction"), "set_direction", "get_direction"); - ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "spread", PROPERTY_HINT_RANGE, "0,180,0.01"), "set_spread", "get_spread"); - ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "flatness", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_flatness", "get_flatness"); - ADD_GROUP("Gravity", ""); - ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "gravity"), "set_gravity", "get_gravity"); - ADD_GROUP("Initial Velocity", "initial_"); + ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "spread", PROPERTY_HINT_RANGE, "0,180,0.001"), "set_spread", "get_spread"); + ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "flatness", PROPERTY_HINT_RANGE, "0,1,0.001"), "set_flatness", "get_flatness"); ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "initial_velocity_min", PROPERTY_HINT_RANGE, "0,1000,0.01,or_less,or_greater"), "set_param_min", "get_param_min", PARAM_INITIAL_LINEAR_VELOCITY); ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "initial_velocity_max", PROPERTY_HINT_RANGE, "0,1000,0.01,or_less,or_greater"), "set_param_max", "get_param_max", PARAM_INITIAL_LINEAR_VELOCITY); - ADD_GROUP("Angular Velocity", "angular_"); + ADD_GROUP("Animated Velocity", ""); + ADD_SUBGROUP("Velocity Limit", ""); + ADD_SUBGROUP("Angular Velocity", "angular_"); ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angular_velocity_min", PROPERTY_HINT_RANGE, "-720,720,0.01,or_less,or_greater"), "set_param_min", "get_param_min", PARAM_ANGULAR_VELOCITY); ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angular_velocity_max", PROPERTY_HINT_RANGE, "-720,720,0.01,or_less,or_greater"), "set_param_max", "get_param_max", PARAM_ANGULAR_VELOCITY); ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "angular_velocity_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture"), "set_param_texture", "get_param_texture", PARAM_ANGULAR_VELOCITY); - ADD_GROUP("Orbit Velocity", "orbit_"); + ADD_SUBGROUP("Directional Velocity", "directional_"); + ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "directional_velocity_min", PROPERTY_HINT_RANGE, "-720,720,0.01,or_less,or_greater"), "set_param_min", "get_param_min", PARAM_DIRECTIONAL_VELOCITY); + ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "directional_velocity_max", PROPERTY_HINT_RANGE, "-720,720,0.01,or_less,or_greater"), "set_param_max", "get_param_max", PARAM_DIRECTIONAL_VELOCITY); + ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "directional_velocity_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveXYZTexture"), "set_param_texture", "get_param_texture", PARAM_DIRECTIONAL_VELOCITY); + ADD_SUBGROUP("Orbit Velocity", "orbit_"); ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "orbit_velocity_min", PROPERTY_HINT_RANGE, "-1000,1000,0.01,or_less,or_greater"), "set_param_min", "get_param_min", PARAM_ORBIT_VELOCITY); ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "orbit_velocity_max", PROPERTY_HINT_RANGE, "-1000,1000,0.01,or_less,or_greater"), "set_param_max", "get_param_max", PARAM_ORBIT_VELOCITY); - ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "orbit_velocity_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture"), "set_param_texture", "get_param_texture", PARAM_ORBIT_VELOCITY); - ADD_GROUP("Linear Accel", "linear_"); + ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "orbit_velocity_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture,CurveXYZTexture"), "set_param_texture", "get_param_texture", PARAM_ORBIT_VELOCITY); + ADD_SUBGROUP("Radial Velocity", "radial_"); + ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "radial_velocity_min", PROPERTY_HINT_RANGE, "-1000,1000,0.01,or_less,or_greater"), "set_param_min", "get_param_min", PARAM_RADIAL_VELOCITY); + ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "radial_velocity_max", PROPERTY_HINT_RANGE, "-1000,1000,0.01,or_less,or_greater"), "set_param_max", "get_param_max", PARAM_RADIAL_VELOCITY); + ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "radial_velocity_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture"), "set_param_texture", "get_param_texture", PARAM_RADIAL_VELOCITY); + ADD_SUBGROUP("Velocity Limit", ""); + ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "velocity_limit_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture"), "set_velocity_limit_curve", "get_velocity_limit_curve"); + ADD_GROUP("Accelerations", ""); + ADD_SUBGROUP("Gravity", ""); + ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "gravity"), "set_gravity", "get_gravity"); + ADD_SUBGROUP("Linear Accel", "linear_"); ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "linear_accel_min", PROPERTY_HINT_RANGE, "-100,100,0.01,or_less,or_greater"), "set_param_min", "get_param_min", PARAM_LINEAR_ACCEL); ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "linear_accel_max", PROPERTY_HINT_RANGE, "-100,100,0.01,or_less,or_greater"), "set_param_max", "get_param_max", PARAM_LINEAR_ACCEL); ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "linear_accel_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture"), "set_param_texture", "get_param_texture", PARAM_LINEAR_ACCEL); - ADD_GROUP("Radial Accel", "radial_"); + ADD_SUBGROUP("Radial Accel", "radial_"); ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "radial_accel_min", PROPERTY_HINT_RANGE, "-100,100,0.01,or_less,or_greater"), "set_param_min", "get_param_min", PARAM_RADIAL_ACCEL); ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "radial_accel_max", PROPERTY_HINT_RANGE, "-100,100,0.01,or_less,or_greater"), "set_param_max", "get_param_max", PARAM_RADIAL_ACCEL); ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "radial_accel_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture"), "set_param_texture", "get_param_texture", PARAM_RADIAL_ACCEL); - ADD_GROUP("Tangential Accel", "tangential_"); + ADD_SUBGROUP("Tangential Accel", "tangential_"); ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "tangential_accel_min", PROPERTY_HINT_RANGE, "-100,100,0.01,or_less,or_greater"), "set_param_min", "get_param_min", PARAM_TANGENTIAL_ACCEL); ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "tangential_accel_max", PROPERTY_HINT_RANGE, "-100,100,0.01,or_less,or_greater"), "set_param_max", "get_param_max", PARAM_TANGENTIAL_ACCEL); ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "tangential_accel_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture"), "set_param_texture", "get_param_texture", PARAM_TANGENTIAL_ACCEL); - ADD_GROUP("Damping", ""); + ADD_SUBGROUP("Damping", ""); ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "damping_min", PROPERTY_HINT_RANGE, "0,100,0.001,or_greater"), "set_param_min", "get_param_min", PARAM_DAMPING); ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "damping_max", PROPERTY_HINT_RANGE, "0,100,0.001,or_greater"), "set_param_max", "get_param_max", PARAM_DAMPING); ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "damping_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture"), "set_param_texture", "get_param_texture", PARAM_DAMPING); - ADD_GROUP("Angle", ""); - ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angle_min", PROPERTY_HINT_RANGE, "-720,720,0.1,or_less,or_greater,degrees"), "set_param_min", "get_param_min", PARAM_ANGLE); - ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "angle_max", PROPERTY_HINT_RANGE, "-720,720,0.1,or_less,or_greater,degrees"), "set_param_max", "get_param_max", PARAM_ANGLE); - ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "angle_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture"), "set_param_texture", "get_param_texture", PARAM_ANGLE); - ADD_GROUP("Scale", ""); + ADD_SUBGROUP("Attractor Interaction", "attractor_interaction_"); + ADD_PROPERTY(PropertyInfo(Variant::BOOL, "attractor_interaction_enabled"), "set_attractor_interaction_enabled", "is_attractor_interaction_enabled"); + + ADD_GROUP("Display", ""); + ADD_SUBGROUP("Scale", ""); ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "scale_min", PROPERTY_HINT_RANGE, "0,1000,0.01,or_greater"), "set_param_min", "get_param_min", PARAM_SCALE); ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "scale_max", PROPERTY_HINT_RANGE, "0,1000,0.01,or_greater"), "set_param_max", "get_param_max", PARAM_SCALE); ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "scale_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture,CurveXYZTexture"), "set_param_texture", "get_param_texture", PARAM_SCALE); - ADD_GROUP("Color", ""); + ADD_SUBGROUP("Scale Over Velocity", ""); + ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "scale_over_velocity_min", PROPERTY_HINT_RANGE, "0,1000,0.01,or_greater"), "set_param_min", "get_param_min", PARAM_SCALE_OVER_VELOCITY); + ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "scale_over_velocity_max", PROPERTY_HINT_RANGE, "0,1000,0.01,or_greater"), "set_param_max", "get_param_max", PARAM_SCALE_OVER_VELOCITY); + ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "scale_over_velocity_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture,CurveXYZTexture"), "set_param_texture", "get_param_texture", PARAM_SCALE_OVER_VELOCITY); + + ADD_SUBGROUP("Color Curves", ""); ADD_PROPERTY(PropertyInfo(Variant::COLOR, "color"), "set_color", "get_color"); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "color_ramp", PROPERTY_HINT_RESOURCE_TYPE, "GradientTexture1D"), "set_color_ramp", "get_color_ramp"); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "color_initial_ramp", PROPERTY_HINT_RESOURCE_TYPE, "GradientTexture1D"), "set_color_initial_ramp", "get_color_initial_ramp"); - - ADD_GROUP("Hue Variation", "hue_"); + ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "alpha_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture"), "set_alpha_curve", "get_alpha_curve"); + ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "emission_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture"), "set_emission_curve", "get_emission_curve"); + ADD_SUBGROUP("Hue Variation", "hue_"); ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "hue_variation_min", PROPERTY_HINT_RANGE, "-1,1,0.01"), "set_param_min", "get_param_min", PARAM_HUE_VARIATION); ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "hue_variation_max", PROPERTY_HINT_RANGE, "-1,1,0.01"), "set_param_max", "get_param_max", PARAM_HUE_VARIATION); ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "hue_variation_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture"), "set_param_texture", "get_param_texture", PARAM_HUE_VARIATION); + ADD_SUBGROUP("Animation", "anim_"); + ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "anim_speed_min", PROPERTY_HINT_RANGE, "0,16,0.01,or_less,or_greater"), "set_param_min", "get_param_min", PARAM_ANIM_SPEED); + ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "anim_speed_max", PROPERTY_HINT_RANGE, "0,16,0.01,or_less,or_greater"), "set_param_max", "get_param_max", PARAM_ANIM_SPEED); + ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "anim_speed_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture"), "set_param_texture", "get_param_texture", PARAM_ANIM_SPEED); + ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "anim_offset_min", PROPERTY_HINT_RANGE, "0,1,0.0001"), "set_param_min", "get_param_min", PARAM_ANIM_OFFSET); + ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "anim_offset_max", PROPERTY_HINT_RANGE, "0,1,0.0001"), "set_param_max", "get_param_max", PARAM_ANIM_OFFSET); + ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "anim_offset_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture"), "set_param_texture", "get_param_texture", PARAM_ANIM_OFFSET); ADD_GROUP("Turbulence", "turbulence_"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "turbulence_enabled"), "set_turbulence_enabled", "get_turbulence_enabled"); @@ -1781,14 +2144,11 @@ void ParticleProcessMaterial::_bind_methods() { ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "turbulence_initial_displacement_max", PROPERTY_HINT_RANGE, "-100,100,0.1"), "set_param_max", "get_param_max", PARAM_TURB_INIT_DISPLACEMENT); ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "turbulence_influence_over_life", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture"), "set_param_texture", "get_param_texture", PARAM_TURB_INFLUENCE_OVER_LIFE); - ADD_GROUP("Animation", "anim_"); - ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "anim_speed_min", PROPERTY_HINT_RANGE, "0,16,0.01,or_less,or_greater"), "set_param_min", "get_param_min", PARAM_ANIM_SPEED); - ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "anim_speed_max", PROPERTY_HINT_RANGE, "0,16,0.01,or_less,or_greater"), "set_param_max", "get_param_max", PARAM_ANIM_SPEED); - ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "anim_speed_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture"), "set_param_texture", "get_param_texture", PARAM_ANIM_SPEED); - ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "anim_offset_min", PROPERTY_HINT_RANGE, "0,1,0.0001"), "set_param_min", "get_param_min", PARAM_ANIM_OFFSET); - ADD_PROPERTYI(PropertyInfo(Variant::FLOAT, "anim_offset_max", PROPERTY_HINT_RANGE, "0,1,0.0001"), "set_param_max", "get_param_max", PARAM_ANIM_OFFSET); - ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "anim_offset_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture"), "set_param_texture", "get_param_texture", PARAM_ANIM_OFFSET); - + ADD_GROUP("Collision", "collision_"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "collision_mode", PROPERTY_HINT_ENUM, "Disabled,Rigid,Hide On Contact"), "set_collision_mode", "get_collision_mode"); + ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "collision_friction", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_collision_friction", "get_collision_friction"); + ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "collision_bounce", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_collision_bounce", "get_collision_bounce"); + ADD_PROPERTY(PropertyInfo(Variant::BOOL, "collision_use_scale"), "set_collision_use_scale", "is_collision_using_scale"); ADD_GROUP("Sub Emitter", "sub_emitter_"); ADD_PROPERTY(PropertyInfo(Variant::INT, "sub_emitter_mode", PROPERTY_HINT_ENUM, "Disabled,Constant,At End,At Collision"), "set_sub_emitter_mode", "get_sub_emitter_mode"); ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "sub_emitter_frequency", PROPERTY_HINT_RANGE, "0.01,100,0.01,suffix:Hz"), "set_sub_emitter_frequency", "get_sub_emitter_frequency"); @@ -1796,14 +2156,6 @@ void ParticleProcessMaterial::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::INT, "sub_emitter_amount_at_collision", PROPERTY_HINT_RANGE, "1,32,1"), "set_sub_emitter_amount_at_collision", "get_sub_emitter_amount_at_collision"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "sub_emitter_keep_velocity"), "set_sub_emitter_keep_velocity", "get_sub_emitter_keep_velocity"); - ADD_GROUP("Attractor Interaction", "attractor_interaction_"); - ADD_PROPERTY(PropertyInfo(Variant::BOOL, "attractor_interaction_enabled"), "set_attractor_interaction_enabled", "is_attractor_interaction_enabled"); - ADD_GROUP("Collision", "collision_"); - ADD_PROPERTY(PropertyInfo(Variant::INT, "collision_mode", PROPERTY_HINT_ENUM, "Disabled,Rigid,Hide On Contact"), "set_collision_mode", "get_collision_mode"); - ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "collision_friction", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_collision_friction", "get_collision_friction"); - ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "collision_bounce", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_collision_bounce", "get_collision_bounce"); - ADD_PROPERTY(PropertyInfo(Variant::BOOL, "collision_use_scale"), "set_collision_use_scale", "is_collision_using_scale"); - BIND_ENUM_CONSTANT(PARAM_INITIAL_LINEAR_VELOCITY); BIND_ENUM_CONSTANT(PARAM_ANGULAR_VELOCITY); BIND_ENUM_CONSTANT(PARAM_ORBIT_VELOCITY); @@ -1816,11 +2168,15 @@ void ParticleProcessMaterial::_bind_methods() { BIND_ENUM_CONSTANT(PARAM_HUE_VARIATION); BIND_ENUM_CONSTANT(PARAM_ANIM_SPEED); BIND_ENUM_CONSTANT(PARAM_ANIM_OFFSET); + BIND_ENUM_CONSTANT(PARAM_RADIAL_VELOCITY); + BIND_ENUM_CONSTANT(PARAM_DIRECTIONAL_VELOCITY); + BIND_ENUM_CONSTANT(PARAM_SCALE_OVER_VELOCITY); BIND_ENUM_CONSTANT(PARAM_MAX); BIND_ENUM_CONSTANT(PARTICLE_FLAG_ALIGN_Y_TO_VELOCITY); BIND_ENUM_CONSTANT(PARTICLE_FLAG_ROTATE_Y); BIND_ENUM_CONSTANT(PARTICLE_FLAG_DISABLE_Z); + BIND_ENUM_CONSTANT(PARTICLE_FLAG_DAMPING_AS_FRICTION); BIND_ENUM_CONSTANT(PARTICLE_FLAG_MAX); BIND_ENUM_CONSTANT(EMISSION_SHAPE_POINT); @@ -1877,6 +2233,8 @@ ParticleProcessMaterial::ParticleProcessMaterial() : set_param_max(PARAM_HUE_VARIATION, 0); set_param_max(PARAM_ANIM_SPEED, 0); set_param_max(PARAM_ANIM_OFFSET, 0); + set_param_min(PARAM_DIRECTIONAL_VELOCITY, 1.0); + set_param_max(PARAM_DIRECTIONAL_VELOCITY, 1.0); set_emission_shape(EMISSION_SHAPE_POINT); set_emission_sphere_radius(1); set_emission_box_extents(Vector3(1, 1, 1)); @@ -1884,6 +2242,8 @@ ParticleProcessMaterial::ParticleProcessMaterial() : set_emission_ring_height(1); set_emission_ring_radius(1); set_emission_ring_inner_radius(0); + set_emission_shape_offset(Vector3(0.0, 0.0, 0.0)); + set_emission_shape_scale(Vector3(1.0, 1.0, 1.0)); set_turbulence_enabled(false); set_turbulence_noise_speed(Vector3(0.0, 0.0, 0.0)); |