diff options
Diffstat (limited to 'source/blender/blenkernel/intern/linestyle.c')
| -rw-r--r-- | source/blender/blenkernel/intern/linestyle.c | 2574 |
1 files changed, 1279 insertions, 1295 deletions
diff --git a/source/blender/blenkernel/intern/linestyle.c b/source/blender/blenkernel/intern/linestyle.c index 47201d30b63..a0cfe7dfe41 100644 --- a/source/blender/blenkernel/intern/linestyle.c +++ b/source/blender/blenkernel/intern/linestyle.c @@ -46,104 +46,104 @@ #include "BKE_animsys.h" static const char *modifier_name[LS_MODIFIER_NUM] = { - NULL, - "Along Stroke", - "Distance from Camera", - "Distance from Object", - "Material", - "Sampling", - "Bezier Curve", - "Sinus Displacement", - "Spatial Noise", - "Perlin Noise 1D", - "Perlin Noise 2D", - "Backbone Stretcher", - "Tip Remover", - "Calligraphy", - "Polygonalization", - "Guiding Lines", - "Blueprint", - "2D Offset", - "2D Transform", - "Tangent", - "Noise", - "Crease Angle", - "Simplification", - "3D Curvature", + NULL, + "Along Stroke", + "Distance from Camera", + "Distance from Object", + "Material", + "Sampling", + "Bezier Curve", + "Sinus Displacement", + "Spatial Noise", + "Perlin Noise 1D", + "Perlin Noise 2D", + "Backbone Stretcher", + "Tip Remover", + "Calligraphy", + "Polygonalization", + "Guiding Lines", + "Blueprint", + "2D Offset", + "2D Transform", + "Tangent", + "Noise", + "Crease Angle", + "Simplification", + "3D Curvature", }; void BKE_linestyle_init(FreestyleLineStyle *linestyle) { - BLI_assert(MEMCMP_STRUCT_AFTER_IS_ZERO(linestyle, id)); - - linestyle->panel = LS_PANEL_STROKES; - linestyle->r = linestyle->g = linestyle->b = 0.0f; - linestyle->alpha = 1.0f; - linestyle->thickness = 3.0f; - linestyle->thickness_position = LS_THICKNESS_CENTER; - linestyle->thickness_ratio = 0.5f; - linestyle->flag = LS_SAME_OBJECT | LS_NO_SORTING | LS_TEXTURE; - linestyle->chaining = LS_CHAINING_PLAIN; - linestyle->rounds = 3; - linestyle->min_angle = DEG2RADF(0.0f); - linestyle->max_angle = DEG2RADF(0.0f); - linestyle->min_length = 0.0f; - linestyle->max_length = 10000.0f; - linestyle->split_length = 100; - linestyle->chain_count = 10; - linestyle->sort_key = LS_SORT_KEY_DISTANCE_FROM_CAMERA; - linestyle->integration_type = LS_INTEGRATION_MEAN; - linestyle->texstep = 1.0f; - linestyle->pr_texture = TEX_PR_TEXTURE; - - BLI_listbase_clear(&linestyle->color_modifiers); - BLI_listbase_clear(&linestyle->alpha_modifiers); - BLI_listbase_clear(&linestyle->thickness_modifiers); - BLI_listbase_clear(&linestyle->geometry_modifiers); - - BKE_linestyle_geometry_modifier_add(linestyle, NULL, LS_MODIFIER_SAMPLING); - - linestyle->caps = LS_CAPS_BUTT; + BLI_assert(MEMCMP_STRUCT_AFTER_IS_ZERO(linestyle, id)); + + linestyle->panel = LS_PANEL_STROKES; + linestyle->r = linestyle->g = linestyle->b = 0.0f; + linestyle->alpha = 1.0f; + linestyle->thickness = 3.0f; + linestyle->thickness_position = LS_THICKNESS_CENTER; + linestyle->thickness_ratio = 0.5f; + linestyle->flag = LS_SAME_OBJECT | LS_NO_SORTING | LS_TEXTURE; + linestyle->chaining = LS_CHAINING_PLAIN; + linestyle->rounds = 3; + linestyle->min_angle = DEG2RADF(0.0f); + linestyle->max_angle = DEG2RADF(0.0f); + linestyle->min_length = 0.0f; + linestyle->max_length = 10000.0f; + linestyle->split_length = 100; + linestyle->chain_count = 10; + linestyle->sort_key = LS_SORT_KEY_DISTANCE_FROM_CAMERA; + linestyle->integration_type = LS_INTEGRATION_MEAN; + linestyle->texstep = 1.0f; + linestyle->pr_texture = TEX_PR_TEXTURE; + + BLI_listbase_clear(&linestyle->color_modifiers); + BLI_listbase_clear(&linestyle->alpha_modifiers); + BLI_listbase_clear(&linestyle->thickness_modifiers); + BLI_listbase_clear(&linestyle->geometry_modifiers); + + BKE_linestyle_geometry_modifier_add(linestyle, NULL, LS_MODIFIER_SAMPLING); + + linestyle->caps = LS_CAPS_BUTT; } FreestyleLineStyle *BKE_linestyle_new(struct Main *bmain, const char *name) { - FreestyleLineStyle *linestyle; + FreestyleLineStyle *linestyle; - linestyle = (FreestyleLineStyle *)BKE_libblock_alloc(bmain, ID_LS, name, 0); + linestyle = (FreestyleLineStyle *)BKE_libblock_alloc(bmain, ID_LS, name, 0); - BKE_linestyle_init(linestyle); + BKE_linestyle_init(linestyle); - return linestyle; + return linestyle; } /** Free (or release) any data used by this linestyle (does not free the linestyle itself). */ void BKE_linestyle_free(FreestyleLineStyle *linestyle) { - LineStyleModifier *m; - int a; - - BKE_animdata_free(&linestyle->id, false); - - for (a = 0; a < MAX_MTEX; a++) { - MEM_SAFE_FREE(linestyle->mtex[a]); - } - - /* is no lib link block, but linestyle extension */ - if (linestyle->nodetree) { - ntreeFreeNestedTree(linestyle->nodetree); - MEM_freeN(linestyle->nodetree); - linestyle->nodetree = NULL; - } - - while ((m = (LineStyleModifier *)linestyle->color_modifiers.first)) - BKE_linestyle_color_modifier_remove(linestyle, m); - while ((m = (LineStyleModifier *)linestyle->alpha_modifiers.first)) - BKE_linestyle_alpha_modifier_remove(linestyle, m); - while ((m = (LineStyleModifier *)linestyle->thickness_modifiers.first)) - BKE_linestyle_thickness_modifier_remove(linestyle, m); - while ((m = (LineStyleModifier *)linestyle->geometry_modifiers.first)) - BKE_linestyle_geometry_modifier_remove(linestyle, m); + LineStyleModifier *m; + int a; + + BKE_animdata_free(&linestyle->id, false); + + for (a = 0; a < MAX_MTEX; a++) { + MEM_SAFE_FREE(linestyle->mtex[a]); + } + + /* is no lib link block, but linestyle extension */ + if (linestyle->nodetree) { + ntreeFreeNestedTree(linestyle->nodetree); + MEM_freeN(linestyle->nodetree); + linestyle->nodetree = NULL; + } + + while ((m = (LineStyleModifier *)linestyle->color_modifiers.first)) + BKE_linestyle_color_modifier_remove(linestyle, m); + while ((m = (LineStyleModifier *)linestyle->alpha_modifiers.first)) + BKE_linestyle_alpha_modifier_remove(linestyle, m); + while ((m = (LineStyleModifier *)linestyle->thickness_modifiers.first)) + BKE_linestyle_thickness_modifier_remove(linestyle, m); + while ((m = (LineStyleModifier *)linestyle->geometry_modifiers.first)) + BKE_linestyle_geometry_modifier_remove(linestyle, m); } /** @@ -154,1332 +154,1316 @@ void BKE_linestyle_free(FreestyleLineStyle *linestyle) * * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more). */ -void BKE_linestyle_copy_data( - struct Main *bmain, FreestyleLineStyle *linestyle_dst, const FreestyleLineStyle *linestyle_src, const int flag) +void BKE_linestyle_copy_data(struct Main *bmain, + FreestyleLineStyle *linestyle_dst, + const FreestyleLineStyle *linestyle_src, + const int flag) { - /* We never handle usercount here for own data. */ - const int flag_subdata = flag | LIB_ID_CREATE_NO_USER_REFCOUNT; - - for (int a = 0; a < MAX_MTEX; a++) { - if (linestyle_src->mtex[a]) { - linestyle_dst->mtex[a] = MEM_mallocN(sizeof(*linestyle_dst->mtex[a]), __func__); - *linestyle_dst->mtex[a] = *linestyle_src->mtex[a]; - } - } - - if (linestyle_src->nodetree) { - /* Note: nodetree is *not* in bmain, however this specific case is handled at lower level - * (see BKE_libblock_copy_ex()). */ - BKE_id_copy_ex(bmain, (ID *)linestyle_src->nodetree, (ID **)&linestyle_dst->nodetree, flag); - } - - LineStyleModifier *m; - BLI_listbase_clear(&linestyle_dst->color_modifiers); - for (m = (LineStyleModifier *)linestyle_src->color_modifiers.first; m; m = m->next) { - BKE_linestyle_color_modifier_copy(linestyle_dst, m, flag_subdata); - } - BLI_listbase_clear(&linestyle_dst->alpha_modifiers); - for (m = (LineStyleModifier *)linestyle_src->alpha_modifiers.first; m; m = m->next) { - BKE_linestyle_alpha_modifier_copy(linestyle_dst, m, flag_subdata); - } - BLI_listbase_clear(&linestyle_dst->thickness_modifiers); - for (m = (LineStyleModifier *)linestyle_src->thickness_modifiers.first; m; m = m->next) { - BKE_linestyle_thickness_modifier_copy(linestyle_dst, m, flag_subdata); - } - BLI_listbase_clear(&linestyle_dst->geometry_modifiers); - for (m = (LineStyleModifier *)linestyle_src->geometry_modifiers.first; m; m = m->next) { - BKE_linestyle_geometry_modifier_copy(linestyle_dst, m, flag_subdata); - } + /* We never handle usercount here for own data. */ + const int flag_subdata = flag | LIB_ID_CREATE_NO_USER_REFCOUNT; + + for (int a = 0; a < MAX_MTEX; a++) { + if (linestyle_src->mtex[a]) { + linestyle_dst->mtex[a] = MEM_mallocN(sizeof(*linestyle_dst->mtex[a]), __func__); + *linestyle_dst->mtex[a] = *linestyle_src->mtex[a]; + } + } + + if (linestyle_src->nodetree) { + /* Note: nodetree is *not* in bmain, however this specific case is handled at lower level + * (see BKE_libblock_copy_ex()). */ + BKE_id_copy_ex(bmain, (ID *)linestyle_src->nodetree, (ID **)&linestyle_dst->nodetree, flag); + } + + LineStyleModifier *m; + BLI_listbase_clear(&linestyle_dst->color_modifiers); + for (m = (LineStyleModifier *)linestyle_src->color_modifiers.first; m; m = m->next) { + BKE_linestyle_color_modifier_copy(linestyle_dst, m, flag_subdata); + } + BLI_listbase_clear(&linestyle_dst->alpha_modifiers); + for (m = (LineStyleModifier *)linestyle_src->alpha_modifiers.first; m; m = m->next) { + BKE_linestyle_alpha_modifier_copy(linestyle_dst, m, flag_subdata); + } + BLI_listbase_clear(&linestyle_dst->thickness_modifiers); + for (m = (LineStyleModifier *)linestyle_src->thickness_modifiers.first; m; m = m->next) { + BKE_linestyle_thickness_modifier_copy(linestyle_dst, m, flag_subdata); + } + BLI_listbase_clear(&linestyle_dst->geometry_modifiers); + for (m = (LineStyleModifier *)linestyle_src->geometry_modifiers.first; m; m = m->next) { + BKE_linestyle_geometry_modifier_copy(linestyle_dst, m, flag_subdata); + } } FreestyleLineStyle *BKE_linestyle_copy(struct Main *bmain, const FreestyleLineStyle *linestyle) { - FreestyleLineStyle *linestyle_copy; - BKE_id_copy(bmain, &linestyle->id, (ID **)&linestyle_copy); - return linestyle_copy; + FreestyleLineStyle *linestyle_copy; + BKE_id_copy(bmain, &linestyle->id, (ID **)&linestyle_copy); + return linestyle_copy; } -void BKE_linestyle_make_local(struct Main *bmain, FreestyleLineStyle *linestyle, const bool lib_local) +void BKE_linestyle_make_local(struct Main *bmain, + FreestyleLineStyle *linestyle, + const bool lib_local) { - BKE_id_make_local_generic(bmain, &linestyle->id, true, lib_local); + BKE_id_make_local_generic(bmain, &linestyle->id, true, lib_local); } FreestyleLineStyle *BKE_linestyle_active_from_view_layer(ViewLayer *view_layer) { - FreestyleConfig *config = &view_layer->freestyle_config; - FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(config); - return (lineset) ? lineset->linestyle : NULL; + FreestyleConfig *config = &view_layer->freestyle_config; + FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(config); + return (lineset) ? lineset->linestyle : NULL; } static LineStyleModifier *new_modifier(const char *name, int type, size_t size) { - LineStyleModifier *m; - - if (!name) { - name = modifier_name[type]; - } - m = (LineStyleModifier *)MEM_callocN(size, "line style modifier"); - m->type = type; - BLI_strncpy(m->name, name, sizeof(m->name)); - m->influence = 1.0f; - m->flags = LS_MODIFIER_ENABLED | LS_MODIFIER_EXPANDED; - - return m; + LineStyleModifier *m; + + if (!name) { + name = modifier_name[type]; + } + m = (LineStyleModifier *)MEM_callocN(size, "line style modifier"); + m->type = type; + BLI_strncpy(m->name, name, sizeof(m->name)); + m->influence = 1.0f; + m->flags = LS_MODIFIER_ENABLED | LS_MODIFIER_EXPANDED; + + return m; } static void add_to_modifier_list(ListBase *lb, LineStyleModifier *m) { - BLI_addtail(lb, (void *)m); - BLI_uniquename(lb, m, modifier_name[m->type], '.', offsetof(LineStyleModifier, name), sizeof(m->name)); + BLI_addtail(lb, (void *)m); + BLI_uniquename( + lb, m, modifier_name[m->type], '.', offsetof(LineStyleModifier, name), sizeof(m->name)); } static LineStyleModifier *alloc_color_modifier(const char *name, int type) { - size_t size; - - switch (type) { - case LS_MODIFIER_ALONG_STROKE: - size = sizeof(LineStyleColorModifier_AlongStroke); - break; - case LS_MODIFIER_DISTANCE_FROM_CAMERA: - size = sizeof(LineStyleColorModifier_DistanceFromCamera); - break; - case LS_MODIFIER_DISTANCE_FROM_OBJECT: - size = sizeof(LineStyleColorModifier_DistanceFromObject); - break; - case LS_MODIFIER_MATERIAL: - size = sizeof(LineStyleColorModifier_Material); - break; - case LS_MODIFIER_TANGENT: - size = sizeof(LineStyleColorModifier_Tangent); - break; - case LS_MODIFIER_NOISE: - size = sizeof(LineStyleColorModifier_Noise); - break; - case LS_MODIFIER_CREASE_ANGLE: - size = sizeof(LineStyleColorModifier_CreaseAngle); - break; - case LS_MODIFIER_CURVATURE_3D: - size = sizeof(LineStyleColorModifier_Curvature_3D); - break; - default: - return NULL; /* unknown modifier type */ - } - - return new_modifier(name, type, size); + size_t size; + + switch (type) { + case LS_MODIFIER_ALONG_STROKE: + size = sizeof(LineStyleColorModifier_AlongStroke); + break; + case LS_MODIFIER_DISTANCE_FROM_CAMERA: + size = sizeof(LineStyleColorModifier_DistanceFromCamera); + break; + case LS_MODIFIER_DISTANCE_FROM_OBJECT: + size = sizeof(LineStyleColorModifier_DistanceFromObject); + break; + case LS_MODIFIER_MATERIAL: + size = sizeof(LineStyleColorModifier_Material); + break; + case LS_MODIFIER_TANGENT: + size = sizeof(LineStyleColorModifier_Tangent); + break; + case LS_MODIFIER_NOISE: + size = sizeof(LineStyleColorModifier_Noise); + break; + case LS_MODIFIER_CREASE_ANGLE: + size = sizeof(LineStyleColorModifier_CreaseAngle); + break; + case LS_MODIFIER_CURVATURE_3D: + size = sizeof(LineStyleColorModifier_Curvature_3D); + break; + default: + return NULL; /* unknown modifier type */ + } + + return new_modifier(name, type, size); } -LineStyleModifier *BKE_linestyle_color_modifier_add(FreestyleLineStyle *linestyle, const char *name, int type) +LineStyleModifier *BKE_linestyle_color_modifier_add(FreestyleLineStyle *linestyle, + const char *name, + int type) { - LineStyleModifier *m; - - m = alloc_color_modifier(name, type); - if (UNLIKELY(m == NULL)) { - return NULL; - } - m->blend = MA_RAMP_BLEND; - - switch (type) { - case LS_MODIFIER_ALONG_STROKE: - ((LineStyleColorModifier_AlongStroke *)m)->color_ramp = BKE_colorband_add(true); - break; - case LS_MODIFIER_DISTANCE_FROM_CAMERA: - ((LineStyleColorModifier_DistanceFromCamera *)m)->color_ramp = BKE_colorband_add(true); - ((LineStyleColorModifier_DistanceFromCamera *)m)->range_min = 0.0f; - ((LineStyleColorModifier_DistanceFromCamera *)m)->range_max = 10000.0f; - break; - case LS_MODIFIER_DISTANCE_FROM_OBJECT: - ((LineStyleColorModifier_DistanceFromObject *)m)->target = NULL; - ((LineStyleColorModifier_DistanceFromObject *)m)->color_ramp = BKE_colorband_add(true); - ((LineStyleColorModifier_DistanceFromObject *)m)->range_min = 0.0f; - ((LineStyleColorModifier_DistanceFromObject *)m)->range_max = 10000.0f; - break; - case LS_MODIFIER_MATERIAL: - ((LineStyleColorModifier_Material *)m)->color_ramp = BKE_colorband_add(true); - ((LineStyleColorModifier_Material *)m)->mat_attr = LS_MODIFIER_MATERIAL_LINE; - break; - case LS_MODIFIER_TANGENT: - ((LineStyleColorModifier_Tangent *)m)->color_ramp = BKE_colorband_add(true); - break; - case LS_MODIFIER_NOISE: - ((LineStyleColorModifier_Noise *)m)->color_ramp = BKE_colorband_add(true); - ((LineStyleColorModifier_Noise *)m)->amplitude = 10.0f; - ((LineStyleColorModifier_Noise *)m)->period = 10.0f; - ((LineStyleColorModifier_Noise *)m)->seed = 512; - break; - case LS_MODIFIER_CREASE_ANGLE: - ((LineStyleColorModifier_CreaseAngle *)m)->color_ramp = BKE_colorband_add(true); - ((LineStyleColorModifier_CreaseAngle *)m)->min_angle = 0.0f; - ((LineStyleColorModifier_CreaseAngle *)m)->max_angle = DEG2RADF(180.0f); - break; - case LS_MODIFIER_CURVATURE_3D: - ((LineStyleColorModifier_Curvature_3D *)m)->color_ramp = BKE_colorband_add(true); - ((LineStyleColorModifier_Curvature_3D *)m)->min_curvature = 0.0f; - ((LineStyleColorModifier_Curvature_3D *)m)->max_curvature = 0.5f; - break; - default: - return NULL; /* unknown modifier type */ - } - add_to_modifier_list(&linestyle->color_modifiers, m); - - return m; + LineStyleModifier *m; + + m = alloc_color_modifier(name, type); + if (UNLIKELY(m == NULL)) { + return NULL; + } + m->blend = MA_RAMP_BLEND; + + switch (type) { + case LS_MODIFIER_ALONG_STROKE: + ((LineStyleColorModifier_AlongStroke *)m)->color_ramp = BKE_colorband_add(true); + break; + case LS_MODIFIER_DISTANCE_FROM_CAMERA: + ((LineStyleColorModifier_DistanceFromCamera *)m)->color_ramp = BKE_colorband_add(true); + ((LineStyleColorModifier_DistanceFromCamera *)m)->range_min = 0.0f; + ((LineStyleColorModifier_DistanceFromCamera *)m)->range_max = 10000.0f; + break; + case LS_MODIFIER_DISTANCE_FROM_OBJECT: + ((LineStyleColorModifier_DistanceFromObject *)m)->target = NULL; + ((LineStyleColorModifier_DistanceFromObject *)m)->color_ramp = BKE_colorband_add(true); + ((LineStyleColorModifier_DistanceFromObject *)m)->range_min = 0.0f; + ((LineStyleColorModifier_DistanceFromObject *)m)->range_max = 10000.0f; + break; + case LS_MODIFIER_MATERIAL: + ((LineStyleColorModifier_Material *)m)->color_ramp = BKE_colorband_add(true); + ((LineStyleColorModifier_Material *)m)->mat_attr = LS_MODIFIER_MATERIAL_LINE; + break; + case LS_MODIFIER_TANGENT: + ((LineStyleColorModifier_Tangent *)m)->color_ramp = BKE_colorband_add(true); + break; + case LS_MODIFIER_NOISE: + ((LineStyleColorModifier_Noise *)m)->color_ramp = BKE_colorband_add(true); + ((LineStyleColorModifier_Noise *)m)->amplitude = 10.0f; + ((LineStyleColorModifier_Noise *)m)->period = 10.0f; + ((LineStyleColorModifier_Noise *)m)->seed = 512; + break; + case LS_MODIFIER_CREASE_ANGLE: + ((LineStyleColorModifier_CreaseAngle *)m)->color_ramp = BKE_colorband_add(true); + ((LineStyleColorModifier_CreaseAngle *)m)->min_angle = 0.0f; + ((LineStyleColorModifier_CreaseAngle *)m)->max_angle = DEG2RADF(180.0f); + break; + case LS_MODIFIER_CURVATURE_3D: + ((LineStyleColorModifier_Curvature_3D *)m)->color_ramp = BKE_colorband_add(true); + ((LineStyleColorModifier_Curvature_3D *)m)->min_curvature = 0.0f; + ((LineStyleColorModifier_Curvature_3D *)m)->max_curvature = 0.5f; + break; + default: + return NULL; /* unknown modifier type */ + } + add_to_modifier_list(&linestyle->color_modifiers, m); + + return m; } -LineStyleModifier *BKE_linestyle_color_modifier_copy( - FreestyleLineStyle *linestyle, const LineStyleModifier *m, const int flag) +LineStyleModifier *BKE_linestyle_color_modifier_copy(FreestyleLineStyle *linestyle, + const LineStyleModifier *m, + const int flag) { - LineStyleModifier *new_m; - - new_m = alloc_color_modifier(m->name, m->type); - if (UNLIKELY(new_m == NULL)) { - return NULL; - } - new_m->influence = m->influence; - new_m->flags = m->flags; - new_m->blend = m->blend; - - switch (m->type) { - case LS_MODIFIER_ALONG_STROKE: - { - LineStyleColorModifier_AlongStroke *p = (LineStyleColorModifier_AlongStroke *)m; - LineStyleColorModifier_AlongStroke *q = (LineStyleColorModifier_AlongStroke *)new_m; - q->color_ramp = MEM_dupallocN(p->color_ramp); - break; - } - case LS_MODIFIER_DISTANCE_FROM_CAMERA: - { - LineStyleColorModifier_DistanceFromCamera *p = (LineStyleColorModifier_DistanceFromCamera *)m; - LineStyleColorModifier_DistanceFromCamera *q = (LineStyleColorModifier_DistanceFromCamera *)new_m; - q->color_ramp = MEM_dupallocN(p->color_ramp); - q->range_min = p->range_min; - q->range_max = p->range_max; - break; - } - case LS_MODIFIER_DISTANCE_FROM_OBJECT: - { - LineStyleColorModifier_DistanceFromObject *p = (LineStyleColorModifier_DistanceFromObject *)m; - LineStyleColorModifier_DistanceFromObject *q = (LineStyleColorModifier_DistanceFromObject *)new_m; - q->target = p->target; - if ((flag & LIB_ID_CREATE_NO_USER_REFCOUNT) == 0) { - id_us_plus((ID *)q->target); - } - q->color_ramp = MEM_dupallocN(p->color_ramp); - q->range_min = p->range_min; - q->range_max = p->range_max; - break; - } - case LS_MODIFIER_MATERIAL: - { - LineStyleColorModifier_Material *p = (LineStyleColorModifier_Material *)m; - LineStyleColorModifier_Material *q = (LineStyleColorModifier_Material *)new_m; - q->color_ramp = MEM_dupallocN(p->color_ramp); - q->flags = p->flags; - q->mat_attr = p->mat_attr; - break; - } - case LS_MODIFIER_TANGENT: - { - LineStyleColorModifier_Tangent *p = (LineStyleColorModifier_Tangent *)m; - LineStyleColorModifier_Tangent *q = (LineStyleColorModifier_Tangent *)new_m; - q->color_ramp = MEM_dupallocN(p->color_ramp); - break; - } - case LS_MODIFIER_NOISE: - { - LineStyleColorModifier_Noise *p = (LineStyleColorModifier_Noise *)m; - LineStyleColorModifier_Noise *q = (LineStyleColorModifier_Noise *)new_m; - q->color_ramp = MEM_dupallocN(p->color_ramp); - q->amplitude = p->amplitude; - q->period = p->period; - q->seed = p->seed; - break; - } - case LS_MODIFIER_CREASE_ANGLE: - { - LineStyleColorModifier_CreaseAngle *p = (LineStyleColorModifier_CreaseAngle *)m; - LineStyleColorModifier_CreaseAngle *q = (LineStyleColorModifier_CreaseAngle *)new_m; - q->color_ramp = MEM_dupallocN(p->color_ramp); - q->min_angle = p->min_angle; - q->max_angle = p->max_angle; - break; - } - case LS_MODIFIER_CURVATURE_3D: - { - LineStyleColorModifier_Curvature_3D *p = (LineStyleColorModifier_Curvature_3D *)m; - LineStyleColorModifier_Curvature_3D *q = (LineStyleColorModifier_Curvature_3D *)new_m; - q->color_ramp = MEM_dupallocN(p->color_ramp); - q->min_curvature = p->min_curvature; - q->max_curvature = p->max_curvature; - break; - } - default: - return NULL; /* unknown modifier type */ - } - add_to_modifier_list(&linestyle->color_modifiers, new_m); - - return new_m; + LineStyleModifier *new_m; + + new_m = alloc_color_modifier(m->name, m->type); + if (UNLIKELY(new_m == NULL)) { + return NULL; + } + new_m->influence = m->influence; + new_m->flags = m->flags; + new_m->blend = m->blend; + + switch (m->type) { + case LS_MODIFIER_ALONG_STROKE: { + LineStyleColorModifier_AlongStroke *p = (LineStyleColorModifier_AlongStroke *)m; + LineStyleColorModifier_AlongStroke *q = (LineStyleColorModifier_AlongStroke *)new_m; + q->color_ramp = MEM_dupallocN(p->color_ramp); + break; + } + case LS_MODIFIER_DISTANCE_FROM_CAMERA: { + LineStyleColorModifier_DistanceFromCamera *p = (LineStyleColorModifier_DistanceFromCamera *) + m; + LineStyleColorModifier_DistanceFromCamera *q = (LineStyleColorModifier_DistanceFromCamera *) + new_m; + q->color_ramp = MEM_dupallocN(p->color_ramp); + q->range_min = p->range_min; + q->range_max = p->range_max; + break; + } + case LS_MODIFIER_DISTANCE_FROM_OBJECT: { + LineStyleColorModifier_DistanceFromObject *p = (LineStyleColorModifier_DistanceFromObject *) + m; + LineStyleColorModifier_DistanceFromObject *q = (LineStyleColorModifier_DistanceFromObject *) + new_m; + q->target = p->target; + if ((flag & LIB_ID_CREATE_NO_USER_REFCOUNT) == 0) { + id_us_plus((ID *)q->target); + } + q->color_ramp = MEM_dupallocN(p->color_ramp); + q->range_min = p->range_min; + q->range_max = p->range_max; + break; + } + case LS_MODIFIER_MATERIAL: { + LineStyleColorModifier_Material *p = (LineStyleColorModifier_Material *)m; + LineStyleColorModifier_Material *q = (LineStyleColorModifier_Material *)new_m; + q->color_ramp = MEM_dupallocN(p->color_ramp); + q->flags = p->flags; + q->mat_attr = p->mat_attr; + break; + } + case LS_MODIFIER_TANGENT: { + LineStyleColorModifier_Tangent *p = (LineStyleColorModifier_Tangent *)m; + LineStyleColorModifier_Tangent *q = (LineStyleColorModifier_Tangent *)new_m; + q->color_ramp = MEM_dupallocN(p->color_ramp); + break; + } + case LS_MODIFIER_NOISE: { + LineStyleColorModifier_Noise *p = (LineStyleColorModifier_Noise *)m; + LineStyleColorModifier_Noise *q = (LineStyleColorModifier_Noise *)new_m; + q->color_ramp = MEM_dupallocN(p->color_ramp); + q->amplitude = p->amplitude; + q->period = p->period; + q->seed = p->seed; + break; + } + case LS_MODIFIER_CREASE_ANGLE: { + LineStyleColorModifier_CreaseAngle *p = (LineStyleColorModifier_CreaseAngle *)m; + LineStyleColorModifier_CreaseAngle *q = (LineStyleColorModifier_CreaseAngle *)new_m; + q->color_ramp = MEM_dupallocN(p->color_ramp); + q->min_angle = p->min_angle; + q->max_angle = p->max_angle; + break; + } + case LS_MODIFIER_CURVATURE_3D: { + LineStyleColorModifier_Curvature_3D *p = (LineStyleColorModifier_Curvature_3D *)m; + LineStyleColorModifier_Curvature_3D *q = (LineStyleColorModifier_Curvature_3D *)new_m; + q->color_ramp = MEM_dupallocN(p->color_ramp); + q->min_curvature = p->min_curvature; + q->max_curvature = p->max_curvature; + break; + } + default: + return NULL; /* unknown modifier type */ + } + add_to_modifier_list(&linestyle->color_modifiers, new_m); + + return new_m; } int BKE_linestyle_color_modifier_remove(FreestyleLineStyle *linestyle, LineStyleModifier *m) { - if (BLI_findindex(&linestyle->color_modifiers, m) == -1) - return -1; - switch (m->type) { - case LS_MODIFIER_ALONG_STROKE: - MEM_freeN(((LineStyleColorModifier_AlongStroke *)m)->color_ramp); - break; - case LS_MODIFIER_DISTANCE_FROM_CAMERA: - MEM_freeN(((LineStyleColorModifier_DistanceFromCamera *)m)->color_ramp); - break; - case LS_MODIFIER_DISTANCE_FROM_OBJECT: - MEM_freeN(((LineStyleColorModifier_DistanceFromObject *)m)->color_ramp); - break; - case LS_MODIFIER_MATERIAL: - MEM_freeN(((LineStyleColorModifier_Material *)m)->color_ramp); - break; - case LS_MODIFIER_TANGENT: - MEM_freeN(((LineStyleColorModifier_Tangent *)m)->color_ramp); - break; - case LS_MODIFIER_NOISE: - MEM_freeN(((LineStyleColorModifier_Noise *)m)->color_ramp); - break; - case LS_MODIFIER_CREASE_ANGLE: - MEM_freeN(((LineStyleColorModifier_CreaseAngle *)m)->color_ramp); - break; - case LS_MODIFIER_CURVATURE_3D: - MEM_freeN(((LineStyleColorModifier_Curvature_3D *)m)->color_ramp); - break; - } - BLI_freelinkN(&linestyle->color_modifiers, m); - return 0; + if (BLI_findindex(&linestyle->color_modifiers, m) == -1) + return -1; + switch (m->type) { + case LS_MODIFIER_ALONG_STROKE: + MEM_freeN(((LineStyleColorModifier_AlongStroke *)m)->color_ramp); + break; + case LS_MODIFIER_DISTANCE_FROM_CAMERA: + MEM_freeN(((LineStyleColorModifier_DistanceFromCamera *)m)->color_ramp); + break; + case LS_MODIFIER_DISTANCE_FROM_OBJECT: + MEM_freeN(((LineStyleColorModifier_DistanceFromObject *)m)->color_ramp); + break; + case LS_MODIFIER_MATERIAL: + MEM_freeN(((LineStyleColorModifier_Material *)m)->color_ramp); + break; + case LS_MODIFIER_TANGENT: + MEM_freeN(((LineStyleColorModifier_Tangent *)m)->color_ramp); + break; + case LS_MODIFIER_NOISE: + MEM_freeN(((LineStyleColorModifier_Noise *)m)->color_ramp); + break; + case LS_MODIFIER_CREASE_ANGLE: + MEM_freeN(((LineStyleColorModifier_CreaseAngle *)m)->color_ramp); + break; + case LS_MODIFIER_CURVATURE_3D: + MEM_freeN(((LineStyleColorModifier_Curvature_3D *)m)->color_ramp); + break; + } + BLI_freelinkN(&linestyle->color_modifiers, m); + return 0; } static LineStyleModifier *alloc_alpha_modifier(const char *name, int type) { - size_t size; - - switch (type) { - case LS_MODIFIER_ALONG_STROKE: - size = sizeof(LineStyleAlphaModifier_AlongStroke); - break; - case LS_MODIFIER_DISTANCE_FROM_CAMERA: - size = sizeof(LineStyleAlphaModifier_DistanceFromCamera); - break; - case LS_MODIFIER_DISTANCE_FROM_OBJECT: - size = sizeof(LineStyleAlphaModifier_DistanceFromObject); - break; - case LS_MODIFIER_MATERIAL: - size = sizeof(LineStyleAlphaModifier_Material); - break; - case LS_MODIFIER_TANGENT: - size = sizeof(LineStyleAlphaModifier_Tangent); - break; - case LS_MODIFIER_NOISE: - size = sizeof(LineStyleAlphaModifier_Noise); - break; - case LS_MODIFIER_CREASE_ANGLE: - size = sizeof(LineStyleAlphaModifier_CreaseAngle); - break; - case LS_MODIFIER_CURVATURE_3D: - size = sizeof(LineStyleAlphaModifier_Curvature_3D); - break; - default: - return NULL; /* unknown modifier type */ - } - return new_modifier(name, type, size); + size_t size; + + switch (type) { + case LS_MODIFIER_ALONG_STROKE: + size = sizeof(LineStyleAlphaModifier_AlongStroke); + break; + case LS_MODIFIER_DISTANCE_FROM_CAMERA: + size = sizeof(LineStyleAlphaModifier_DistanceFromCamera); + break; + case LS_MODIFIER_DISTANCE_FROM_OBJECT: + size = sizeof(LineStyleAlphaModifier_DistanceFromObject); + break; + case LS_MODIFIER_MATERIAL: + size = sizeof(LineStyleAlphaModifier_Material); + break; + case LS_MODIFIER_TANGENT: + size = sizeof(LineStyleAlphaModifier_Tangent); + break; + case LS_MODIFIER_NOISE: + size = sizeof(LineStyleAlphaModifier_Noise); + break; + case LS_MODIFIER_CREASE_ANGLE: + size = sizeof(LineStyleAlphaModifier_CreaseAngle); + break; + case LS_MODIFIER_CURVATURE_3D: + size = sizeof(LineStyleAlphaModifier_Curvature_3D); + break; + default: + return NULL; /* unknown modifier type */ + } + return new_modifier(name, type, size); } -LineStyleModifier *BKE_linestyle_alpha_modifier_add(FreestyleLineStyle *linestyle, const char *name, int type) +LineStyleModifier *BKE_linestyle_alpha_modifier_add(FreestyleLineStyle *linestyle, + const char *name, + int type) { - LineStyleModifier *m; - - m = alloc_alpha_modifier(name, type); - m->blend = LS_VALUE_BLEND; - - switch (type) { - case LS_MODIFIER_ALONG_STROKE: - { - LineStyleAlphaModifier_AlongStroke *p = (LineStyleAlphaModifier_AlongStroke *)m; - p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); - break; - } - case LS_MODIFIER_DISTANCE_FROM_CAMERA: - { - LineStyleAlphaModifier_DistanceFromCamera *p = (LineStyleAlphaModifier_DistanceFromCamera *)m; - p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); - p->range_min = 0.0f; - p->range_max = 10000.0f; - break; - } - case LS_MODIFIER_DISTANCE_FROM_OBJECT: - { - LineStyleAlphaModifier_DistanceFromObject *p = (LineStyleAlphaModifier_DistanceFromObject *)m; - p->target = NULL; - p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); - p->range_min = 0.0f; - p->range_max = 10000.0f; - break; - } - case LS_MODIFIER_MATERIAL: - { - LineStyleAlphaModifier_Material *p = (LineStyleAlphaModifier_Material *)m; - p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); - p->mat_attr = LS_MODIFIER_MATERIAL_LINE_A; - break; - } - case LS_MODIFIER_TANGENT: - { - LineStyleAlphaModifier_Tangent *p = (LineStyleAlphaModifier_Tangent *)m; - p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); - break; - } - case LS_MODIFIER_NOISE: - { - LineStyleAlphaModifier_Noise *p = (LineStyleAlphaModifier_Noise *)m; - p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); - ((LineStyleAlphaModifier_Noise *)m)->amplitude = 10.0f; - ((LineStyleAlphaModifier_Noise *)m)->period = 10.0f; - ((LineStyleAlphaModifier_Noise *)m)->seed = 512; - break; - } - case LS_MODIFIER_CREASE_ANGLE: - { - LineStyleAlphaModifier_CreaseAngle *p = (LineStyleAlphaModifier_CreaseAngle *)m; - p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); - ((LineStyleAlphaModifier_CreaseAngle *)m)->min_angle = 0.0f; - ((LineStyleAlphaModifier_CreaseAngle *)m)->max_angle = DEG2RADF(180.0f); - break; - } - case LS_MODIFIER_CURVATURE_3D: - { - LineStyleAlphaModifier_Curvature_3D *p = (LineStyleAlphaModifier_Curvature_3D *)m; - p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); - ((LineStyleAlphaModifier_Curvature_3D *)m)->min_curvature = 0.0f; - ((LineStyleAlphaModifier_Curvature_3D *)m)->max_curvature = 0.5f; - break; - } - default: - return NULL; /* unknown modifier type */ - } - add_to_modifier_list(&linestyle->alpha_modifiers, m); - - return m; + LineStyleModifier *m; + + m = alloc_alpha_modifier(name, type); + m->blend = LS_VALUE_BLEND; + + switch (type) { + case LS_MODIFIER_ALONG_STROKE: { + LineStyleAlphaModifier_AlongStroke *p = (LineStyleAlphaModifier_AlongStroke *)m; + p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); + break; + } + case LS_MODIFIER_DISTANCE_FROM_CAMERA: { + LineStyleAlphaModifier_DistanceFromCamera *p = (LineStyleAlphaModifier_DistanceFromCamera *) + m; + p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); + p->range_min = 0.0f; + p->range_max = 10000.0f; + break; + } + case LS_MODIFIER_DISTANCE_FROM_OBJECT: { + LineStyleAlphaModifier_DistanceFromObject *p = (LineStyleAlphaModifier_DistanceFromObject *) + m; + p->target = NULL; + p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); + p->range_min = 0.0f; + p->range_max = 10000.0f; + break; + } + case LS_MODIFIER_MATERIAL: { + LineStyleAlphaModifier_Material *p = (LineStyleAlphaModifier_Material *)m; + p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); + p->mat_attr = LS_MODIFIER_MATERIAL_LINE_A; + break; + } + case LS_MODIFIER_TANGENT: { + LineStyleAlphaModifier_Tangent *p = (LineStyleAlphaModifier_Tangent *)m; + p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); + break; + } + case LS_MODIFIER_NOISE: { + LineStyleAlphaModifier_Noise *p = (LineStyleAlphaModifier_Noise *)m; + p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); + ((LineStyleAlphaModifier_Noise *)m)->amplitude = 10.0f; + ((LineStyleAlphaModifier_Noise *)m)->period = 10.0f; + ((LineStyleAlphaModifier_Noise *)m)->seed = 512; + break; + } + case LS_MODIFIER_CREASE_ANGLE: { + LineStyleAlphaModifier_CreaseAngle *p = (LineStyleAlphaModifier_CreaseAngle *)m; + p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); + ((LineStyleAlphaModifier_CreaseAngle *)m)->min_angle = 0.0f; + ((LineStyleAlphaModifier_CreaseAngle *)m)->max_angle = DEG2RADF(180.0f); + break; + } + case LS_MODIFIER_CURVATURE_3D: { + LineStyleAlphaModifier_Curvature_3D *p = (LineStyleAlphaModifier_Curvature_3D *)m; + p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); + ((LineStyleAlphaModifier_Curvature_3D *)m)->min_curvature = 0.0f; + ((LineStyleAlphaModifier_Curvature_3D *)m)->max_curvature = 0.5f; + break; + } + default: + return NULL; /* unknown modifier type */ + } + add_to_modifier_list(&linestyle->alpha_modifiers, m); + + return m; } -LineStyleModifier *BKE_linestyle_alpha_modifier_copy( - FreestyleLineStyle *linestyle, const LineStyleModifier *m, const int UNUSED(flag)) +LineStyleModifier *BKE_linestyle_alpha_modifier_copy(FreestyleLineStyle *linestyle, + const LineStyleModifier *m, + const int UNUSED(flag)) { - LineStyleModifier *new_m; - - new_m = alloc_alpha_modifier(m->name, m->type); - new_m->influence = m->influence; - new_m->flags = m->flags; - new_m->blend = m->blend; - - switch (m->type) { - case LS_MODIFIER_ALONG_STROKE: - { - LineStyleAlphaModifier_AlongStroke *p = (LineStyleAlphaModifier_AlongStroke *)m; - LineStyleAlphaModifier_AlongStroke *q = (LineStyleAlphaModifier_AlongStroke *)new_m; - q->curve = curvemapping_copy(p->curve); - q->flags = p->flags; - break; - } - case LS_MODIFIER_DISTANCE_FROM_CAMERA: - { - LineStyleAlphaModifier_DistanceFromCamera *p = (LineStyleAlphaModifier_DistanceFromCamera *)m; - LineStyleAlphaModifier_DistanceFromCamera *q = (LineStyleAlphaModifier_DistanceFromCamera *)new_m; - q->curve = curvemapping_copy(p->curve); - q->flags = p->flags; - q->range_min = p->range_min; - q->range_max = p->range_max; - break; - } - case LS_MODIFIER_DISTANCE_FROM_OBJECT: - { - LineStyleAlphaModifier_DistanceFromObject *p = (LineStyleAlphaModifier_DistanceFromObject *)m; - LineStyleAlphaModifier_DistanceFromObject *q = (LineStyleAlphaModifier_DistanceFromObject *)new_m; - if (p->target) - id_us_plus(&p->target->id); - q->target = p->target; - q->curve = curvemapping_copy(p->curve); - q->flags = p->flags; - q->range_min = p->range_min; - q->range_max = p->range_max; - break; - } - case LS_MODIFIER_MATERIAL: - { - LineStyleAlphaModifier_Material *p = (LineStyleAlphaModifier_Material *)m; - LineStyleAlphaModifier_Material *q = (LineStyleAlphaModifier_Material *)new_m; - q->curve = curvemapping_copy(p->curve); - q->flags = p->flags; - q->mat_attr = p->mat_attr; - break; - } - case LS_MODIFIER_TANGENT: - { - LineStyleAlphaModifier_Tangent *p = (LineStyleAlphaModifier_Tangent *)m; - LineStyleAlphaModifier_Tangent *q = (LineStyleAlphaModifier_Tangent *)new_m; - q->curve = curvemapping_copy(p->curve); - q->flags = p->flags; - break; - } - case LS_MODIFIER_NOISE: - { - LineStyleAlphaModifier_Noise *p = (LineStyleAlphaModifier_Noise *)m; - LineStyleAlphaModifier_Noise *q = (LineStyleAlphaModifier_Noise *)new_m; - q->curve = curvemapping_copy(p->curve); - q->flags = p->flags; - q->amplitude = p->amplitude; - q->period = p->period; - q->seed = p->seed; - break; - } - case LS_MODIFIER_CREASE_ANGLE: - { - LineStyleAlphaModifier_CreaseAngle *p = (LineStyleAlphaModifier_CreaseAngle *)m; - LineStyleAlphaModifier_CreaseAngle *q = (LineStyleAlphaModifier_CreaseAngle *)new_m; - q->curve = curvemapping_copy(p->curve); - q->flags = p->flags; - q->min_angle = p->min_angle; - q->max_angle = p->max_angle; - break; - } - case LS_MODIFIER_CURVATURE_3D: - { - LineStyleAlphaModifier_Curvature_3D *p = (LineStyleAlphaModifier_Curvature_3D *)m; - LineStyleAlphaModifier_Curvature_3D *q = (LineStyleAlphaModifier_Curvature_3D *)new_m; - q->curve = curvemapping_copy(p->curve); - q->flags = p->flags; - q->min_curvature = p->min_curvature; - q->max_curvature = p->max_curvature; - break; - } - default: - return NULL; /* unknown modifier type */ - } - add_to_modifier_list(&linestyle->alpha_modifiers, new_m); - - return new_m; + LineStyleModifier *new_m; + + new_m = alloc_alpha_modifier(m->name, m->type); + new_m->influence = m->influence; + new_m->flags = m->flags; + new_m->blend = m->blend; + + switch (m->type) { + case LS_MODIFIER_ALONG_STROKE: { + LineStyleAlphaModifier_AlongStroke *p = (LineStyleAlphaModifier_AlongStroke *)m; + LineStyleAlphaModifier_AlongStroke *q = (LineStyleAlphaModifier_AlongStroke *)new_m; + q->curve = curvemapping_copy(p->curve); + q->flags = p->flags; + break; + } + case LS_MODIFIER_DISTANCE_FROM_CAMERA: { + LineStyleAlphaModifier_DistanceFromCamera *p = (LineStyleAlphaModifier_DistanceFromCamera *) + m; + LineStyleAlphaModifier_DistanceFromCamera *q = (LineStyleAlphaModifier_DistanceFromCamera *) + new_m; + q->curve = curvemapping_copy(p->curve); + q->flags = p->flags; + q->range_min = p->range_min; + q->range_max = p->range_max; + break; + } + case LS_MODIFIER_DISTANCE_FROM_OBJECT: { + LineStyleAlphaModifier_DistanceFromObject *p = (LineStyleAlphaModifier_DistanceFromObject *) + m; + LineStyleAlphaModifier_DistanceFromObject *q = (LineStyleAlphaModifier_DistanceFromObject *) + new_m; + if (p->target) + id_us_plus(&p->target->id); + q->target = p->target; + q->curve = curvemapping_copy(p->curve); + q->flags = p->flags; + q->range_min = p->range_min; + q->range_max = p->range_max; + break; + } + case LS_MODIFIER_MATERIAL: { + LineStyleAlphaModifier_Material *p = (LineStyleAlphaModifier_Material *)m; + LineStyleAlphaModifier_Material *q = (LineStyleAlphaModifier_Material *)new_m; + q->curve = curvemapping_copy(p->curve); + q->flags = p->flags; + q->mat_attr = p->mat_attr; + break; + } + case LS_MODIFIER_TANGENT: { + LineStyleAlphaModifier_Tangent *p = (LineStyleAlphaModifier_Tangent *)m; + LineStyleAlphaModifier_Tangent *q = (LineStyleAlphaModifier_Tangent *)new_m; + q->curve = curvemapping_copy(p->curve); + q->flags = p->flags; + break; + } + case LS_MODIFIER_NOISE: { + LineStyleAlphaModifier_Noise *p = (LineStyleAlphaModifier_Noise *)m; + LineStyleAlphaModifier_Noise *q = (LineStyleAlphaModifier_Noise *)new_m; + q->curve = curvemapping_copy(p->curve); + q->flags = p->flags; + q->amplitude = p->amplitude; + q->period = p->period; + q->seed = p->seed; + break; + } + case LS_MODIFIER_CREASE_ANGLE: { + LineStyleAlphaModifier_CreaseAngle *p = (LineStyleAlphaModifier_CreaseAngle *)m; + LineStyleAlphaModifier_CreaseAngle *q = (LineStyleAlphaModifier_CreaseAngle *)new_m; + q->curve = curvemapping_copy(p->curve); + q->flags = p->flags; + q->min_angle = p->min_angle; + q->max_angle = p->max_angle; + break; + } + case LS_MODIFIER_CURVATURE_3D: { + LineStyleAlphaModifier_Curvature_3D *p = (LineStyleAlphaModifier_Curvature_3D *)m; + LineStyleAlphaModifier_Curvature_3D *q = (LineStyleAlphaModifier_Curvature_3D *)new_m; + q->curve = curvemapping_copy(p->curve); + q->flags = p->flags; + q->min_curvature = p->min_curvature; + q->max_curvature = p->max_curvature; + break; + } + default: + return NULL; /* unknown modifier type */ + } + add_to_modifier_list(&linestyle->alpha_modifiers, new_m); + + return new_m; } int BKE_linestyle_alpha_modifier_remove(FreestyleLineStyle *linestyle, LineStyleModifier *m) { - if (BLI_findindex(&linestyle->alpha_modifiers, m) == -1) - return -1; - switch (m->type) { - case LS_MODIFIER_ALONG_STROKE: - curvemapping_free(((LineStyleAlphaModifier_AlongStroke *)m)->curve); - break; - case LS_MODIFIER_DISTANCE_FROM_CAMERA: - curvemapping_free(((LineStyleAlphaModifier_DistanceFromCamera *)m)->curve); - break; - case LS_MODIFIER_DISTANCE_FROM_OBJECT: - curvemapping_free(((LineStyleAlphaModifier_DistanceFromObject *)m)->curve); - break; - case LS_MODIFIER_MATERIAL: - curvemapping_free(((LineStyleAlphaModifier_Material *)m)->curve); - break; - case LS_MODIFIER_TANGENT: - curvemapping_free(((LineStyleAlphaModifier_Tangent *)m)->curve); - break; - case LS_MODIFIER_NOISE: - curvemapping_free(((LineStyleAlphaModifier_Noise *)m)->curve); - break; - case LS_MODIFIER_CREASE_ANGLE: - curvemapping_free(((LineStyleAlphaModifier_CreaseAngle *)m)->curve); - break; - case LS_MODIFIER_CURVATURE_3D: - curvemapping_free(((LineStyleAlphaModifier_Curvature_3D *)m)->curve); - break; - } - BLI_freelinkN(&linestyle->alpha_modifiers, m); - return 0; + if (BLI_findindex(&linestyle->alpha_modifiers, m) == -1) + return -1; + switch (m->type) { + case LS_MODIFIER_ALONG_STROKE: + curvemapping_free(((LineStyleAlphaModifier_AlongStroke *)m)->curve); + break; + case LS_MODIFIER_DISTANCE_FROM_CAMERA: + curvemapping_free(((LineStyleAlphaModifier_DistanceFromCamera *)m)->curve); + break; + case LS_MODIFIER_DISTANCE_FROM_OBJECT: + curvemapping_free(((LineStyleAlphaModifier_DistanceFromObject *)m)->curve); + break; + case LS_MODIFIER_MATERIAL: + curvemapping_free(((LineStyleAlphaModifier_Material *)m)->curve); + break; + case LS_MODIFIER_TANGENT: + curvemapping_free(((LineStyleAlphaModifier_Tangent *)m)->curve); + break; + case LS_MODIFIER_NOISE: + curvemapping_free(((LineStyleAlphaModifier_Noise *)m)->curve); + break; + case LS_MODIFIER_CREASE_ANGLE: + curvemapping_free(((LineStyleAlphaModifier_CreaseAngle *)m)->curve); + break; + case LS_MODIFIER_CURVATURE_3D: + curvemapping_free(((LineStyleAlphaModifier_Curvature_3D *)m)->curve); + break; + } + BLI_freelinkN(&linestyle->alpha_modifiers, m); + return 0; } static LineStyleModifier *alloc_thickness_modifier(const char *name, int type) { - size_t size; - - switch (type) { - case LS_MODIFIER_ALONG_STROKE: - size = sizeof(LineStyleThicknessModifier_AlongStroke); - break; - case LS_MODIFIER_DISTANCE_FROM_CAMERA: - size = sizeof(LineStyleThicknessModifier_DistanceFromCamera); - break; - case LS_MODIFIER_DISTANCE_FROM_OBJECT: - size = sizeof(LineStyleThicknessModifier_DistanceFromObject); - break; - case LS_MODIFIER_MATERIAL: - size = sizeof(LineStyleThicknessModifier_Material); - break; - case LS_MODIFIER_CALLIGRAPHY: - size = sizeof(LineStyleThicknessModifier_Calligraphy); - break; - case LS_MODIFIER_TANGENT: - size = sizeof(LineStyleThicknessModifier_Tangent); - break; - case LS_MODIFIER_NOISE: - size = sizeof(LineStyleThicknessModifier_Noise); - break; - case LS_MODIFIER_CREASE_ANGLE: - size = sizeof(LineStyleThicknessModifier_CreaseAngle); - break; - case LS_MODIFIER_CURVATURE_3D: - size = sizeof(LineStyleThicknessModifier_Curvature_3D); - break; - default: - return NULL; /* unknown modifier type */ - } - - return new_modifier(name, type, size); + size_t size; + + switch (type) { + case LS_MODIFIER_ALONG_STROKE: + size = sizeof(LineStyleThicknessModifier_AlongStroke); + break; + case LS_MODIFIER_DISTANCE_FROM_CAMERA: + size = sizeof(LineStyleThicknessModifier_DistanceFromCamera); + break; + case LS_MODIFIER_DISTANCE_FROM_OBJECT: + size = sizeof(LineStyleThicknessModifier_DistanceFromObject); + break; + case LS_MODIFIER_MATERIAL: + size = sizeof(LineStyleThicknessModifier_Material); + break; + case LS_MODIFIER_CALLIGRAPHY: + size = sizeof(LineStyleThicknessModifier_Calligraphy); + break; + case LS_MODIFIER_TANGENT: + size = sizeof(LineStyleThicknessModifier_Tangent); + break; + case LS_MODIFIER_NOISE: + size = sizeof(LineStyleThicknessModifier_Noise); + break; + case LS_MODIFIER_CREASE_ANGLE: + size = sizeof(LineStyleThicknessModifier_CreaseAngle); + break; + case LS_MODIFIER_CURVATURE_3D: + size = sizeof(LineStyleThicknessModifier_Curvature_3D); + break; + default: + return NULL; /* unknown modifier type */ + } + + return new_modifier(name, type, size); } -LineStyleModifier *BKE_linestyle_thickness_modifier_add(FreestyleLineStyle *linestyle, const char *name, int type) +LineStyleModifier *BKE_linestyle_thickness_modifier_add(FreestyleLineStyle *linestyle, + const char *name, + int type) { - LineStyleModifier *m; - - m = alloc_thickness_modifier(name, type); - m->blend = LS_VALUE_BLEND; - - switch (type) { - case LS_MODIFIER_ALONG_STROKE: - { - LineStyleThicknessModifier_AlongStroke *p = (LineStyleThicknessModifier_AlongStroke *)m; - p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); - p->value_min = 0.0f; - p->value_max = 1.0f; - break; - } - case LS_MODIFIER_DISTANCE_FROM_CAMERA: - { - LineStyleThicknessModifier_DistanceFromCamera *p = (LineStyleThicknessModifier_DistanceFromCamera *)m; - p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); - p->range_min = 0.0f; - p->range_max = 1000.0f; - p->value_min = 0.0f; - p->value_max = 1.0f; - break; - } - case LS_MODIFIER_DISTANCE_FROM_OBJECT: - { - LineStyleThicknessModifier_DistanceFromObject *p = (LineStyleThicknessModifier_DistanceFromObject *)m; - p->target = NULL; - p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); - p->range_min = 0.0f; - p->range_max = 1000.0f; - p->value_min = 0.0f; - p->value_max = 1.0f; - break; - } - case LS_MODIFIER_MATERIAL: - { - LineStyleThicknessModifier_Material *p = (LineStyleThicknessModifier_Material *)m; - p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); - p->mat_attr = LS_MODIFIER_MATERIAL_LINE; - p->value_min = 0.0f; - p->value_max = 1.0f; - break; - } - case LS_MODIFIER_CALLIGRAPHY: - { - LineStyleThicknessModifier_Calligraphy *p = (LineStyleThicknessModifier_Calligraphy *)m; - p->min_thickness = 1.0f; - p->max_thickness = 10.0f; - p->orientation = DEG2RADF(60.0f); - break; - } - case LS_MODIFIER_TANGENT: - { - LineStyleThicknessModifier_Tangent *p = (LineStyleThicknessModifier_Tangent *)m; - p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); - p->min_thickness = 1.0f; - p->max_thickness = 10.0f; - break; - } - case LS_MODIFIER_NOISE: - { - LineStyleThicknessModifier_Noise *p = (LineStyleThicknessModifier_Noise *)m; - p->period = 10.0f; - p->amplitude = 10.0f; - p->seed = 512; - p->flags = LS_THICKNESS_ASYMMETRIC; - break; - } - case LS_MODIFIER_CREASE_ANGLE: - { - LineStyleThicknessModifier_CreaseAngle *p = (LineStyleThicknessModifier_CreaseAngle *)m; - p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); - p->min_angle = 0.0f; - p->max_angle = DEG2RADF(180.0f); - p->min_thickness = 1.0f; - p->max_thickness = 10.0f; - break; - } - case LS_MODIFIER_CURVATURE_3D: - { - LineStyleThicknessModifier_Curvature_3D *p = (LineStyleThicknessModifier_Curvature_3D *)m; - p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); - p->min_curvature = 0.0f; - p->max_curvature = 0.5f; - p->min_thickness = 1.0f; - p->max_thickness = 10.0f; - break; - } - default: - return NULL; /* unknown modifier type */ - } - add_to_modifier_list(&linestyle->thickness_modifiers, m); - - return m; + LineStyleModifier *m; + + m = alloc_thickness_modifier(name, type); + m->blend = LS_VALUE_BLEND; + + switch (type) { + case LS_MODIFIER_ALONG_STROKE: { + LineStyleThicknessModifier_AlongStroke *p = (LineStyleThicknessModifier_AlongStroke *)m; + p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); + p->value_min = 0.0f; + p->value_max = 1.0f; + break; + } + case LS_MODIFIER_DISTANCE_FROM_CAMERA: { + LineStyleThicknessModifier_DistanceFromCamera *p = + (LineStyleThicknessModifier_DistanceFromCamera *)m; + p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); + p->range_min = 0.0f; + p->range_max = 1000.0f; + p->value_min = 0.0f; + p->value_max = 1.0f; + break; + } + case LS_MODIFIER_DISTANCE_FROM_OBJECT: { + LineStyleThicknessModifier_DistanceFromObject *p = + (LineStyleThicknessModifier_DistanceFromObject *)m; + p->target = NULL; + p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); + p->range_min = 0.0f; + p->range_max = 1000.0f; + p->value_min = 0.0f; + p->value_max = 1.0f; + break; + } + case LS_MODIFIER_MATERIAL: { + LineStyleThicknessModifier_Material *p = (LineStyleThicknessModifier_Material *)m; + p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); + p->mat_attr = LS_MODIFIER_MATERIAL_LINE; + p->value_min = 0.0f; + p->value_max = 1.0f; + break; + } + case LS_MODIFIER_CALLIGRAPHY: { + LineStyleThicknessModifier_Calligraphy *p = (LineStyleThicknessModifier_Calligraphy *)m; + p->min_thickness = 1.0f; + p->max_thickness = 10.0f; + p->orientation = DEG2RADF(60.0f); + break; + } + case LS_MODIFIER_TANGENT: { + LineStyleThicknessModifier_Tangent *p = (LineStyleThicknessModifier_Tangent *)m; + p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); + p->min_thickness = 1.0f; + p->max_thickness = 10.0f; + break; + } + case LS_MODIFIER_NOISE: { + LineStyleThicknessModifier_Noise *p = (LineStyleThicknessModifier_Noise *)m; + p->period = 10.0f; + p->amplitude = 10.0f; + p->seed = 512; + p->flags = LS_THICKNESS_ASYMMETRIC; + break; + } + case LS_MODIFIER_CREASE_ANGLE: { + LineStyleThicknessModifier_CreaseAngle *p = (LineStyleThicknessModifier_CreaseAngle *)m; + p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); + p->min_angle = 0.0f; + p->max_angle = DEG2RADF(180.0f); + p->min_thickness = 1.0f; + p->max_thickness = 10.0f; + break; + } + case LS_MODIFIER_CURVATURE_3D: { + LineStyleThicknessModifier_Curvature_3D *p = (LineStyleThicknessModifier_Curvature_3D *)m; + p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); + p->min_curvature = 0.0f; + p->max_curvature = 0.5f; + p->min_thickness = 1.0f; + p->max_thickness = 10.0f; + break; + } + default: + return NULL; /* unknown modifier type */ + } + add_to_modifier_list(&linestyle->thickness_modifiers, m); + + return m; } -LineStyleModifier *BKE_linestyle_thickness_modifier_copy( - FreestyleLineStyle *linestyle, const LineStyleModifier *m, const int flag) +LineStyleModifier *BKE_linestyle_thickness_modifier_copy(FreestyleLineStyle *linestyle, + const LineStyleModifier *m, + const int flag) { - LineStyleModifier *new_m; - - new_m = alloc_thickness_modifier(m->name, m->type); - if (!new_m) - return NULL; - new_m->influence = m->influence; - new_m->flags = m->flags; - new_m->blend = m->blend; - - switch (m->type) { - case LS_MODIFIER_ALONG_STROKE: - { - LineStyleThicknessModifier_AlongStroke *p = (LineStyleThicknessModifier_AlongStroke *)m; - LineStyleThicknessModifier_AlongStroke *q = (LineStyleThicknessModifier_AlongStroke *)new_m; - q->curve = curvemapping_copy(p->curve); - q->flags = p->flags; - q->value_min = p->value_min; - q->value_max = p->value_max; - break; - } - case LS_MODIFIER_DISTANCE_FROM_CAMERA: - { - LineStyleThicknessModifier_DistanceFromCamera *p = (LineStyleThicknessModifier_DistanceFromCamera *)m; - LineStyleThicknessModifier_DistanceFromCamera *q = (LineStyleThicknessModifier_DistanceFromCamera *)new_m; - q->curve = curvemapping_copy(p->curve); - q->flags = p->flags; - q->range_min = p->range_min; - q->range_max = p->range_max; - q->value_min = p->value_min; - q->value_max = p->value_max; - break; - } - case LS_MODIFIER_DISTANCE_FROM_OBJECT: - { - LineStyleThicknessModifier_DistanceFromObject *p = (LineStyleThicknessModifier_DistanceFromObject *)m; - LineStyleThicknessModifier_DistanceFromObject *q = (LineStyleThicknessModifier_DistanceFromObject *)new_m; - q->target = p->target; - if ((flag & LIB_ID_CREATE_NO_USER_REFCOUNT) == 0) { - id_us_plus((ID *)q->target); - } - q->curve = curvemapping_copy(p->curve); - q->flags = p->flags; - q->range_min = p->range_min; - q->range_max = p->range_max; - q->value_min = p->value_min; - q->value_max = p->value_max; - break; - } - case LS_MODIFIER_MATERIAL: - { - LineStyleThicknessModifier_Material *p = (LineStyleThicknessModifier_Material *)m; - LineStyleThicknessModifier_Material *q = (LineStyleThicknessModifier_Material *)new_m; - q->curve = curvemapping_copy(p->curve); - q->flags = p->flags; - q->mat_attr = p->mat_attr; - q->value_min = p->value_min; - q->value_max = p->value_max; - break; - } - case LS_MODIFIER_CALLIGRAPHY: - { - LineStyleThicknessModifier_Calligraphy *p = (LineStyleThicknessModifier_Calligraphy *)m; - LineStyleThicknessModifier_Calligraphy *q = (LineStyleThicknessModifier_Calligraphy *)new_m; - q->min_thickness = p->min_thickness; - q->max_thickness = p->max_thickness; - q->orientation = p->orientation; - break; - } - case LS_MODIFIER_TANGENT: - { - LineStyleThicknessModifier_Tangent *p = (LineStyleThicknessModifier_Tangent *)m; - LineStyleThicknessModifier_Tangent *q = (LineStyleThicknessModifier_Tangent *)new_m; - q->curve = curvemapping_copy(p->curve); - q->flags = p->flags; - q->min_thickness = p->min_thickness; - q->max_thickness = p->max_thickness; - break; - } - case LS_MODIFIER_NOISE: - { - LineStyleThicknessModifier_Noise *p = (LineStyleThicknessModifier_Noise *)m; - LineStyleThicknessModifier_Noise *q = (LineStyleThicknessModifier_Noise *)new_m; - q->amplitude = p->amplitude; - q->period = p->period; - q->seed = p->seed; - q->flags = p->flags; - break; - } - case LS_MODIFIER_CURVATURE_3D: - { - LineStyleThicknessModifier_Curvature_3D *p = (LineStyleThicknessModifier_Curvature_3D *)m; - LineStyleThicknessModifier_Curvature_3D *q = (LineStyleThicknessModifier_Curvature_3D *)new_m; - q->curve = curvemapping_copy(p->curve); - q->flags = p->flags; - q->min_curvature = p->min_curvature; - q->max_curvature = p->max_curvature; - q->min_thickness = p->min_thickness; - q->max_thickness = p->max_thickness; - break; - } - case LS_MODIFIER_CREASE_ANGLE: - { - LineStyleThicknessModifier_CreaseAngle *p = (LineStyleThicknessModifier_CreaseAngle *)m; - LineStyleThicknessModifier_CreaseAngle *q = (LineStyleThicknessModifier_CreaseAngle *)new_m; - q->curve = curvemapping_copy(p->curve); - q->flags = p->flags; - q->min_angle = p->min_angle; - q->max_angle = p->max_angle; - q->min_thickness = p->min_thickness; - q->max_thickness = p->max_thickness; - break; - } - default: - return NULL; /* unknown modifier type */ - } - add_to_modifier_list(&linestyle->thickness_modifiers, new_m); - - return new_m; + LineStyleModifier *new_m; + + new_m = alloc_thickness_modifier(m->name, m->type); + if (!new_m) + return NULL; + new_m->influence = m->influence; + new_m->flags = m->flags; + new_m->blend = m->blend; + + switch (m->type) { + case LS_MODIFIER_ALONG_STROKE: { + LineStyleThicknessModifier_AlongStroke *p = (LineStyleThicknessModifier_AlongStroke *)m; + LineStyleThicknessModifier_AlongStroke *q = (LineStyleThicknessModifier_AlongStroke *)new_m; + q->curve = curvemapping_copy(p->curve); + q->flags = p->flags; + q->value_min = p->value_min; + q->value_max = p->value_max; + break; + } + case LS_MODIFIER_DISTANCE_FROM_CAMERA: { + LineStyleThicknessModifier_DistanceFromCamera *p = + (LineStyleThicknessModifier_DistanceFromCamera *)m; + LineStyleThicknessModifier_DistanceFromCamera *q = + (LineStyleThicknessModifier_DistanceFromCamera *)new_m; + q->curve = curvemapping_copy(p->curve); + q->flags = p->flags; + q->range_min = p->range_min; + q->range_max = p->range_max; + q->value_min = p->value_min; + q->value_max = p->value_max; + break; + } + case LS_MODIFIER_DISTANCE_FROM_OBJECT: { + LineStyleThicknessModifier_DistanceFromObject *p = + (LineStyleThicknessModifier_DistanceFromObject *)m; + LineStyleThicknessModifier_DistanceFromObject *q = + (LineStyleThicknessModifier_DistanceFromObject *)new_m; + q->target = p->target; + if ((flag & LIB_ID_CREATE_NO_USER_REFCOUNT) == 0) { + id_us_plus((ID *)q->target); + } + q->curve = curvemapping_copy(p->curve); + q->flags = p->flags; + q->range_min = p->range_min; + q->range_max = p->range_max; + q->value_min = p->value_min; + q->value_max = p->value_max; + break; + } + case LS_MODIFIER_MATERIAL: { + LineStyleThicknessModifier_Material *p = (LineStyleThicknessModifier_Material *)m; + LineStyleThicknessModifier_Material *q = (LineStyleThicknessModifier_Material *)new_m; + q->curve = curvemapping_copy(p->curve); + q->flags = p->flags; + q->mat_attr = p->mat_attr; + q->value_min = p->value_min; + q->value_max = p->value_max; + break; + } + case LS_MODIFIER_CALLIGRAPHY: { + LineStyleThicknessModifier_Calligraphy *p = (LineStyleThicknessModifier_Calligraphy *)m; + LineStyleThicknessModifier_Calligraphy *q = (LineStyleThicknessModifier_Calligraphy *)new_m; + q->min_thickness = p->min_thickness; + q->max_thickness = p->max_thickness; + q->orientation = p->orientation; + break; + } + case LS_MODIFIER_TANGENT: { + LineStyleThicknessModifier_Tangent *p = (LineStyleThicknessModifier_Tangent *)m; + LineStyleThicknessModifier_Tangent *q = (LineStyleThicknessModifier_Tangent *)new_m; + q->curve = curvemapping_copy(p->curve); + q->flags = p->flags; + q->min_thickness = p->min_thickness; + q->max_thickness = p->max_thickness; + break; + } + case LS_MODIFIER_NOISE: { + LineStyleThicknessModifier_Noise *p = (LineStyleThicknessModifier_Noise *)m; + LineStyleThicknessModifier_Noise *q = (LineStyleThicknessModifier_Noise *)new_m; + q->amplitude = p->amplitude; + q->period = p->period; + q->seed = p->seed; + q->flags = p->flags; + break; + } + case LS_MODIFIER_CURVATURE_3D: { + LineStyleThicknessModifier_Curvature_3D *p = (LineStyleThicknessModifier_Curvature_3D *)m; + LineStyleThicknessModifier_Curvature_3D *q = (LineStyleThicknessModifier_Curvature_3D *) + new_m; + q->curve = curvemapping_copy(p->curve); + q->flags = p->flags; + q->min_curvature = p->min_curvature; + q->max_curvature = p->max_curvature; + q->min_thickness = p->min_thickness; + q->max_thickness = p->max_thickness; + break; + } + case LS_MODIFIER_CREASE_ANGLE: { + LineStyleThicknessModifier_CreaseAngle *p = (LineStyleThicknessModifier_CreaseAngle *)m; + LineStyleThicknessModifier_CreaseAngle *q = (LineStyleThicknessModifier_CreaseAngle *)new_m; + q->curve = curvemapping_copy(p->curve); + q->flags = p->flags; + q->min_angle = p->min_angle; + q->max_angle = p->max_angle; + q->min_thickness = p->min_thickness; + q->max_thickness = p->max_thickness; + break; + } + default: + return NULL; /* unknown modifier type */ + } + add_to_modifier_list(&linestyle->thickness_modifiers, new_m); + + return new_m; } int BKE_linestyle_thickness_modifier_remove(FreestyleLineStyle *linestyle, LineStyleModifier *m) { - if (BLI_findindex(&linestyle->thickness_modifiers, m) == -1) - return -1; - switch (m->type) { - case LS_MODIFIER_ALONG_STROKE: - curvemapping_free(((LineStyleThicknessModifier_AlongStroke *)m)->curve); - break; - case LS_MODIFIER_DISTANCE_FROM_CAMERA: - curvemapping_free(((LineStyleThicknessModifier_DistanceFromCamera *)m)->curve); - break; - case LS_MODIFIER_DISTANCE_FROM_OBJECT: - curvemapping_free(((LineStyleThicknessModifier_DistanceFromObject *)m)->curve); - break; - case LS_MODIFIER_MATERIAL: - curvemapping_free(((LineStyleThicknessModifier_Material *)m)->curve); - break; - case LS_MODIFIER_CALLIGRAPHY: - break; - case LS_MODIFIER_TANGENT: - curvemapping_free(((LineStyleThicknessModifier_Tangent *)m)->curve); - break; - case LS_MODIFIER_NOISE: - break; - case LS_MODIFIER_CREASE_ANGLE: - break; - case LS_MODIFIER_CURVATURE_3D: - break; - } - BLI_freelinkN(&linestyle->thickness_modifiers, m); - return 0; + if (BLI_findindex(&linestyle->thickness_modifiers, m) == -1) + return -1; + switch (m->type) { + case LS_MODIFIER_ALONG_STROKE: + curvemapping_free(((LineStyleThicknessModifier_AlongStroke *)m)->curve); + break; + case LS_MODIFIER_DISTANCE_FROM_CAMERA: + curvemapping_free(((LineStyleThicknessModifier_DistanceFromCamera *)m)->curve); + break; + case LS_MODIFIER_DISTANCE_FROM_OBJECT: + curvemapping_free(((LineStyleThicknessModifier_DistanceFromObject *)m)->curve); + break; + case LS_MODIFIER_MATERIAL: + curvemapping_free(((LineStyleThicknessModifier_Material *)m)->curve); + break; + case LS_MODIFIER_CALLIGRAPHY: + break; + case LS_MODIFIER_TANGENT: + curvemapping_free(((LineStyleThicknessModifier_Tangent *)m)->curve); + break; + case LS_MODIFIER_NOISE: + break; + case LS_MODIFIER_CREASE_ANGLE: + break; + case LS_MODIFIER_CURVATURE_3D: + break; + } + BLI_freelinkN(&linestyle->thickness_modifiers, m); + return 0; } static LineStyleModifier *alloc_geometry_modifier(const char *name, int type) { - size_t size; - - switch (type) { - case LS_MODIFIER_SAMPLING: - size = sizeof(LineStyleGeometryModifier_Sampling); - break; - case LS_MODIFIER_BEZIER_CURVE: - size = sizeof(LineStyleGeometryModifier_BezierCurve); - break; - case LS_MODIFIER_SINUS_DISPLACEMENT: - size = sizeof(LineStyleGeometryModifier_SinusDisplacement); - break; - case LS_MODIFIER_SPATIAL_NOISE: - size = sizeof(LineStyleGeometryModifier_SpatialNoise); - break; - case LS_MODIFIER_PERLIN_NOISE_1D: - size = sizeof(LineStyleGeometryModifier_PerlinNoise1D); - break; - case LS_MODIFIER_PERLIN_NOISE_2D: - size = sizeof(LineStyleGeometryModifier_PerlinNoise2D); - break; - case LS_MODIFIER_BACKBONE_STRETCHER: - size = sizeof(LineStyleGeometryModifier_BackboneStretcher); - break; - case LS_MODIFIER_TIP_REMOVER: - size = sizeof(LineStyleGeometryModifier_TipRemover); - break; - case LS_MODIFIER_POLYGONIZATION: - size = sizeof(LineStyleGeometryModifier_Polygonalization); - break; - case LS_MODIFIER_GUIDING_LINES: - size = sizeof(LineStyleGeometryModifier_GuidingLines); - break; - case LS_MODIFIER_BLUEPRINT: - size = sizeof(LineStyleGeometryModifier_Blueprint); - break; - case LS_MODIFIER_2D_OFFSET: - size = sizeof(LineStyleGeometryModifier_2DOffset); - break; - case LS_MODIFIER_2D_TRANSFORM: - size = sizeof(LineStyleGeometryModifier_2DTransform); - break; - case LS_MODIFIER_SIMPLIFICATION: - size = sizeof(LineStyleGeometryModifier_Simplification); - break; - default: - return NULL; /* unknown modifier type */ - } - - return new_modifier(name, type, size); + size_t size; + + switch (type) { + case LS_MODIFIER_SAMPLING: + size = sizeof(LineStyleGeometryModifier_Sampling); + break; + case LS_MODIFIER_BEZIER_CURVE: + size = sizeof(LineStyleGeometryModifier_BezierCurve); + break; + case LS_MODIFIER_SINUS_DISPLACEMENT: + size = sizeof(LineStyleGeometryModifier_SinusDisplacement); + break; + case LS_MODIFIER_SPATIAL_NOISE: + size = sizeof(LineStyleGeometryModifier_SpatialNoise); + break; + case LS_MODIFIER_PERLIN_NOISE_1D: + size = sizeof(LineStyleGeometryModifier_PerlinNoise1D); + break; + case LS_MODIFIER_PERLIN_NOISE_2D: + size = sizeof(LineStyleGeometryModifier_PerlinNoise2D); + break; + case LS_MODIFIER_BACKBONE_STRETCHER: + size = sizeof(LineStyleGeometryModifier_BackboneStretcher); + break; + case LS_MODIFIER_TIP_REMOVER: + size = sizeof(LineStyleGeometryModifier_TipRemover); + break; + case LS_MODIFIER_POLYGONIZATION: + size = sizeof(LineStyleGeometryModifier_Polygonalization); + break; + case LS_MODIFIER_GUIDING_LINES: + size = sizeof(LineStyleGeometryModifier_GuidingLines); + break; + case LS_MODIFIER_BLUEPRINT: + size = sizeof(LineStyleGeometryModifier_Blueprint); + break; + case LS_MODIFIER_2D_OFFSET: + size = sizeof(LineStyleGeometryModifier_2DOffset); + break; + case LS_MODIFIER_2D_TRANSFORM: + size = sizeof(LineStyleGeometryModifier_2DTransform); + break; + case LS_MODIFIER_SIMPLIFICATION: + size = sizeof(LineStyleGeometryModifier_Simplification); + break; + default: + return NULL; /* unknown modifier type */ + } + + return new_modifier(name, type, size); } -LineStyleModifier *BKE_linestyle_geometry_modifier_add(FreestyleLineStyle *linestyle, const char *name, int type) +LineStyleModifier *BKE_linestyle_geometry_modifier_add(FreestyleLineStyle *linestyle, + const char *name, + int type) { - LineStyleModifier *m; - - m = alloc_geometry_modifier(name, type); - - switch (type) { - case LS_MODIFIER_SAMPLING: - { - LineStyleGeometryModifier_Sampling *p = (LineStyleGeometryModifier_Sampling *)m; - p->sampling = 10.0f; - break; - } - case LS_MODIFIER_BEZIER_CURVE: - { - LineStyleGeometryModifier_BezierCurve *p = (LineStyleGeometryModifier_BezierCurve *)m; - p->error = 10.0f; - break; - } - case LS_MODIFIER_SINUS_DISPLACEMENT: - { - LineStyleGeometryModifier_SinusDisplacement *p = (LineStyleGeometryModifier_SinusDisplacement *)m; - p->wavelength = 20.0f; - p->amplitude = 5.0f; - p->phase = 0.0f; - break; - } - case LS_MODIFIER_SPATIAL_NOISE: - { - LineStyleGeometryModifier_SpatialNoise *p = (LineStyleGeometryModifier_SpatialNoise *)m; - p->amplitude = 5.0f; - p->scale = 20.0f; - p->octaves = 4; - p->flags = LS_MODIFIER_SPATIAL_NOISE_SMOOTH | LS_MODIFIER_SPATIAL_NOISE_PURERANDOM; - break; - } - case LS_MODIFIER_PERLIN_NOISE_1D: - { - LineStyleGeometryModifier_PerlinNoise1D *p = (LineStyleGeometryModifier_PerlinNoise1D *)m; - p->frequency = 10.0f; - p->amplitude = 10.0f; - p->octaves = 4; - p->angle = DEG2RADF(45.0f); - break; - } - case LS_MODIFIER_PERLIN_NOISE_2D: - { - LineStyleGeometryModifier_PerlinNoise2D *p = (LineStyleGeometryModifier_PerlinNoise2D *)m; - p->frequency = 10.0f; - p->amplitude = 10.0f; - p->octaves = 4; - p->angle = DEG2RADF(45.0f); - break; - } - case LS_MODIFIER_BACKBONE_STRETCHER: - { - LineStyleGeometryModifier_BackboneStretcher *p = (LineStyleGeometryModifier_BackboneStretcher *)m; - p->backbone_length = 10.0f; - break; - } - case LS_MODIFIER_TIP_REMOVER: - { - LineStyleGeometryModifier_TipRemover *p = (LineStyleGeometryModifier_TipRemover *)m; - p->tip_length = 10.0f; - break; - } - case LS_MODIFIER_POLYGONIZATION: - { - LineStyleGeometryModifier_Polygonalization *p = (LineStyleGeometryModifier_Polygonalization *)m; - p->error = 10.0f; - break; - } - case LS_MODIFIER_GUIDING_LINES: - { - LineStyleGeometryModifier_GuidingLines *p = (LineStyleGeometryModifier_GuidingLines *)m; - p->offset = 0.0f; - break; - } - case LS_MODIFIER_BLUEPRINT: - { - LineStyleGeometryModifier_Blueprint *p = (LineStyleGeometryModifier_Blueprint *)m; - p->flags = LS_MODIFIER_BLUEPRINT_CIRCLES; - p->rounds = 1; - p->backbone_length = 10.0f; - p->random_radius = 3; - p->random_center = 5; - p->random_backbone = 5; - break; - } - case LS_MODIFIER_2D_OFFSET: - { - LineStyleGeometryModifier_2DOffset *p = (LineStyleGeometryModifier_2DOffset *)m; - p->start = 0.0f; - p->end = 0.0f; - p->x = 0.0f; - p->y = 0.0f; - break; - } - case LS_MODIFIER_2D_TRANSFORM: - { - LineStyleGeometryModifier_2DTransform *p = (LineStyleGeometryModifier_2DTransform *)m; - p->pivot = LS_MODIFIER_2D_TRANSFORM_PIVOT_CENTER; - p->scale_x = 1.0f; - p->scale_y = 1.0f; - p->angle = DEG2RADF(0.0f); - p->pivot_u = 0.5f; - p->pivot_x = 0.0f; - p->pivot_y = 0.0f; - break; - } - case LS_MODIFIER_SIMPLIFICATION: - { - LineStyleGeometryModifier_Simplification *p = (LineStyleGeometryModifier_Simplification *)m; - p->tolerance = 0.1f; - break; - } - default: - return NULL; /* unknown modifier type */ - } - add_to_modifier_list(&linestyle->geometry_modifiers, m); - - return m; + LineStyleModifier *m; + + m = alloc_geometry_modifier(name, type); + + switch (type) { + case LS_MODIFIER_SAMPLING: { + LineStyleGeometryModifier_Sampling *p = (LineStyleGeometryModifier_Sampling *)m; + p->sampling = 10.0f; + break; + } + case LS_MODIFIER_BEZIER_CURVE: { + LineStyleGeometryModifier_BezierCurve *p = (LineStyleGeometryModifier_BezierCurve *)m; + p->error = 10.0f; + break; + } + case LS_MODIFIER_SINUS_DISPLACEMENT: { + LineStyleGeometryModifier_SinusDisplacement *p = + (LineStyleGeometryModifier_SinusDisplacement *)m; + p->wavelength = 20.0f; + p->amplitude = 5.0f; + p->phase = 0.0f; + break; + } + case LS_MODIFIER_SPATIAL_NOISE: { + LineStyleGeometryModifier_SpatialNoise *p = (LineStyleGeometryModifier_SpatialNoise *)m; + p->amplitude = 5.0f; + p->scale = 20.0f; + p->octaves = 4; + p->flags = LS_MODIFIER_SPATIAL_NOISE_SMOOTH | LS_MODIFIER_SPATIAL_NOISE_PURERANDOM; + break; + } + case LS_MODIFIER_PERLIN_NOISE_1D: { + LineStyleGeometryModifier_PerlinNoise1D *p = (LineStyleGeometryModifier_PerlinNoise1D *)m; + p->frequency = 10.0f; + p->amplitude = 10.0f; + p->octaves = 4; + p->angle = DEG2RADF(45.0f); + break; + } + case LS_MODIFIER_PERLIN_NOISE_2D: { + LineStyleGeometryModifier_PerlinNoise2D *p = (LineStyleGeometryModifier_PerlinNoise2D *)m; + p->frequency = 10.0f; + p->amplitude = 10.0f; + p->octaves = 4; + p->angle = DEG2RADF(45.0f); + break; + } + case LS_MODIFIER_BACKBONE_STRETCHER: { + LineStyleGeometryModifier_BackboneStretcher *p = + (LineStyleGeometryModifier_BackboneStretcher *)m; + p->backbone_length = 10.0f; + break; + } + case LS_MODIFIER_TIP_REMOVER: { + LineStyleGeometryModifier_TipRemover *p = (LineStyleGeometryModifier_TipRemover *)m; + p->tip_length = 10.0f; + break; + } + case LS_MODIFIER_POLYGONIZATION: { + LineStyleGeometryModifier_Polygonalization *p = + (LineStyleGeometryModifier_Polygonalization *)m; + p->error = 10.0f; + break; + } + case LS_MODIFIER_GUIDING_LINES: { + LineStyleGeometryModifier_GuidingLines *p = (LineStyleGeometryModifier_GuidingLines *)m; + p->offset = 0.0f; + break; + } + case LS_MODIFIER_BLUEPRINT: { + LineStyleGeometryModifier_Blueprint *p = (LineStyleGeometryModifier_Blueprint *)m; + p->flags = LS_MODIFIER_BLUEPRINT_CIRCLES; + p->rounds = 1; + p->backbone_length = 10.0f; + p->random_radius = 3; + p->random_center = 5; + p->random_backbone = 5; + break; + } + case LS_MODIFIER_2D_OFFSET: { + LineStyleGeometryModifier_2DOffset *p = (LineStyleGeometryModifier_2DOffset *)m; + p->start = 0.0f; + p->end = 0.0f; + p->x = 0.0f; + p->y = 0.0f; + break; + } + case LS_MODIFIER_2D_TRANSFORM: { + LineStyleGeometryModifier_2DTransform *p = (LineStyleGeometryModifier_2DTransform *)m; + p->pivot = LS_MODIFIER_2D_TRANSFORM_PIVOT_CENTER; + p->scale_x = 1.0f; + p->scale_y = 1.0f; + p->angle = DEG2RADF(0.0f); + p->pivot_u = 0.5f; + p->pivot_x = 0.0f; + p->pivot_y = 0.0f; + break; + } + case LS_MODIFIER_SIMPLIFICATION: { + LineStyleGeometryModifier_Simplification *p = (LineStyleGeometryModifier_Simplification *)m; + p->tolerance = 0.1f; + break; + } + default: + return NULL; /* unknown modifier type */ + } + add_to_modifier_list(&linestyle->geometry_modifiers, m); + + return m; } -LineStyleModifier *BKE_linestyle_geometry_modifier_copy( - FreestyleLineStyle *linestyle, const LineStyleModifier *m, const int UNUSED(flag)) +LineStyleModifier *BKE_linestyle_geometry_modifier_copy(FreestyleLineStyle *linestyle, + const LineStyleModifier *m, + const int UNUSED(flag)) { - LineStyleModifier *new_m; - - new_m = alloc_geometry_modifier(m->name, m->type); - new_m->flags = m->flags; - - switch (m->type) { - case LS_MODIFIER_SAMPLING: - { - LineStyleGeometryModifier_Sampling *p = (LineStyleGeometryModifier_Sampling *)m; - LineStyleGeometryModifier_Sampling *q = (LineStyleGeometryModifier_Sampling *)new_m; - q->sampling = p->sampling; - break; - } - case LS_MODIFIER_BEZIER_CURVE: - { - LineStyleGeometryModifier_BezierCurve *p = (LineStyleGeometryModifier_BezierCurve *)m; - LineStyleGeometryModifier_BezierCurve *q = (LineStyleGeometryModifier_BezierCurve *)new_m; - q->error = p->error; - break; - } - case LS_MODIFIER_SINUS_DISPLACEMENT: - { - LineStyleGeometryModifier_SinusDisplacement *p = (LineStyleGeometryModifier_SinusDisplacement *)m; - LineStyleGeometryModifier_SinusDisplacement *q = (LineStyleGeometryModifier_SinusDisplacement *)new_m; - q->wavelength = p->wavelength; - q->amplitude = p->amplitude; - q->phase = p->phase; - break; - } - case LS_MODIFIER_SPATIAL_NOISE: - { - LineStyleGeometryModifier_SpatialNoise *p = (LineStyleGeometryModifier_SpatialNoise *)m; - LineStyleGeometryModifier_SpatialNoise *q = (LineStyleGeometryModifier_SpatialNoise *)new_m; - q->amplitude = p->amplitude; - q->scale = p->scale; - q->octaves = p->octaves; - q->flags = p->flags; - break; - } - case LS_MODIFIER_PERLIN_NOISE_1D: - { - LineStyleGeometryModifier_PerlinNoise1D *p = (LineStyleGeometryModifier_PerlinNoise1D *)m; - LineStyleGeometryModifier_PerlinNoise1D *q = (LineStyleGeometryModifier_PerlinNoise1D *)new_m; - q->frequency = p->frequency; - q->amplitude = p->amplitude; - q->angle = p->angle; - q->octaves = p->octaves; - q->seed = p->seed; - break; - } - case LS_MODIFIER_PERLIN_NOISE_2D: - { - LineStyleGeometryModifier_PerlinNoise2D *p = (LineStyleGeometryModifier_PerlinNoise2D *)m; - LineStyleGeometryModifier_PerlinNoise2D *q = (LineStyleGeometryModifier_PerlinNoise2D *)new_m; - q->frequency = p->frequency; - q->amplitude = p->amplitude; - q->angle = p->angle; - q->octaves = p->octaves; - q->seed = p->seed; - break; - } - case LS_MODIFIER_BACKBONE_STRETCHER: - { - LineStyleGeometryModifier_BackboneStretcher *p = (LineStyleGeometryModifier_BackboneStretcher *)m; - LineStyleGeometryModifier_BackboneStretcher *q = (LineStyleGeometryModifier_BackboneStretcher *)new_m; - q->backbone_length = p->backbone_length; - break; - } - case LS_MODIFIER_TIP_REMOVER: - { - LineStyleGeometryModifier_TipRemover *p = (LineStyleGeometryModifier_TipRemover *)m; - LineStyleGeometryModifier_TipRemover *q = (LineStyleGeometryModifier_TipRemover *)new_m; - q->tip_length = p->tip_length; - break; - } - case LS_MODIFIER_POLYGONIZATION: - { - LineStyleGeometryModifier_Polygonalization *p = (LineStyleGeometryModifier_Polygonalization *)m; - LineStyleGeometryModifier_Polygonalization *q = (LineStyleGeometryModifier_Polygonalization *)new_m; - q->error = p->error; - break; - } - case LS_MODIFIER_GUIDING_LINES: - { - LineStyleGeometryModifier_GuidingLines *p = (LineStyleGeometryModifier_GuidingLines *)m; - LineStyleGeometryModifier_GuidingLines *q = (LineStyleGeometryModifier_GuidingLines *)new_m; - q->offset = p->offset; - break; - } - case LS_MODIFIER_BLUEPRINT: - { - LineStyleGeometryModifier_Blueprint *p = (LineStyleGeometryModifier_Blueprint *)m; - LineStyleGeometryModifier_Blueprint *q = (LineStyleGeometryModifier_Blueprint *)new_m; - q->flags = p->flags; - q->rounds = p->rounds; - q->backbone_length = p->backbone_length; - q->random_radius = p->random_radius; - q->random_center = p->random_center; - q->random_backbone = p->random_backbone; - break; - } - case LS_MODIFIER_2D_OFFSET: - { - LineStyleGeometryModifier_2DOffset *p = (LineStyleGeometryModifier_2DOffset *)m; - LineStyleGeometryModifier_2DOffset *q = (LineStyleGeometryModifier_2DOffset *)new_m; - q->start = p->start; - q->end = p->end; - q->x = p->x; - q->y = p->y; - break; - } - case LS_MODIFIER_2D_TRANSFORM: - { - LineStyleGeometryModifier_2DTransform *p = (LineStyleGeometryModifier_2DTransform *)m; - LineStyleGeometryModifier_2DTransform *q = (LineStyleGeometryModifier_2DTransform *)new_m; - q->pivot = p->pivot; - q->scale_x = p->scale_x; - q->scale_y = p->scale_y; - q->angle = p->angle; - q->pivot_u = p->pivot_u; - q->pivot_x = p->pivot_x; - q->pivot_y = p->pivot_y; - break; - } - case LS_MODIFIER_SIMPLIFICATION: - { - LineStyleGeometryModifier_Simplification *p = (LineStyleGeometryModifier_Simplification *)m; - LineStyleGeometryModifier_Simplification *q = (LineStyleGeometryModifier_Simplification *)new_m; - q->tolerance = p->tolerance; - break; - } - default: - return NULL; /* unknown modifier type */ - } - add_to_modifier_list(&linestyle->geometry_modifiers, new_m); - - return new_m; + LineStyleModifier *new_m; + + new_m = alloc_geometry_modifier(m->name, m->type); + new_m->flags = m->flags; + + switch (m->type) { + case LS_MODIFIER_SAMPLING: { + LineStyleGeometryModifier_Sampling *p = (LineStyleGeometryModifier_Sampling *)m; + LineStyleGeometryModifier_Sampling *q = (LineStyleGeometryModifier_Sampling *)new_m; + q->sampling = p->sampling; + break; + } + case LS_MODIFIER_BEZIER_CURVE: { + LineStyleGeometryModifier_BezierCurve *p = (LineStyleGeometryModifier_BezierCurve *)m; + LineStyleGeometryModifier_BezierCurve *q = (LineStyleGeometryModifier_BezierCurve *)new_m; + q->error = p->error; + break; + } + case LS_MODIFIER_SINUS_DISPLACEMENT: { + LineStyleGeometryModifier_SinusDisplacement *p = + (LineStyleGeometryModifier_SinusDisplacement *)m; + LineStyleGeometryModifier_SinusDisplacement *q = + (LineStyleGeometryModifier_SinusDisplacement *)new_m; + q->wavelength = p->wavelength; + q->amplitude = p->amplitude; + q->phase = p->phase; + break; + } + case LS_MODIFIER_SPATIAL_NOISE: { + LineStyleGeometryModifier_SpatialNoise *p = (LineStyleGeometryModifier_SpatialNoise *)m; + LineStyleGeometryModifier_SpatialNoise *q = (LineStyleGeometryModifier_SpatialNoise *)new_m; + q->amplitude = p->amplitude; + q->scale = p->scale; + q->octaves = p->octaves; + q->flags = p->flags; + break; + } + case LS_MODIFIER_PERLIN_NOISE_1D: { + LineStyleGeometryModifier_PerlinNoise1D *p = (LineStyleGeometryModifier_PerlinNoise1D *)m; + LineStyleGeometryModifier_PerlinNoise1D *q = (LineStyleGeometryModifier_PerlinNoise1D *) + new_m; + q->frequency = p->frequency; + q->amplitude = p->amplitude; + q->angle = p->angle; + q->octaves = p->octaves; + q->seed = p->seed; + break; + } + case LS_MODIFIER_PERLIN_NOISE_2D: { + LineStyleGeometryModifier_PerlinNoise2D *p = (LineStyleGeometryModifier_PerlinNoise2D *)m; + LineStyleGeometryModifier_PerlinNoise2D *q = (LineStyleGeometryModifier_PerlinNoise2D *) + new_m; + q->frequency = p->frequency; + q->amplitude = p->amplitude; + q->angle = p->angle; + q->octaves = p->octaves; + q->seed = p->seed; + break; + } + case LS_MODIFIER_BACKBONE_STRETCHER: { + LineStyleGeometryModifier_BackboneStretcher *p = + (LineStyleGeometryModifier_BackboneStretcher *)m; + LineStyleGeometryModifier_BackboneStretcher *q = + (LineStyleGeometryModifier_BackboneStretcher *)new_m; + q->backbone_length = p->backbone_length; + break; + } + case LS_MODIFIER_TIP_REMOVER: { + LineStyleGeometryModifier_TipRemover *p = (LineStyleGeometryModifier_TipRemover *)m; + LineStyleGeometryModifier_TipRemover *q = (LineStyleGeometryModifier_TipRemover *)new_m; + q->tip_length = p->tip_length; + break; + } + case LS_MODIFIER_POLYGONIZATION: { + LineStyleGeometryModifier_Polygonalization *p = + (LineStyleGeometryModifier_Polygonalization *)m; + LineStyleGeometryModifier_Polygonalization *q = + (LineStyleGeometryModifier_Polygonalization *)new_m; + q->error = p->error; + break; + } + case LS_MODIFIER_GUIDING_LINES: { + LineStyleGeometryModifier_GuidingLines *p = (LineStyleGeometryModifier_GuidingLines *)m; + LineStyleGeometryModifier_GuidingLines *q = (LineStyleGeometryModifier_GuidingLines *)new_m; + q->offset = p->offset; + break; + } + case LS_MODIFIER_BLUEPRINT: { + LineStyleGeometryModifier_Blueprint *p = (LineStyleGeometryModifier_Blueprint *)m; + LineStyleGeometryModifier_Blueprint *q = (LineStyleGeometryModifier_Blueprint *)new_m; + q->flags = p->flags; + q->rounds = p->rounds; + q->backbone_length = p->backbone_length; + q->random_radius = p->random_radius; + q->random_center = p->random_center; + q->random_backbone = p->random_backbone; + break; + } + case LS_MODIFIER_2D_OFFSET: { + LineStyleGeometryModifier_2DOffset *p = (LineStyleGeometryModifier_2DOffset *)m; + LineStyleGeometryModifier_2DOffset *q = (LineStyleGeometryModifier_2DOffset *)new_m; + q->start = p->start; + q->end = p->end; + q->x = p->x; + q->y = p->y; + break; + } + case LS_MODIFIER_2D_TRANSFORM: { + LineStyleGeometryModifier_2DTransform *p = (LineStyleGeometryModifier_2DTransform *)m; + LineStyleGeometryModifier_2DTransform *q = (LineStyleGeometryModifier_2DTransform *)new_m; + q->pivot = p->pivot; + q->scale_x = p->scale_x; + q->scale_y = p->scale_y; + q->angle = p->angle; + q->pivot_u = p->pivot_u; + q->pivot_x = p->pivot_x; + q->pivot_y = p->pivot_y; + break; + } + case LS_MODIFIER_SIMPLIFICATION: { + LineStyleGeometryModifier_Simplification *p = (LineStyleGeometryModifier_Simplification *)m; + LineStyleGeometryModifier_Simplification *q = (LineStyleGeometryModifier_Simplification *) + new_m; + q->tolerance = p->tolerance; + break; + } + default: + return NULL; /* unknown modifier type */ + } + add_to_modifier_list(&linestyle->geometry_modifiers, new_m); + + return new_m; } int BKE_linestyle_geometry_modifier_remove(FreestyleLineStyle *linestyle, LineStyleModifier *m) { - if (BLI_findindex(&linestyle->geometry_modifiers, m) == -1) - return -1; - BLI_freelinkN(&linestyle->geometry_modifiers, m); - return 0; + if (BLI_findindex(&linestyle->geometry_modifiers, m) == -1) + return -1; + BLI_freelinkN(&linestyle->geometry_modifiers, m); + return 0; } /** * Reinsert \a modifier in modifier list with an offset of \a direction. * \return if position of \a modifier has changed. */ -bool BKE_linestyle_color_modifier_move(FreestyleLineStyle *linestyle, LineStyleModifier *modifier, int direction) +bool BKE_linestyle_color_modifier_move(FreestyleLineStyle *linestyle, + LineStyleModifier *modifier, + int direction) { - return BLI_listbase_link_move(&linestyle->color_modifiers, modifier, direction); + return BLI_listbase_link_move(&linestyle->color_modifiers, modifier, direction); } -bool BKE_linestyle_alpha_modifier_move(FreestyleLineStyle *linestyle, LineStyleModifier *modifier, int direction) +bool BKE_linestyle_alpha_modifier_move(FreestyleLineStyle *linestyle, + LineStyleModifier *modifier, + int direction) { - return BLI_listbase_link_move(&linestyle->alpha_modifiers, modifier, direction); + return BLI_listbase_link_move(&linestyle->alpha_modifiers, modifier, direction); } -bool BKE_linestyle_thickness_modifier_move(FreestyleLineStyle *linestyle, LineStyleModifier *modifier, int direction) +bool BKE_linestyle_thickness_modifier_move(FreestyleLineStyle *linestyle, + LineStyleModifier *modifier, + int direction) { - return BLI_listbase_link_move(&linestyle->thickness_modifiers, modifier, direction); + return BLI_listbase_link_move(&linestyle->thickness_modifiers, modifier, direction); } -bool BKE_linestyle_geometry_modifier_move(FreestyleLineStyle *linestyle, LineStyleModifier *modifier, int direction) +bool BKE_linestyle_geometry_modifier_move(FreestyleLineStyle *linestyle, + LineStyleModifier *modifier, + int direction) { - return BLI_listbase_link_move(&linestyle->geometry_modifiers, modifier, direction); + return BLI_listbase_link_move(&linestyle->geometry_modifiers, modifier, direction); } void BKE_linestyle_modifier_list_color_ramps(FreestyleLineStyle *linestyle, ListBase *listbase) { - LineStyleModifier *m; - ColorBand *color_ramp; - LinkData *link; - - BLI_listbase_clear(listbase); - - for (m = (LineStyleModifier *)linestyle->color_modifiers.first; m; m = m->next) { - switch (m->type) { - case LS_MODIFIER_ALONG_STROKE: - color_ramp = ((LineStyleColorModifier_AlongStroke *)m)->color_ramp; - break; - case LS_MODIFIER_DISTANCE_FROM_CAMERA: - color_ramp = ((LineStyleColorModifier_DistanceFromCamera *)m)->color_ramp; - break; - case LS_MODIFIER_DISTANCE_FROM_OBJECT: - color_ramp = ((LineStyleColorModifier_DistanceFromObject *)m)->color_ramp; - break; - case LS_MODIFIER_MATERIAL: - color_ramp = ((LineStyleColorModifier_Material *)m)->color_ramp; - break; - default: - continue; - } - link = (LinkData *) MEM_callocN(sizeof(LinkData), "link to color ramp"); - link->data = color_ramp; - BLI_addtail(listbase, link); - } + LineStyleModifier *m; + ColorBand *color_ramp; + LinkData *link; + + BLI_listbase_clear(listbase); + + for (m = (LineStyleModifier *)linestyle->color_modifiers.first; m; m = m->next) { + switch (m->type) { + case LS_MODIFIER_ALONG_STROKE: + color_ramp = ((LineStyleColorModifier_AlongStroke *)m)->color_ramp; + break; + case LS_MODIFIER_DISTANCE_FROM_CAMERA: + color_ramp = ((LineStyleColorModifier_DistanceFromCamera *)m)->color_ramp; + break; + case LS_MODIFIER_DISTANCE_FROM_OBJECT: + color_ramp = ((LineStyleColorModifier_DistanceFromObject *)m)->color_ramp; + break; + case LS_MODIFIER_MATERIAL: + color_ramp = ((LineStyleColorModifier_Material *)m)->color_ramp; + break; + default: + continue; + } + link = (LinkData *)MEM_callocN(sizeof(LinkData), "link to color ramp"); + link->data = color_ramp; + BLI_addtail(listbase, link); + } } char *BKE_linestyle_path_to_color_ramp(FreestyleLineStyle *linestyle, ColorBand *color_ramp) { - LineStyleModifier *m; - bool found = false; - - for (m = (LineStyleModifier *)linestyle->color_modifiers.first; m; m = m->next) { - switch (m->type) { - case LS_MODIFIER_ALONG_STROKE: - if (color_ramp == ((LineStyleColorModifier_AlongStroke *)m)->color_ramp) - found = true; - break; - case LS_MODIFIER_DISTANCE_FROM_CAMERA: - if (color_ramp == ((LineStyleColorModifier_DistanceFromCamera *)m)->color_ramp) - found = true; - break; - case LS_MODIFIER_DISTANCE_FROM_OBJECT: - if (color_ramp == ((LineStyleColorModifier_DistanceFromObject *)m)->color_ramp) - found = true; - break; - case LS_MODIFIER_MATERIAL: - if (color_ramp == ((LineStyleColorModifier_Material *)m)->color_ramp) - found = true; - break; - case LS_MODIFIER_TANGENT: - if (color_ramp == ((LineStyleColorModifier_Tangent *)m)->color_ramp) - found = true; - break; - case LS_MODIFIER_NOISE: - if (color_ramp == ((LineStyleColorModifier_Noise *)m)->color_ramp) - found = true; - break; - case LS_MODIFIER_CREASE_ANGLE: - if (color_ramp == ((LineStyleColorModifier_CreaseAngle *)m)->color_ramp) - found = true; - break; - case LS_MODIFIER_CURVATURE_3D: - if (color_ramp == ((LineStyleColorModifier_Curvature_3D *)m)->color_ramp) - found = true; - break; - } - - if (found) { - char name_esc[sizeof(m->name) * 2]; - BLI_strescape(name_esc, m->name, sizeof(name_esc)); - return BLI_sprintfN("color_modifiers[\"%s\"].color_ramp", name_esc); - } - } - printf("BKE_linestyle_path_to_color_ramp: No color ramps correspond to the given pointer.\n"); - return NULL; + LineStyleModifier *m; + bool found = false; + + for (m = (LineStyleModifier *)linestyle->color_modifiers.first; m; m = m->next) { + switch (m->type) { + case LS_MODIFIER_ALONG_STROKE: + if (color_ramp == ((LineStyleColorModifier_AlongStroke *)m)->color_ramp) + found = true; + break; + case LS_MODIFIER_DISTANCE_FROM_CAMERA: + if (color_ramp == ((LineStyleColorModifier_DistanceFromCamera *)m)->color_ramp) + found = true; + break; + case LS_MODIFIER_DISTANCE_FROM_OBJECT: + if (color_ramp == ((LineStyleColorModifier_DistanceFromObject *)m)->color_ramp) + found = true; + break; + case LS_MODIFIER_MATERIAL: + if (color_ramp == ((LineStyleColorModifier_Material *)m)->color_ramp) + found = true; + break; + case LS_MODIFIER_TANGENT: + if (color_ramp == ((LineStyleColorModifier_Tangent *)m)->color_ramp) + found = true; + break; + case LS_MODIFIER_NOISE: + if (color_ramp == ((LineStyleColorModifier_Noise *)m)->color_ramp) + found = true; + break; + case LS_MODIFIER_CREASE_ANGLE: + if (color_ramp == ((LineStyleColorModifier_CreaseAngle *)m)->color_ramp) + found = true; + break; + case LS_MODIFIER_CURVATURE_3D: + if (color_ramp == ((LineStyleColorModifier_Curvature_3D *)m)->color_ramp) + found = true; + break; + } + + if (found) { + char name_esc[sizeof(m->name) * 2]; + BLI_strescape(name_esc, m->name, sizeof(name_esc)); + return BLI_sprintfN("color_modifiers[\"%s\"].color_ramp", name_esc); + } + } + printf("BKE_linestyle_path_to_color_ramp: No color ramps correspond to the given pointer.\n"); + return NULL; } bool BKE_linestyle_use_textures(FreestyleLineStyle *linestyle, const bool use_shading_nodes) { - if (use_shading_nodes) { - if (linestyle && linestyle->use_nodes && linestyle->nodetree) { - bNode *node; - - for (node = linestyle->nodetree->nodes.first; node; node = node->next) { - if (node->typeinfo->nclass == NODE_CLASS_TEXTURE) { - return true; - } - } - } - } - else { - if (linestyle && (linestyle->flag & LS_TEXTURE)) { - return (linestyle->mtex[0] != NULL); - } - } - return false; + if (use_shading_nodes) { + if (linestyle && linestyle->use_nodes && linestyle->nodetree) { + bNode *node; + + for (node = linestyle->nodetree->nodes.first; node; node = node->next) { + if (node->typeinfo->nclass == NODE_CLASS_TEXTURE) { + return true; + } + } + } + } + else { + if (linestyle && (linestyle->flag & LS_TEXTURE)) { + return (linestyle->mtex[0] != NULL); + } + } + return false; } void BKE_linestyle_default_shader(const bContext *C, FreestyleLineStyle *linestyle) { - bNode *uv_along_stroke, *input_texure, *output_linestyle; - bNodeSocket *fromsock, *tosock; - bNodeTree *ntree; + bNode *uv_along_stroke, *input_texure, *output_linestyle; + bNodeSocket *fromsock, *tosock; + bNodeTree *ntree; - BLI_assert(linestyle->nodetree == NULL); + BLI_assert(linestyle->nodetree == NULL); - ntree = ntreeAddTree(NULL, "stroke_shader", "ShaderNodeTree"); + ntree = ntreeAddTree(NULL, "stroke_shader", "ShaderNodeTree"); - linestyle->nodetree = ntree; + linestyle->nodetree = ntree; - uv_along_stroke = nodeAddStaticNode(C, ntree, SH_NODE_UVALONGSTROKE); - uv_along_stroke->locx = 0.0f; - uv_along_stroke->locy = 300.0f; - uv_along_stroke->custom1 = 0; // use_tips + uv_along_stroke = nodeAddStaticNode(C, ntree, SH_NODE_UVALONGSTROKE); + uv_along_stroke->locx = 0.0f; + uv_along_stroke->locy = 300.0f; + uv_along_stroke->custom1 = 0; // use_tips - input_texure = nodeAddStaticNode(C, ntree, SH_NODE_TEX_IMAGE); - input_texure->locx = 200.0f; - input_texure->locy = 300.0f; + input_texure = nodeAddStaticNode(C, ntree, SH_NODE_TEX_IMAGE); + input_texure->locx = 200.0f; + input_texure->locy = 300.0f; - output_linestyle = nodeAddStaticNode(C, ntree, SH_NODE_OUTPUT_LINESTYLE); - output_linestyle->locx = 400.0f; - output_linestyle->locy = 300.0f; - output_linestyle->custom1 = MA_RAMP_BLEND; - output_linestyle->custom2 = 0; // use_clamp + output_linestyle = nodeAddStaticNode(C, ntree, SH_NODE_OUTPUT_LINESTYLE); + output_linestyle->locx = 400.0f; + output_linestyle->locy = 300.0f; + output_linestyle->custom1 = MA_RAMP_BLEND; + output_linestyle->custom2 = 0; // use_clamp - nodeSetActive(ntree, input_texure); + nodeSetActive(ntree, input_texure); - fromsock = BLI_findlink(&uv_along_stroke->outputs, 0); // UV - tosock = BLI_findlink(&input_texure->inputs, 0); // UV - nodeAddLink(ntree, uv_along_stroke, fromsock, input_texure, tosock); + fromsock = BLI_findlink(&uv_along_stroke->outputs, 0); // UV + tosock = BLI_findlink(&input_texure->inputs, 0); // UV + nodeAddLink(ntree, uv_along_stroke, fromsock, input_texure, tosock); - fromsock = BLI_findlink(&input_texure->outputs, 0); // Color - tosock = BLI_findlink(&output_linestyle->inputs, 0); // Color - nodeAddLink(ntree, input_texure, fromsock, output_linestyle, tosock); + fromsock = BLI_findlink(&input_texure->outputs, 0); // Color + tosock = BLI_findlink(&output_linestyle->inputs, 0); // Color + nodeAddLink(ntree, input_texure, fromsock, output_linestyle, tosock); - ntreeUpdateTree(CTX_data_main(C), ntree); + ntreeUpdateTree(CTX_data_main(C), ntree); } |