diff options
author | Raffaele Picca <picster@pixelgod.net> | 2022-08-02 09:21:04 +0200 |
---|---|---|
committer | Raffaele Picca <picster@pixelgod.net> | 2022-08-02 10:16:09 +0200 |
commit | fe2cc6150ec0e76bc8e372721da6f6321fc262de (patch) | |
tree | 7da7268a0010b96d52e16d9a84967f231f0929c8 | |
parent | b7346e50258655316a4541d17fd92cc3b3a3f6ef (diff) |
Added default values to particle turbulence.
-rw-r--r-- | doc/classes/ParticlesMaterial.xml | 16 | ||||
-rw-r--r-- | scene/resources/particles_material.cpp | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/doc/classes/ParticlesMaterial.xml b/doc/classes/ParticlesMaterial.xml index ef3b94e2a1..49d3ea1c90 100644 --- a/doc/classes/ParticlesMaterial.xml +++ b/doc/classes/ParticlesMaterial.xml @@ -274,37 +274,37 @@ <member name="turbulence_active" type="bool" setter="set_turbulence_active" getter="get_turbulence_active" default="false"> Enables and disables Turbulence for the particle system. </member> - <member name="turbulence_influence_max" type="float" setter="set_param_max" getter="get_param_max"> + <member name="turbulence_influence_max" type="float" setter="set_param_max" getter="get_param_max" default="0.1"> Minimum turbulence influence on each particle. The actual amount of turbulence influence on each particle is calculated as a random value between [member turbulence_influence_min] and [member turbulence_influence_max] and multiplied by the amount of turbulence influence from [member turbulence_influence_over_life]. </member> - <member name="turbulence_influence_min" type="float" setter="set_param_min" getter="get_param_min"> + <member name="turbulence_influence_min" type="float" setter="set_param_min" getter="get_param_min" default="0.1"> Maximum turbulence influence on each particle. The actual amount of turbulence influence on each particle is calculated as a random value between [member turbulence_influence_min] and [member turbulence_influence_max] and multiplied by the amount of turbulence influence from [member turbulence_influence_over_life]. </member> <member name="turbulence_influence_over_life" type="Texture2D" setter="set_param_texture" getter="get_param_texture"> Each particle's amount of turbulence will be influenced along this [CurveTexture] over its life time. </member> - <member name="turbulence_initial_displacement_max" type="float" setter="set_param_max" getter="get_param_max"> + <member name="turbulence_initial_displacement_max" type="float" setter="set_param_max" getter="get_param_max" default="0.0"> Maximum displacement of each particles spawn position by the turbulence. The actual amount of displacement will be a factor of the underlying turbulence multiplied by a random value between [member turbulence_initial_displacement_min] and [member turbulence_initial_displacement_max]. </member> - <member name="turbulence_initial_displacement_min" type="float" setter="set_param_min" getter="get_param_min"> + <member name="turbulence_initial_displacement_min" type="float" setter="set_param_min" getter="get_param_min" default="0.0"> Minimum displacement of each particles spawn position by the turbulence. The actual amount of displacement will be a factor of the underlying turbulence multiplied by a random value between [member turbulence_initial_displacement_min] and [member turbulence_initial_displacement_max]. </member> - <member name="turbulence_noise_scale" type="float" setter="set_turbulence_noise_scale" getter="get_turbulence_noise_scale"> + <member name="turbulence_noise_scale" type="float" setter="set_turbulence_noise_scale" getter="get_turbulence_noise_scale" default="9.0"> This value controls the overall scale/frequency of the turbulence noise pattern. A small scale will result in smaller features with more detail while a high scale will result in smoother noise with larger features. </member> - <member name="turbulence_noise_speed" type="Vector3" setter="set_turbulence_noise_speed" getter="get_turbulence_noise_speed"> + <member name="turbulence_noise_speed" type="Vector3" setter="set_turbulence_noise_speed" getter="get_turbulence_noise_speed" default="Vector3(0.5, 0.5, 0.5)"> The movement speed of the turbulence pattern. This changes how quickly the noise changes over time. A value of [code]Vector3(0.0, 0.0, 0.0)[/code] will freeze the turbulence pattern in place. </member> - <member name="turbulence_noise_speed_random" type="float" setter="set_turbulence_noise_speed_random" getter="get_turbulence_noise_speed_random"> + <member name="turbulence_noise_speed_random" type="float" setter="set_turbulence_noise_speed_random" getter="get_turbulence_noise_speed_random" default="0.0"> Use to influence the noise speed in a random pattern. This helps to break up visible movement patterns. </member> - <member name="turbulence_noise_strength" type="float" setter="set_turbulence_noise_strength" getter="get_turbulence_noise_strength"> + <member name="turbulence_noise_strength" type="float" setter="set_turbulence_noise_strength" getter="get_turbulence_noise_strength" default="1.0"> The turbulence noise strength. Increasing this will result in a stronger, more contrasting, noise pattern. </member> </members> diff --git a/scene/resources/particles_material.cpp b/scene/resources/particles_material.cpp index 4b2fdbed5b..2b1b7eb154 100644 --- a/scene/resources/particles_material.cpp +++ b/scene/resources/particles_material.cpp @@ -1433,7 +1433,7 @@ void ParticlesMaterial::_validate_property(PropertyInfo &property) const { property.name == "turbulence_influence_max" || property.name == "turbulence_initial_displacement_min" || property.name == "turbulence_initial_displacement_max") { - property.usage = PROPERTY_USAGE_NONE; + property.usage = PROPERTY_USAGE_NO_EDITOR; } } } |