archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Curve-based control for child path tapering.

Browse Source 
This is an alternative method to the current fixed function with a
clump factor and "shape" parameter. This function is quite limited and
does not give the desired result in many cases (e.g. long, parallel
rasta strands are problematic). So rather than trying to add more
parameters there is now a fully user-defined optional curve for setting
the tapering shape.
This commit is contained in:
Lukas Tönne
2015-01-09 14:24:19 +01:00
parent 4c82367fd8
commit c86d55d5e7
10 changed files with 108 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
source/blender/makesrna/intern/rna_particle.c
View File

@@ -131,6 +131,7 @@ static EnumPropertyItem part_hair_ren_as_items[] = {
#include "BKE_context.h"
#include "BKE_cloth.h"
#include "BKE_colortools.h"
#include "BKE_deform.h"
#include "BKE_depsgraph.h"
#include "BKE_DerivedMesh.h"
@@ -874,6 +875,29 @@ static int rna_PartSettings_is_fluid_get(PointerRNA *ptr)
return part->type == PART_FLUID;
}
int rna_ParticleSettings_use_clump_curve_get(PointerRNA *ptr)
{
ParticleSettings *part = ptr->data;
return part->clumpcurve != NULL;
}
void rna_ParticleSettings_use_clump_curve_set(PointerRNA *ptr, int value)
{
ParticleSettings *part = ptr->data;
if (!value) {
if (part->clumpcurve) {
curvemapping_free(part->clumpcurve);
part->clumpcurve = NULL;
}
}
else {
if (!part->clumpcurve) {
BKE_particlesettings_clump_curve_init(part);
}
}
}
static void rna_ParticleSystem_name_set(PointerRNA *ptr, const char *value)
{
Object *ob = ptr->id.data;
@@ -2797,6 +2821,17 @@ static void rna_def_particle_settings(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Shape", "Shape of clumping");
RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
prop = RNA_def_property(srna, "use_clump_curve", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_funcs(prop, "rna_ParticleSettings_use_clump_curve_get", "rna_ParticleSettings_use_clump_curve_set");
RNA_def_property_ui_text(prop, "Use Clump Curve", "Use a curve to define clump tapering");
RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
prop = RNA_def_property(srna, "clump_curve", PROP_POINTER, PROP_NONE);
RNA_def_property_pointer_sdna(prop, NULL, "clumpcurve");
RNA_def_property_struct_type(prop, "CurveMapping");
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA_def_property_ui_text(prop, "Clump Curve", "Curve defining clump tapering");
RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
/* kink */
prop = RNA_def_property(srna, "kink_amplitude", PROP_FLOAT, PROP_NONE);