Implemented a button to make a single-user copy of a line style.
This commit is contained in:
@@ -44,11 +44,17 @@ struct Object;
|
||||
|
||||
FreestyleLineStyle *FRS_new_linestyle(char *name, struct Main *main);
|
||||
void FRS_free_linestyle(FreestyleLineStyle *linestyle);
|
||||
FreestyleLineStyle *FRS_copy_linestyle(FreestyleLineStyle *linestyle);
|
||||
|
||||
int FRS_add_linestyle_color_modifier(FreestyleLineStyle *linestyle, int type);
|
||||
int FRS_add_linestyle_alpha_modifier(FreestyleLineStyle *linestyle, int type);
|
||||
int FRS_add_linestyle_thickness_modifier(FreestyleLineStyle *linestyle, int type);
|
||||
int FRS_add_linestyle_geometry_modifier(FreestyleLineStyle *linestyle, int type);
|
||||
LineStyleModifier *FRS_add_linestyle_color_modifier(FreestyleLineStyle *linestyle, int type);
|
||||
LineStyleModifier *FRS_add_linestyle_alpha_modifier(FreestyleLineStyle *linestyle, int type);
|
||||
LineStyleModifier *FRS_add_linestyle_thickness_modifier(FreestyleLineStyle *linestyle, int type);
|
||||
LineStyleModifier *FRS_add_linestyle_geometry_modifier(FreestyleLineStyle *linestyle, int type);
|
||||
|
||||
LineStyleModifier *FRS_copy_linestyle_color_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m);
|
||||
LineStyleModifier *FRS_copy_linestyle_alpha_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m);
|
||||
LineStyleModifier *FRS_copy_linestyle_thickness_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m);
|
||||
LineStyleModifier *FRS_copy_linestyle_geometry_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m);
|
||||
|
||||
void FRS_remove_linestyle_color_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *modifier);
|
||||
void FRS_remove_linestyle_alpha_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *modifier);
|
||||
|
||||
@@ -364,7 +364,8 @@ int id_copy(ID *id, ID **newid, int test)
|
||||
case ID_GD:
|
||||
return 0; /* not implemented */
|
||||
case ID_LS:
|
||||
return 0; /* not implemented */
|
||||
if(!test) *newid= (ID*)FRS_copy_linestyle((FreestyleLineStyle*)id);
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -34,6 +34,7 @@
|
||||
|
||||
#include "MEM_guardedalloc.h"
|
||||
|
||||
#include "DNA_object_types.h"
|
||||
#include "DNA_material_types.h" /* for ramp blend */
|
||||
#include "DNA_texture_types.h"
|
||||
|
||||
@@ -74,6 +75,8 @@ static void default_linestyle_settings(FreestyleLineStyle *linestyle)
|
||||
linestyle->thickness = 1.0;
|
||||
linestyle->chaining = LS_CHAINING_PLAIN;
|
||||
linestyle->rounds = 3;
|
||||
linestyle->min_angle = 0.0f;
|
||||
linestyle->max_angle = 0.0f;
|
||||
linestyle->min_length = 0.0f;
|
||||
linestyle->max_length = 10000.0f;
|
||||
|
||||
@@ -116,6 +119,45 @@ void FRS_free_linestyle(FreestyleLineStyle *linestyle)
|
||||
FRS_remove_linestyle_geometry_modifier(linestyle, m);
|
||||
}
|
||||
|
||||
FreestyleLineStyle *FRS_copy_linestyle(FreestyleLineStyle *linestyle)
|
||||
{
|
||||
FreestyleLineStyle *new_linestyle;
|
||||
LineStyleModifier *m;
|
||||
|
||||
new_linestyle = FRS_new_linestyle(linestyle->id.name+2, NULL);
|
||||
FRS_free_linestyle(new_linestyle);
|
||||
|
||||
new_linestyle->r = linestyle->r;
|
||||
new_linestyle->g = linestyle->g;
|
||||
new_linestyle->b = linestyle->b;
|
||||
new_linestyle->alpha = linestyle->alpha;
|
||||
new_linestyle->thickness = linestyle->thickness;
|
||||
new_linestyle->flag = linestyle->flag;
|
||||
new_linestyle->caps = linestyle->caps;
|
||||
new_linestyle->chaining = linestyle->chaining;
|
||||
new_linestyle->rounds = linestyle->rounds;
|
||||
new_linestyle->min_angle = linestyle->min_angle;
|
||||
new_linestyle->max_angle = linestyle->max_angle;
|
||||
new_linestyle->min_length = linestyle->min_length;
|
||||
new_linestyle->max_length = linestyle->max_length;
|
||||
new_linestyle->dash1 = linestyle->dash1;
|
||||
new_linestyle->gap1 = linestyle->gap1;
|
||||
new_linestyle->dash2 = linestyle->dash2;
|
||||
new_linestyle->gap2 = linestyle->gap2;
|
||||
new_linestyle->dash3 = linestyle->dash3;
|
||||
new_linestyle->gap3 = linestyle->gap3;
|
||||
new_linestyle->panel = linestyle->panel;
|
||||
for (m = (LineStyleModifier *)linestyle->color_modifiers.first; m; m = m->next)
|
||||
FRS_copy_linestyle_color_modifier(new_linestyle, m);
|
||||
for (m = (LineStyleModifier *)linestyle->alpha_modifiers.first; m; m = m->next)
|
||||
FRS_copy_linestyle_alpha_modifier(new_linestyle, m);
|
||||
for (m = (LineStyleModifier *)linestyle->thickness_modifiers.first; m; m = m->next)
|
||||
FRS_copy_linestyle_thickness_modifier(new_linestyle, m);
|
||||
for (m = (LineStyleModifier *)linestyle->geometry_modifiers.first; m; m = m->next)
|
||||
FRS_copy_linestyle_geometry_modifier(new_linestyle, m);
|
||||
return new_linestyle;
|
||||
}
|
||||
|
||||
static LineStyleModifier *new_modifier(int type, size_t size)
|
||||
{
|
||||
LineStyleModifier *m;
|
||||
@@ -136,10 +178,9 @@ static void add_to_modifier_list(ListBase *lb, LineStyleModifier *m)
|
||||
BLI_uniquename(lb, m, modifier_name[m->type], '.', offsetof(LineStyleModifier, name), sizeof(m->name));
|
||||
}
|
||||
|
||||
int FRS_add_linestyle_color_modifier(FreestyleLineStyle *linestyle, int type)
|
||||
static LineStyleModifier *alloc_color_modifier(int type)
|
||||
{
|
||||
size_t size;
|
||||
LineStyleModifier *m;
|
||||
|
||||
switch (type) {
|
||||
case LS_MODIFIER_ALONG_STROKE:
|
||||
@@ -155,11 +196,18 @@ int FRS_add_linestyle_color_modifier(FreestyleLineStyle *linestyle, int type)
|
||||
size = sizeof(LineStyleColorModifier_Material);
|
||||
break;
|
||||
default:
|
||||
return -1; /* unknown modifier type */
|
||||
return NULL; /* unknown modifier type */
|
||||
}
|
||||
m = new_modifier(type, size);
|
||||
return new_modifier(type, size);
|
||||
}
|
||||
|
||||
LineStyleModifier *FRS_add_linestyle_color_modifier(FreestyleLineStyle *linestyle, int type)
|
||||
{
|
||||
LineStyleModifier *m;
|
||||
|
||||
m = alloc_color_modifier(type);
|
||||
if (!m)
|
||||
return -1;
|
||||
return NULL;
|
||||
m->blend = MA_RAMP_BLEND;
|
||||
switch (type) {
|
||||
case LS_MODIFIER_ALONG_STROKE:
|
||||
@@ -181,11 +229,62 @@ int FRS_add_linestyle_color_modifier(FreestyleLineStyle *linestyle, int type)
|
||||
((LineStyleColorModifier_Material *)m)->mat_attr = LS_MODIFIER_MATERIAL_DIFF;
|
||||
break;
|
||||
default:
|
||||
return -1; /* unknown modifier type */
|
||||
return NULL; /* unknown modifier type */
|
||||
}
|
||||
add_to_modifier_list(&linestyle->color_modifiers, m);
|
||||
|
||||
return 0;
|
||||
return m;
|
||||
}
|
||||
|
||||
LineStyleModifier *FRS_copy_linestyle_color_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m)
|
||||
{
|
||||
LineStyleModifier *new_m;
|
||||
|
||||
new_m = alloc_color_modifier(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:
|
||||
{
|
||||
LineStyleColorModifier_AlongStroke *p = (LineStyleColorModifier_AlongStroke *)m;
|
||||
((LineStyleColorModifier_AlongStroke *)new_m)->color_ramp = MEM_dupallocN(p->color_ramp);
|
||||
}
|
||||
break;
|
||||
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
|
||||
{
|
||||
LineStyleColorModifier_DistanceFromCamera *p = (LineStyleColorModifier_DistanceFromCamera *)m;
|
||||
((LineStyleColorModifier_DistanceFromCamera *)new_m)->color_ramp = MEM_dupallocN(p->color_ramp);
|
||||
((LineStyleColorModifier_DistanceFromCamera *)new_m)->range_min = p->range_min;
|
||||
((LineStyleColorModifier_DistanceFromCamera *)new_m)->range_max = p->range_max;
|
||||
}
|
||||
break;
|
||||
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
|
||||
{
|
||||
LineStyleColorModifier_DistanceFromObject *p = (LineStyleColorModifier_DistanceFromObject *)m;
|
||||
if (p->target)
|
||||
p->target->id.us++;
|
||||
((LineStyleColorModifier_DistanceFromObject *)new_m)->target = p->target;
|
||||
((LineStyleColorModifier_DistanceFromObject *)new_m)->color_ramp = MEM_dupallocN(p->color_ramp);
|
||||
((LineStyleColorModifier_DistanceFromObject *)new_m)->range_min = p->range_min;
|
||||
((LineStyleColorModifier_DistanceFromObject *)new_m)->range_max = p->range_max;
|
||||
}
|
||||
break;
|
||||
case LS_MODIFIER_MATERIAL:
|
||||
{
|
||||
LineStyleColorModifier_Material *p = (LineStyleColorModifier_Material *)m;
|
||||
((LineStyleColorModifier_Material *)new_m)->color_ramp = MEM_dupallocN(p->color_ramp);
|
||||
((LineStyleColorModifier_Material *)new_m)->mat_attr = p->mat_attr;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
return NULL; /* unknown modifier type */
|
||||
}
|
||||
add_to_modifier_list(&linestyle->color_modifiers, new_m);
|
||||
|
||||
return new_m;
|
||||
}
|
||||
|
||||
void FRS_remove_linestyle_color_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m)
|
||||
@@ -207,10 +306,9 @@ void FRS_remove_linestyle_color_modifier(FreestyleLineStyle *linestyle, LineStyl
|
||||
BLI_freelinkN(&linestyle->color_modifiers, m);
|
||||
}
|
||||
|
||||
int FRS_add_linestyle_alpha_modifier(FreestyleLineStyle *linestyle, int type)
|
||||
static LineStyleModifier *alloc_alpha_modifier(int type)
|
||||
{
|
||||
size_t size;
|
||||
LineStyleModifier *m;
|
||||
|
||||
switch (type) {
|
||||
case LS_MODIFIER_ALONG_STROKE:
|
||||
@@ -226,11 +324,18 @@ int FRS_add_linestyle_alpha_modifier(FreestyleLineStyle *linestyle, int type)
|
||||
size = sizeof(LineStyleAlphaModifier_Material);
|
||||
break;
|
||||
default:
|
||||
return -1; /* unknown modifier type */
|
||||
return NULL; /* unknown modifier type */
|
||||
}
|
||||
m = new_modifier(type, size);
|
||||
return new_modifier(type, size);
|
||||
}
|
||||
|
||||
LineStyleModifier *FRS_add_linestyle_alpha_modifier(FreestyleLineStyle *linestyle, int type)
|
||||
{
|
||||
LineStyleModifier *m;
|
||||
|
||||
m = alloc_alpha_modifier(type);
|
||||
if (!m)
|
||||
return -1;
|
||||
return NULL;
|
||||
m->blend = LS_VALUE_BLEND;
|
||||
switch (type) {
|
||||
case LS_MODIFIER_ALONG_STROKE:
|
||||
@@ -251,10 +356,63 @@ int FRS_add_linestyle_alpha_modifier(FreestyleLineStyle *linestyle, int type)
|
||||
((LineStyleAlphaModifier_Material *)m)->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
|
||||
((LineStyleAlphaModifier_Material *)m)->mat_attr = LS_MODIFIER_MATERIAL_DIFF;
|
||||
break;
|
||||
default:
|
||||
return NULL; /* unknown modifier type */
|
||||
}
|
||||
add_to_modifier_list(&linestyle->alpha_modifiers, m);
|
||||
|
||||
return 0;
|
||||
return m;
|
||||
}
|
||||
|
||||
LineStyleModifier *FRS_copy_linestyle_alpha_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m)
|
||||
{
|
||||
LineStyleModifier *new_m;
|
||||
|
||||
new_m = alloc_alpha_modifier(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:
|
||||
{
|
||||
LineStyleAlphaModifier_AlongStroke *p = (LineStyleAlphaModifier_AlongStroke *)m;
|
||||
((LineStyleAlphaModifier_AlongStroke *)new_m)->curve = curvemapping_copy(p->curve);
|
||||
}
|
||||
break;
|
||||
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
|
||||
{
|
||||
LineStyleAlphaModifier_DistanceFromCamera *p = (LineStyleAlphaModifier_DistanceFromCamera *)m;
|
||||
((LineStyleAlphaModifier_DistanceFromCamera *)new_m)->curve = curvemapping_copy(p->curve);
|
||||
((LineStyleAlphaModifier_DistanceFromCamera *)new_m)->range_min = p->range_min;
|
||||
((LineStyleAlphaModifier_DistanceFromCamera *)new_m)->range_max = p->range_max;
|
||||
}
|
||||
break;
|
||||
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
|
||||
{
|
||||
LineStyleAlphaModifier_DistanceFromObject *p = (LineStyleAlphaModifier_DistanceFromObject *)m;
|
||||
if (p->target)
|
||||
p->target->id.us++;
|
||||
((LineStyleAlphaModifier_DistanceFromObject *)new_m)->target = p->target;
|
||||
((LineStyleAlphaModifier_DistanceFromObject *)new_m)->curve = curvemapping_copy(p->curve);
|
||||
((LineStyleAlphaModifier_DistanceFromObject *)new_m)->range_min = p->range_min;
|
||||
((LineStyleAlphaModifier_DistanceFromObject *)new_m)->range_max = p->range_max;
|
||||
}
|
||||
break;
|
||||
case LS_MODIFIER_MATERIAL:
|
||||
{
|
||||
LineStyleAlphaModifier_Material *p = (LineStyleAlphaModifier_Material *)m;
|
||||
((LineStyleAlphaModifier_Material *)new_m)->curve = curvemapping_copy(p->curve);
|
||||
((LineStyleAlphaModifier_Material *)new_m)->mat_attr = p->mat_attr;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
return NULL; /* unknown modifier type */
|
||||
}
|
||||
add_to_modifier_list(&linestyle->alpha_modifiers, new_m);
|
||||
|
||||
return new_m;
|
||||
}
|
||||
|
||||
void FRS_remove_linestyle_alpha_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m)
|
||||
@@ -276,10 +434,9 @@ void FRS_remove_linestyle_alpha_modifier(FreestyleLineStyle *linestyle, LineStyl
|
||||
BLI_freelinkN(&linestyle->alpha_modifiers, m);
|
||||
}
|
||||
|
||||
int FRS_add_linestyle_thickness_modifier(FreestyleLineStyle *linestyle, int type)
|
||||
static LineStyleModifier *alloc_thickness_modifier(int type)
|
||||
{
|
||||
size_t size;
|
||||
LineStyleModifier *m;
|
||||
|
||||
switch (type) {
|
||||
case LS_MODIFIER_ALONG_STROKE:
|
||||
@@ -298,11 +455,18 @@ int FRS_add_linestyle_thickness_modifier(FreestyleLineStyle *linestyle, int type
|
||||
size = sizeof(LineStyleThicknessModifier_Calligraphy);
|
||||
break;
|
||||
default:
|
||||
return -1; /* unknown modifier type */
|
||||
return NULL; /* unknown modifier type */
|
||||
}
|
||||
m = new_modifier(type, size);
|
||||
return new_modifier(type, size);
|
||||
}
|
||||
|
||||
LineStyleModifier *FRS_add_linestyle_thickness_modifier(FreestyleLineStyle *linestyle, int type)
|
||||
{
|
||||
LineStyleModifier *m;
|
||||
|
||||
m = alloc_thickness_modifier(type);
|
||||
if (!m)
|
||||
return -1;
|
||||
return NULL;
|
||||
m->blend = LS_VALUE_BLEND;
|
||||
switch (type) {
|
||||
case LS_MODIFIER_ALONG_STROKE:
|
||||
@@ -336,10 +500,79 @@ int FRS_add_linestyle_thickness_modifier(FreestyleLineStyle *linestyle, int type
|
||||
((LineStyleThicknessModifier_Calligraphy *)m)->max_thickness = 10.0f;
|
||||
((LineStyleThicknessModifier_Calligraphy *)m)->orientation = 60.0f;
|
||||
break;
|
||||
default:
|
||||
return NULL; /* unknown modifier type */
|
||||
}
|
||||
add_to_modifier_list(&linestyle->thickness_modifiers, m);
|
||||
|
||||
return 0;
|
||||
return m;
|
||||
}
|
||||
|
||||
LineStyleModifier *FRS_copy_linestyle_thickness_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m)
|
||||
{
|
||||
LineStyleModifier *new_m;
|
||||
|
||||
new_m = alloc_thickness_modifier(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 *)new_m)->curve = curvemapping_copy(p->curve);
|
||||
((LineStyleThicknessModifier_AlongStroke *)new_m)->value_min = p->value_min;
|
||||
((LineStyleThicknessModifier_AlongStroke *)new_m)->value_max = p->value_max;
|
||||
}
|
||||
break;
|
||||
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
|
||||
{
|
||||
LineStyleThicknessModifier_DistanceFromCamera *p = (LineStyleThicknessModifier_DistanceFromCamera *)m;
|
||||
((LineStyleThicknessModifier_DistanceFromCamera *)new_m)->curve = curvemapping_copy(p->curve);
|
||||
((LineStyleThicknessModifier_DistanceFromCamera *)new_m)->range_min = p->range_min;
|
||||
((LineStyleThicknessModifier_DistanceFromCamera *)new_m)->range_max = p->range_max;
|
||||
((LineStyleThicknessModifier_DistanceFromCamera *)new_m)->value_min = p->value_min;
|
||||
((LineStyleThicknessModifier_DistanceFromCamera *)new_m)->value_max = p->value_max;
|
||||
}
|
||||
break;
|
||||
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
|
||||
{
|
||||
LineStyleThicknessModifier_DistanceFromObject *p = (LineStyleThicknessModifier_DistanceFromObject *)m;
|
||||
if (p->target)
|
||||
p->target->id.us++;
|
||||
((LineStyleThicknessModifier_DistanceFromObject *)new_m)->target = p->target;
|
||||
((LineStyleThicknessModifier_DistanceFromObject *)new_m)->curve = curvemapping_copy(p->curve);
|
||||
((LineStyleThicknessModifier_DistanceFromObject *)new_m)->range_min = p->range_min;
|
||||
((LineStyleThicknessModifier_DistanceFromObject *)new_m)->range_max = p->range_max;
|
||||
((LineStyleThicknessModifier_DistanceFromObject *)new_m)->value_min = p->value_min;
|
||||
((LineStyleThicknessModifier_DistanceFromObject *)new_m)->value_max = p->value_max;
|
||||
}
|
||||
break;
|
||||
case LS_MODIFIER_MATERIAL:
|
||||
{
|
||||
LineStyleThicknessModifier_Material *p = (LineStyleThicknessModifier_Material *)m;
|
||||
((LineStyleThicknessModifier_Material *)new_m)->curve = curvemapping_copy(p->curve);
|
||||
((LineStyleThicknessModifier_Material *)new_m)->mat_attr = p->mat_attr;
|
||||
((LineStyleThicknessModifier_Material *)new_m)->value_min = p->value_min;
|
||||
((LineStyleThicknessModifier_Material *)new_m)->value_max = p->value_max;
|
||||
}
|
||||
break;
|
||||
case LS_MODIFIER_CALLIGRAPHY:
|
||||
{
|
||||
LineStyleThicknessModifier_Calligraphy *p = (LineStyleThicknessModifier_Calligraphy *)m;
|
||||
((LineStyleThicknessModifier_Calligraphy *)new_m)->min_thickness = p->min_thickness;
|
||||
((LineStyleThicknessModifier_Calligraphy *)new_m)->max_thickness = p->max_thickness;
|
||||
((LineStyleThicknessModifier_Calligraphy *)new_m)->orientation = p->orientation;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
return NULL; /* unknown modifier type */
|
||||
}
|
||||
add_to_modifier_list(&linestyle->thickness_modifiers, new_m);
|
||||
|
||||
return new_m;
|
||||
}
|
||||
|
||||
void FRS_remove_linestyle_thickness_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m)
|
||||
@@ -363,10 +596,9 @@ void FRS_remove_linestyle_thickness_modifier(FreestyleLineStyle *linestyle, Line
|
||||
BLI_freelinkN(&linestyle->thickness_modifiers, m);
|
||||
}
|
||||
|
||||
int FRS_add_linestyle_geometry_modifier(FreestyleLineStyle *linestyle, int type)
|
||||
static LineStyleModifier *alloc_geometry_modifier(int type)
|
||||
{
|
||||
size_t size;
|
||||
LineStyleModifier *m;
|
||||
|
||||
switch (type) {
|
||||
case LS_MODIFIER_SAMPLING:
|
||||
@@ -403,11 +635,18 @@ int FRS_add_linestyle_geometry_modifier(FreestyleLineStyle *linestyle, int type)
|
||||
size = sizeof(LineStyleGeometryModifier_Blueprint);
|
||||
break;
|
||||
default:
|
||||
return -1; /* unknown modifier type */
|
||||
return NULL; /* unknown modifier type */
|
||||
}
|
||||
m = new_modifier(type, size);
|
||||
return new_modifier(type, size);
|
||||
}
|
||||
|
||||
LineStyleModifier *FRS_add_linestyle_geometry_modifier(FreestyleLineStyle *linestyle, int type)
|
||||
{
|
||||
LineStyleModifier *m;
|
||||
|
||||
m = alloc_geometry_modifier(type);
|
||||
if (!m)
|
||||
return -1;
|
||||
return NULL;
|
||||
switch (type) {
|
||||
case LS_MODIFIER_SAMPLING:
|
||||
((LineStyleGeometryModifier_Sampling *)m)->sampling = 10.0;
|
||||
@@ -458,9 +697,111 @@ int FRS_add_linestyle_geometry_modifier(FreestyleLineStyle *linestyle, int type)
|
||||
((LineStyleGeometryModifier_Blueprint *)m)->random_center = 5;
|
||||
((LineStyleGeometryModifier_Blueprint *)m)->random_backbone = 5;
|
||||
break;
|
||||
default:
|
||||
return NULL; /* unknown modifier type */
|
||||
}
|
||||
add_to_modifier_list(&linestyle->geometry_modifiers, m);
|
||||
return 0;
|
||||
|
||||
return m;
|
||||
}
|
||||
|
||||
LineStyleModifier *FRS_copy_linestyle_geometry_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m)
|
||||
{
|
||||
LineStyleModifier *new_m;
|
||||
|
||||
new_m = alloc_geometry_modifier(m->type);
|
||||
if (!new_m)
|
||||
return NULL;
|
||||
new_m->flags = m->flags;
|
||||
switch (m->type) {
|
||||
case LS_MODIFIER_SAMPLING:
|
||||
{
|
||||
LineStyleGeometryModifier_Sampling *p = (LineStyleGeometryModifier_Sampling *)m;
|
||||
((LineStyleGeometryModifier_Sampling *)new_m)->sampling = p->sampling;
|
||||
}
|
||||
break;
|
||||
case LS_MODIFIER_BEZIER_CURVE:
|
||||
{
|
||||
LineStyleGeometryModifier_BezierCurve *p = (LineStyleGeometryModifier_BezierCurve *)m;
|
||||
((LineStyleGeometryModifier_BezierCurve *)new_m)->error = p->error;
|
||||
}
|
||||
break;
|
||||
case LS_MODIFIER_SINUS_DISPLACEMENT:
|
||||
{
|
||||
LineStyleGeometryModifier_SinusDisplacement *p = (LineStyleGeometryModifier_SinusDisplacement *)m;
|
||||
((LineStyleGeometryModifier_SinusDisplacement *)new_m)->wavelength = p->wavelength;
|
||||
((LineStyleGeometryModifier_SinusDisplacement *)new_m)->amplitude = p->amplitude;
|
||||
((LineStyleGeometryModifier_SinusDisplacement *)new_m)->phase = p->phase;
|
||||
}
|
||||
break;
|
||||
case LS_MODIFIER_SPATIAL_NOISE:
|
||||
{
|
||||
LineStyleGeometryModifier_SpatialNoise *p = (LineStyleGeometryModifier_SpatialNoise *)m;
|
||||
((LineStyleGeometryModifier_SpatialNoise *)new_m)->amplitude = p->amplitude;
|
||||
((LineStyleGeometryModifier_SpatialNoise *)new_m)->scale = p->scale;
|
||||
((LineStyleGeometryModifier_SpatialNoise *)new_m)->octaves = p->octaves;
|
||||
((LineStyleGeometryModifier_SpatialNoise *)new_m)->flags = p->flags;
|
||||
}
|
||||
break;
|
||||
case LS_MODIFIER_PERLIN_NOISE_1D:
|
||||
{
|
||||
LineStyleGeometryModifier_PerlinNoise1D *p = (LineStyleGeometryModifier_PerlinNoise1D *)m;
|
||||
((LineStyleGeometryModifier_PerlinNoise1D *)new_m)->frequency = p->frequency;
|
||||
((LineStyleGeometryModifier_PerlinNoise1D *)new_m)->amplitude = p->amplitude;
|
||||
((LineStyleGeometryModifier_PerlinNoise1D *)new_m)->octaves = p->octaves;
|
||||
((LineStyleGeometryModifier_PerlinNoise1D *)new_m)->angle = p->angle;
|
||||
}
|
||||
break;
|
||||
case LS_MODIFIER_PERLIN_NOISE_2D:
|
||||
{
|
||||
LineStyleGeometryModifier_PerlinNoise2D *p = (LineStyleGeometryModifier_PerlinNoise2D *)m;
|
||||
((LineStyleGeometryModifier_PerlinNoise2D *)new_m)->frequency = p->frequency;
|
||||
((LineStyleGeometryModifier_PerlinNoise2D *)new_m)->amplitude = p->amplitude;
|
||||
((LineStyleGeometryModifier_PerlinNoise2D *)new_m)->octaves = p->octaves;
|
||||
((LineStyleGeometryModifier_PerlinNoise2D *)new_m)->angle = p->angle;
|
||||
}
|
||||
break;
|
||||
case LS_MODIFIER_BACKBONE_STRETCHER:
|
||||
{
|
||||
LineStyleGeometryModifier_BackboneStretcher *p = (LineStyleGeometryModifier_BackboneStretcher *)m;
|
||||
((LineStyleGeometryModifier_BackboneStretcher *)new_m)->backbone_length = p->backbone_length;
|
||||
}
|
||||
break;
|
||||
case LS_MODIFIER_TIP_REMOVER:
|
||||
{
|
||||
LineStyleGeometryModifier_TipRemover *p = (LineStyleGeometryModifier_TipRemover *)m;
|
||||
((LineStyleGeometryModifier_TipRemover *)new_m)->tip_length = p->tip_length;
|
||||
}
|
||||
break;
|
||||
case LS_MODIFIER_POLYGONIZATION:
|
||||
{
|
||||
LineStyleGeometryModifier_Polygonalization *p = (LineStyleGeometryModifier_Polygonalization *)m;
|
||||
((LineStyleGeometryModifier_Polygonalization *)new_m)->error = p->error;
|
||||
}
|
||||
break;
|
||||
case LS_MODIFIER_GUIDING_LINES:
|
||||
{
|
||||
LineStyleGeometryModifier_GuidingLines *p = (LineStyleGeometryModifier_GuidingLines *)m;
|
||||
((LineStyleGeometryModifier_GuidingLines *)new_m)->offset = p->offset;
|
||||
}
|
||||
break;
|
||||
case LS_MODIFIER_BLUEPRINT:
|
||||
{
|
||||
LineStyleGeometryModifier_Blueprint *p = (LineStyleGeometryModifier_Blueprint *)m;
|
||||
((LineStyleGeometryModifier_Blueprint *)new_m)->flags = p->flags;
|
||||
((LineStyleGeometryModifier_Blueprint *)new_m)->rounds = p->rounds;
|
||||
((LineStyleGeometryModifier_Blueprint *)new_m)->backbone_length = p->backbone_length;
|
||||
((LineStyleGeometryModifier_Blueprint *)new_m)->random_radius = p->random_radius;
|
||||
((LineStyleGeometryModifier_Blueprint *)new_m)->random_center = p->random_center;
|
||||
((LineStyleGeometryModifier_Blueprint *)new_m)->random_backbone = p->random_backbone;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
return NULL; /* unknown modifier type */
|
||||
}
|
||||
add_to_modifier_list(&linestyle->geometry_modifiers, new_m);
|
||||
|
||||
return new_m;
|
||||
}
|
||||
|
||||
void FRS_remove_linestyle_geometry_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m)
|
||||
|
||||
Reference in New Issue
Block a user