From afa0fa5e29de94b093f4eda2f8105faa59ba5573 Mon Sep 17 00:00:00 2001 From: Nicholas Bishop Date: Sun, 16 Aug 2009 19:50:00 +0000 Subject: 2.5 Sculpt: * Added a new Paint type in scene DNA. This is now the base struct for Sculpt. * The Paint type contains a list of Brushes, you can add or remove these much like material and texture slots. * Modified the UI for the new Paint type, now shows the list of brushes active for this mode * Added a New Brush operator, shows in the UI as a list of brush tool types to add * Made the sculpt tool property UI smaller and not expanded, expectation is that we will have a number of preset brushes that will cover the basic sculpt brush types TODO: * Vertex paint, weight paint, texture paint need to be converted to this system next * Add brush presets to the default blend --- source/blender/blenkernel/BKE_brush.h | 3 +- source/blender/blenkernel/BKE_paint.h | 12 ++++ source/blender/blenkernel/intern/brush.c | 19 +----- source/blender/blenkernel/intern/paint.c | 113 +++++++++++++++++++++++++++++++ source/blender/blenkernel/intern/scene.c | 7 +- 5 files changed, 132 insertions(+), 22 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/BKE_brush.h b/source/blender/blenkernel/BKE_brush.h index 9eb0b15aed4..dfbc6b284ff 100644 --- a/source/blender/blenkernel/BKE_brush.h +++ b/source/blender/blenkernel/BKE_brush.h @@ -38,13 +38,12 @@ struct Scene; struct wmOperator; /* datablock functions */ -struct Brush *add_brush(char *name); +struct Brush *add_brush(const char *name); struct Brush *copy_brush(struct Brush *brush); void make_local_brush(struct Brush *brush); void free_brush(struct Brush *brush); /* brush library operations used by different paint panels */ -struct Brush **current_brush_source(struct Scene *sce); int brush_set_nr(struct Brush **current_brush, int nr); int brush_delete(struct Brush **current_brush); void brush_check_exists(struct Brush **brush); diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h index 582b85d5672..4232ac104d4 100644 --- a/source/blender/blenkernel/BKE_paint.h +++ b/source/blender/blenkernel/BKE_paint.h @@ -28,7 +28,19 @@ #ifndef BKE_PAINT_H #define BKE_PAINT_H +struct Brush; struct Object; +struct Paint; +struct Scene; + +void free_paint(Paint *p); +void copy_paint(Paint *orig, Paint *new); + +struct Paint *paint_get_active(struct Scene *sce); +struct Brush *paint_brush(struct Paint *paint); +void paint_brush_set(struct Paint *paint, struct Brush *br); +void paint_brush_slot_add(struct Paint *p); +void paint_brush_slot_remove(struct Paint *p); /* testing face select mode * Texture paint could be removed since selected faces are not used diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index ca21345e37f..ebde6e0077f 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -62,7 +62,7 @@ /* Datablock add/copy/free/make_local */ -Brush *add_brush(char *name) +Brush *add_brush(const char *name) { Brush *brush; @@ -186,23 +186,6 @@ void make_local_brush(Brush *brush) /* Library Operations */ -Brush **current_brush_source(Scene *sce) -{ - Object *ob = sce->basact ? sce->basact->object : NULL; - - if(ob) { - if(ob->mode & OB_MODE_SCULPT) - return &sce->toolsettings->sculpt->brush; - else if(ob->mode & OB_MODE_VERTEX_PAINT) - return &sce->toolsettings->vpaint->brush; - else if(ob->mode & OB_MODE_WEIGHT_PAINT) - return &sce->toolsettings->wpaint->brush; - else if(ob->mode & OB_MODE_TEXTURE_PAINT) - return &sce->toolsettings->imapaint.brush; - } - return NULL; -} - int brush_set_nr(Brush **current_brush, int nr) { ID *idtest, *id; diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index f47a44aff03..3f6eed8528a 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -25,13 +25,126 @@ * ***** END GPL LICENSE BLOCK ***** */ +#include "MEM_guardedalloc.h" + +#include "DNA_brush_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" +#include "BKE_brush.h" #include "BKE_global.h" #include "BKE_paint.h" +#include +#include + +Paint *paint_get_active(Scene *sce) +{ + if(sce && sce->basact && sce->basact->object) { + switch(sce->basact->object->mode) { + case OB_MODE_SCULPT: + return &sce->toolsettings->sculpt->paint; + } + } + /*else if(G.f & G_VERTEXPAINT) + return &sce->toolsettings->vpaint->paint; + else if(G.f & G_WEIGHTPAINT) + return &sce->toolsettings->wpaint->paint; + else if(G.f & G_TEXTUREPAINT) + return &sce->toolsettings->imapaint.paint;*/ + + return NULL; +} + +Brush *paint_brush(Paint *p) +{ + return p && p->brushes ? p->brushes[p->active_brush_index] : NULL; +} + +void paint_brush_set(Paint *p, Brush *br) +{ + if(p && p->brushes) { + int i; + + /* See if there's already a slot with the brush */ + for(i = 0; i < p->brush_count; ++i) { + if(p->brushes[i] == br) { + p->active_brush_index = i; + break; + } + } + + } + else + paint_brush_slot_add(p); + + /* Make sure the current slot is the new brush */ + p->brushes[p->active_brush_index] = br; +} + +static void paint_brush_slots_alloc(Paint *p, const int count) +{ + p->brush_count = count; + if(count == 0) + p->brushes = NULL; + else + p->brushes = MEM_callocN(sizeof(Brush*) * count, "Brush slots"); +} + +void paint_brush_slot_add(Paint *p) +{ + Brush **orig = p->brushes; + int orig_count = p->brushes ? p->brush_count : 0; + + /* Increase size of brush slot array */ + paint_brush_slots_alloc(p, orig_count + 1); + if(orig) { + memcpy(p->brushes, orig, sizeof(Brush*) * orig_count); + MEM_freeN(orig); + } + + p->active_brush_index = orig_count; +} + +void paint_brush_slot_remove(Paint *p) +{ + if(p->brushes) { + Brush **orig = p->brushes; + int src, dst; + + /* Decrease size of brush slot array */ + paint_brush_slots_alloc(p, p->brush_count - 1); + if(p->brushes) { + for(src = 0, dst = 0; dst < p->brush_count; ++src) { + if(src != p->active_brush_index) { + p->brushes[dst] = orig[src]; + ++dst; + } + } + } + MEM_freeN(orig); + + if(p->active_brush_index >= p->brush_count) + p->active_brush_index = p->brush_count - 1; + if(p->active_brush_index < 0) + p->active_brush_index = 0; + } +} + int paint_facesel_test(Object *ob) { return (G.f&G_FACESELECT) && (ob && (ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT))); } + +void free_paint(Paint *paint) +{ + if(paint->brushes) + MEM_freeN(paint->brushes); +} + +void copy_paint(Paint *orig, Paint *new) +{ + if(orig->brushes) + new->brushes = MEM_dupallocN(orig->brushes); +} diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 71271e77adf..1138f805538 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -76,6 +76,7 @@ #include "BKE_main.h" #include "BKE_node.h" #include "BKE_object.h" +#include "BKE_paint.h" #include "BKE_scene.h" #include "BKE_sequence.h" #include "BKE_world.h" @@ -173,7 +174,7 @@ Scene *copy_scene(Main *bmain, Scene *sce, int type) } if(ts->sculpt) { ts->sculpt= MEM_dupallocN(ts->sculpt); - id_us_plus((ID *)ts->sculpt->brush); + copy_paint(&ts->sculpt->paint, &ts->sculpt->paint); } id_us_plus((ID *)ts->imapaint.brush); @@ -275,8 +276,10 @@ void free_scene(Scene *sce) MEM_freeN(sce->toolsettings->vpaint); if(sce->toolsettings->wpaint) MEM_freeN(sce->toolsettings->wpaint); - if(sce->toolsettings->sculpt) + if(sce->toolsettings->sculpt) { + free_paint(&sce->toolsettings->sculpt->paint); MEM_freeN(sce->toolsettings->sculpt); + } MEM_freeN(sce->toolsettings); sce->toolsettings = NULL; -- cgit v1.2.3