diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-11-12 00:35:03 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-11-12 00:35:03 +0400 |
commit | e7a4d454350beb1ce20f3d7d2d091451a885eefe (patch) | |
tree | 4709f76bb57fadbd7dcf85204be2ff5cd0d5b13e /source/blender/makesdna/DNA_linestyle_types.h | |
parent | 80e398e7b2cfbdf0192b11734cb02b378b423d65 (diff) |
Added to the Parameter Editor mode new stroke geometry modifier `Blueprint'
that produces a blueprint using circular, elliptic, and square contour strokes.
Related changes and bug fixes were made as follows:
* The randomness in radius and center has been transformed into optional
parameters of the pyBluePrintCirclesShader and pyBluePrintEllipsesShader.
Also a new optional parameter to control the randomness of backbone
stretching has been added to the pyBluePrintSquaresShader.
* A bug in the pyBluePrintSquaresShader that invisible stroke vertices at
corners of rectangular contour strokes were not properly drawn. The problem
was due to the changes of the / operator between Python 2.x to 3.x. Even
when the two operands of the division operator are integers, Python 3.x
gives a floating-point number when the quotient is not an integer. The fix
was just to replace the / operator by the // operator for integer division.
* An unpleasant discontinuity in circular and elliptical contour strokes
was fixed.
* The length parameter of the Backbone Stretcher geometry modifier has been
renamed to `backbone_length' in line with the parameter of the same name in
the pyBluePrintSquaresShader.
Diffstat (limited to 'source/blender/makesdna/DNA_linestyle_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_linestyle_types.h | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_linestyle_types.h b/source/blender/makesdna/DNA_linestyle_types.h index a34a4285e55..a73dd707caa 100644 --- a/source/blender/makesdna/DNA_linestyle_types.h +++ b/source/blender/makesdna/DNA_linestyle_types.h @@ -64,7 +64,8 @@ typedef struct LineStyleModifier { #define LS_MODIFIER_CALLIGRAPHY 13 #define LS_MODIFIER_POLYGONIZATION 14 #define LS_MODIFIER_GUIDING_LINES 15 -#define LS_MODIFIER_NUM 16 +#define LS_MODIFIER_BLUEPRINT 16 +#define LS_MODIFIER_NUM 17 /* LineStyleModifier::flags */ #define LS_MODIFIER_ENABLED 1 @@ -284,7 +285,7 @@ typedef struct LineStyleGeometryModifier_PerlinNoise2D { typedef struct LineStyleGeometryModifier_BackboneStretcher { struct LineStyleModifier modifier; - float amount; + float backbone_length; int pad; } LineStyleGeometryModifier_BackboneStretcher; @@ -313,6 +314,23 @@ typedef struct LineStyleGeometryModifier_GuidingLines { } LineStyleGeometryModifier_GuidingLines; +/* LineStyleGeometryModifier_BluePrintLines::shape */ +#define LS_MODIFIER_BLUEPRINT_CIRCLES 1 +#define LS_MODIFIER_BLUEPRINT_ELLIPSES 2 +#define LS_MODIFIER_BLUEPRINT_SQUARES 4 + +typedef struct LineStyleGeometryModifier_Blueprint { + struct LineStyleModifier modifier; + + int flags; + unsigned int rounds; + float backbone_length; + unsigned int random_radius; + unsigned int random_center; + unsigned int random_backbone; + +} LineStyleGeometryModifier_Blueprint; + /* Calligraphic thickness modifier */ typedef struct LineStyleThicknessModifier_Calligraphy { |