Revision: 41812
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41812
Author: kjym3
Date: 2011-11-14 00:43:37 +0000 (Mon, 14 Nov 2011)
Log Message:
-----------
Implemented a button to make a single-user copy of a line style.
Modified Paths:
--------------
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_linestyle.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/linestyle.c
Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_linestyle.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_linestyle.h
2011-11-14 00:39:39 UTC (rev 41811)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_linestyle.h
2011-11-14 00:43:37 UTC (rev 41812)
@@ -44,12 +44,18 @@
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);
void FRS_remove_linestyle_thickness_modifier(FreestyleLineStyle *linestyle,
LineStyleModifier *modifier);
Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.c
2011-11-14 00:39:39 UTC (rev 41811)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.c
2011-11-14 00:43:37 UTC (rev 41812)
@@ -364,7 +364,8 @@
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;
Modified:
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/linestyle.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/linestyle.c
2011-11-14 00:39:39 UTC (rev 41811)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/linestyle.c
2011-11-14 00:43:37 UTC (rev 41812)
@@ -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 @@
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 @@
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 @@
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 @@
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,13 +229,64 @@
((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)
{
switch (m->type) {
@@ -207,10 +306,9 @@
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 @@
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,12 +356,65 @@
((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:
+ {
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
