diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-08-30 04:29:12 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-08-30 04:29:12 +0400 |
commit | edde9f2666b6b2ccaf0e65fd6d6963a31ae00e9e (patch) | |
tree | 83ef4acb18abc6e88e67aad9ffa4fa467f2652c5 /source/blender | |
parent | 1c153b011d7bc2b8e6f2ff783b5f5617fadcd57c (diff) |
Added an 'angle' parameter to the Perlin Noise 1D and 2D geometry modifiers
to specify a displacement direction in degrees.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/linestyle.c | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_linestyle_types.h | 6 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_linestyle.c | 10 |
3 files changed, 16 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/linestyle.c b/source/blender/blenkernel/intern/linestyle.c index 90b35e1f220..f36bdaf487f 100644 --- a/source/blender/blenkernel/intern/linestyle.c +++ b/source/blender/blenkernel/intern/linestyle.c @@ -403,11 +403,13 @@ int FRS_add_linestyle_geometry_modifier(FreestyleLineStyle *linestyle, int type) ((LineStyleGeometryModifier_PerlinNoise1D *)m)->frequency = 10.0; ((LineStyleGeometryModifier_PerlinNoise1D *)m)->amplitude = 10.0; ((LineStyleGeometryModifier_PerlinNoise1D *)m)->octaves = 4; + ((LineStyleGeometryModifier_PerlinNoise1D *)m)->angle = 45.0; break; case LS_MODIFIER_PERLIN_NOISE_2D: ((LineStyleGeometryModifier_PerlinNoise2D *)m)->frequency = 10.0; ((LineStyleGeometryModifier_PerlinNoise2D *)m)->amplitude = 10.0; ((LineStyleGeometryModifier_PerlinNoise2D *)m)->octaves = 4; + ((LineStyleGeometryModifier_PerlinNoise2D *)m)->angle = 45.0; break; case LS_MODIFIER_BACKBONE_STRETCHER: ((LineStyleGeometryModifier_BackboneStretcher *)m)->amount = 10.0; diff --git a/source/blender/makesdna/DNA_linestyle_types.h b/source/blender/makesdna/DNA_linestyle_types.h index 936f01e0ab2..94d2d4bb723 100644 --- a/source/blender/makesdna/DNA_linestyle_types.h +++ b/source/blender/makesdna/DNA_linestyle_types.h @@ -261,18 +261,20 @@ typedef struct LineStyleGeometryModifier_SpatialNoise { typedef struct LineStyleGeometryModifier_PerlinNoise1D { struct LineStyleModifier modifier; - float frequency, amplitude; + float frequency, amplitude, angle; unsigned int octaves; int seed; + int pad1; } LineStyleGeometryModifier_PerlinNoise1D; typedef struct LineStyleGeometryModifier_PerlinNoise2D { struct LineStyleModifier modifier; - float frequency, amplitude; + float frequency, amplitude, angle; unsigned int octaves; int seed; + int pad1; } LineStyleGeometryModifier_PerlinNoise2D; diff --git a/source/blender/makesrna/intern/rna_linestyle.c b/source/blender/makesrna/intern/rna_linestyle.c index eb3245de2c9..fc12477b1ae 100644 --- a/source/blender/makesrna/intern/rna_linestyle.c +++ b/source/blender/makesrna/intern/rna_linestyle.c @@ -578,6 +578,11 @@ static void rna_def_linestyle_modifiers(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Octaves", "Number of octaves (i.e., the amount of detail of the Perlin noise)."); RNA_def_property_update(prop, NC_SCENE, NULL); + prop= RNA_def_property(srna, "angle", PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, "angle"); + RNA_def_property_ui_text(prop, "Angle", "Displacement direction in degrees."); + RNA_def_property_update(prop, NC_SCENE, NULL); + prop= RNA_def_property(srna, "seed", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "seed"); RNA_def_property_ui_text(prop, "Seed", "Seed for random number generation. If negative, time is used as a seed instead."); @@ -602,6 +607,11 @@ static void rna_def_linestyle_modifiers(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Octaves", "Number of octaves (i.e., the amount of detail of the Perlin noise)."); RNA_def_property_update(prop, NC_SCENE, NULL); + prop= RNA_def_property(srna, "angle", PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, "angle"); + RNA_def_property_ui_text(prop, "Angle", "Displacement direction in degrees."); + RNA_def_property_update(prop, NC_SCENE, NULL); + prop= RNA_def_property(srna, "seed", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "seed"); RNA_def_property_ui_text(prop, "Seed", "Seed for random number generation. If negative, time is used as a seed instead."); |