archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

code cleanup: name mask and grease pencil dope sheet editor functions more consistantly

Browse Source
This commit is contained in:
Campbell Barton
2012-06-08 21:48:04 +00:00
parent dfa307f73f
commit 2f5612ba33
6 changed files with 80 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
source/blender/editors/gpencil/editaction_gpencil.c
View File

@@ -62,7 +62,7 @@
/* Generics - Loopers */
/* Loops over the gp-frames for a gp-layer, and applies the given callback */
short gplayer_frames_looper(bGPDlayer *gpl, Scene *scene, short (*gpf_cb)(bGPDframe *, Scene *))
short ED_gplayer_frames_looper(bGPDlayer *gpl, Scene *scene, short (*gpf_cb)(bGPDframe *, Scene *))
{
bGPDframe *gpf;
@@ -85,7 +85,7 @@ short gplayer_frames_looper(bGPDlayer *gpl, Scene *scene, short (*gpf_cb)(bGPDfr
/* Data Conversion Tools */
/* make a listing all the gp-frames in a layer as cfraelems */
void gplayer_make_cfra_list(bGPDlayer *gpl, ListBase *elems, short onlysel)
void ED_gplayer_make_cfra_list(bGPDlayer *gpl, ListBase *elems, short onlysel)
{
bGPDframe *gpf;
CfraElem *ce;
@@ -111,7 +111,7 @@ void gplayer_make_cfra_list(bGPDlayer *gpl, ListBase *elems, short onlysel)
/* Selection Tools */
/* check if one of the frames in this layer is selected */
short is_gplayer_frame_selected(bGPDlayer *gpl)
short ED_gplayer_frame_select_check(bGPDlayer *gpl)
{
bGPDframe *gpf;
@@ -149,7 +149,7 @@ static void gpframe_select(bGPDframe *gpf, short select_mode)
}
/* set all/none/invert select (like above, but with SELECT_* modes) */
void select_gpencil_frames(bGPDlayer *gpl, short select_mode)
void ED_gpencil_select_frames(bGPDlayer *gpl, short select_mode)
{
bGPDframe *gpf;
@@ -164,18 +164,18 @@ void select_gpencil_frames(bGPDlayer *gpl, short select_mode)
}
/* set all/none/invert select */
void set_gplayer_frame_selection(bGPDlayer *gpl, short mode)
void ED_gplayer_frame_select_set(bGPDlayer *gpl, short mode)
{
/* error checking */
if (gpl == NULL)
return;
/* now call the standard function */
select_gpencil_frames(gpl, mode);
ED_gpencil_select_frames(gpl, mode);
}
/* select the frame in this layer that occurs on this frame (there should only be one at most) */
void select_gpencil_frame(bGPDlayer *gpl, int selx, short select_mode)
void ED_gpencil_select_frame(bGPDlayer *gpl, int selx, short select_mode)
{
bGPDframe *gpf;
@@ -193,7 +193,7 @@ void select_gpencil_frame(bGPDlayer *gpl, int selx, short select_mode)
}
/* select the frames in this layer that occur within the bounds specified */
void borderselect_gplayer_frames(bGPDlayer *gpl, float min, float max, short select_mode)
void ED_gplayer_frames_select_border(bGPDlayer *gpl, float min, float max, short select_mode)
{
bGPDframe *gpf;
@@ -211,7 +211,7 @@ void borderselect_gplayer_frames(bGPDlayer *gpl, float min, float max, short sel
/* Frame Editing Tools */
/* Delete selected frames */
void delete_gplayer_frames(bGPDlayer *gpl)
void ED_gplayer_frames_delete(bGPDlayer *gpl)
{
bGPDframe *gpf, *gpfn;
@@ -229,7 +229,7 @@ void delete_gplayer_frames(bGPDlayer *gpl)
}
/* Duplicate selected frames from given gp-layer */
void duplicate_gplayer_frames(bGPDlayer *gpl)
void ED_gplayer_frames_duplicate(bGPDlayer *gpl)
{
bGPDframe *gpf, *gpfn;
@@ -502,19 +502,19 @@ void snap_gplayer_frames(bGPDlayer *gpl, Scene *scene, short mode)
{
switch (mode) {
case 1: /* snap to nearest frame */
gplayer_frames_looper(gpl, scene, snap_gpf_nearest);
ED_gplayer_frames_looper(gpl, scene, snap_gpf_nearest);
break;
case 2: /* snap to current frame */
gplayer_frames_looper(gpl, scene, snap_gpf_cframe);
ED_gplayer_frames_looper(gpl, scene, snap_gpf_cframe);
break;
case 3: /* snap to nearest marker */
gplayer_frames_looper(gpl, scene, snap_gpf_nearmarker);
ED_gplayer_frames_looper(gpl, scene, snap_gpf_nearmarker);
break;
case 4: /* snap to nearest second */
gplayer_frames_looper(gpl, scene, snap_gpf_nearestsec);
ED_gplayer_frames_looper(gpl, scene, snap_gpf_nearestsec);
break;
default: /* just in case */
gplayer_frames_looper(gpl, scene, snap_gpf_nearest);
ED_gplayer_frames_looper(gpl, scene, snap_gpf_nearest);
break;
}
}
@@ -604,21 +604,21 @@ void mirror_gplayer_frames(bGPDlayer *gpl, Scene *scene, short mode)
{
switch (mode) {
case 1: /* mirror over current frame */
gplayer_frames_looper(gpl, scene, mirror_gpf_cframe);
ED_gplayer_frames_looper(gpl, scene, mirror_gpf_cframe);
break;
case 2: /* mirror over frame 0 */
gplayer_frames_looper(gpl, scene, mirror_gpf_yaxis);
ED_gplayer_frames_looper(gpl, scene, mirror_gpf_yaxis);
break;
case 3: /* mirror over value 0 */
gplayer_frames_looper(gpl, scene, mirror_gpf_xaxis);
ED_gplayer_frames_looper(gpl, scene, mirror_gpf_xaxis);
break;
case 4: /* mirror over marker */
mirror_gpf_marker(NULL, NULL);
gplayer_frames_looper(gpl, scene, mirror_gpf_marker);
ED_gplayer_frames_looper(gpl, scene, mirror_gpf_marker);
mirror_gpf_marker(NULL, NULL);
break;
default: /* just in case */
gplayer_frames_looper(gpl, scene, mirror_gpf_yaxis);
ED_gplayer_frames_looper(gpl, scene, mirror_gpf_yaxis);
break;
}
}

22
source/blender/editors/include/ED_gpencil.h
View File

@@ -83,25 +83,27 @@ void draw_gpencil_view3d(struct Scene *scene, struct View3D *v3d, struct ARegion
void gpencil_panel_standard(const struct bContext *C, struct Panel *pa);
/* ----------- Grease-Pencil AnimEdit API ------------------ */
short gplayer_frames_looper(struct bGPDlayer *gpl, struct Scene *scene,
short (*gpf_cb)(struct bGPDframe *, struct Scene *));
void gplayer_make_cfra_list(struct bGPDlayer *gpl, ListBase *elems, short onlysel);
short ED_gplayer_frames_looper(struct bGPDlayer *gpl, struct Scene *scene,
short (*gpf_cb)(struct bGPDframe *, struct Scene *));
void ED_gplayer_make_cfra_list(struct bGPDlayer *gpl, ListBase *elems, short onlysel);
short is_gplayer_frame_selected(struct bGPDlayer *gpl);
void set_gplayer_frame_selection(struct bGPDlayer *gpl, short mode);
void select_gpencil_frames(struct bGPDlayer *gpl, short select_mode);
void select_gpencil_frame(struct bGPDlayer *gpl, int selx, short select_mode);
void borderselect_gplayer_frames(struct bGPDlayer *gpl, float min, float max, short select_mode);
short ED_gplayer_frame_select_check(struct bGPDlayer *gpl);
void ED_gplayer_frame_select_set(struct bGPDlayer *gpl, short mode);
void ED_gplayer_frames_select_border(struct bGPDlayer *gpl, float min, float max, short select_mode);
void ED_gpencil_select_frames(struct bGPDlayer *gpl, short select_mode);
void ED_gpencil_select_frame(struct bGPDlayer *gpl, int selx, short select_mode);
void delete_gplayer_frames(struct bGPDlayer *gpl);
void duplicate_gplayer_frames(struct bGPDlayer *gpl);
void ED_gplayer_frames_delete(struct bGPDlayer *gpl);
void ED_gplayer_frames_duplicate(struct bGPDlayer *gpl);
#if 0
void free_gpcopybuf(void);
void copy_gpdata(void);
void paste_gpdata(void);
void snap_gplayer_frames(struct bGPDlayer *gpl, short mode);
void mirror_gplayer_frames(struct bGPDlayer *gpl, short mode);
#endif
/* ------------ Grease-Pencil Undo System ------------------ */
int ED_gpencil_session_active(void);

32
source/blender/editors/include/ED_mask.h
View File

@@ -49,24 +49,26 @@ int ED_mask_layer_shape_auto_key_all(struct Mask *mask, const int frame);
int ED_mask_layer_shape_auto_key_select(struct Mask *mask, const int frame);
/* ----------- Mask AnimEdit API ------------------ */
short masklayer_frames_looper(struct MaskLayer *masklay, struct Scene *scene,
short (*masklay_shape_cb)(struct MaskLayerShape *, struct Scene *));
void masklayer_make_cfra_list(struct MaskLayer *masklay, ListBase *elems, short onlysel);
short ED_masklayer_frames_looper(struct MaskLayer *masklay, struct Scene *scene,
short (*masklay_shape_cb)(struct MaskLayerShape *, struct Scene *));
void ED_masklayer_make_cfra_list(struct MaskLayer *masklay, ListBase *elems, short onlysel);
short is_masklayer_frame_selected(struct MaskLayer *masklay);
void set_masklayer_frame_selection(struct MaskLayer *masklay, short mode);
void select_mask_frames(struct MaskLayer *masklay, short select_mode);
void select_mask_frame(struct MaskLayer *masklay, int selx, short select_mode);
void borderselect_masklayer_frames(struct MaskLayer *masklay, float min, float max, short select_mode);
short ED_masklayer_frame_select_check(struct MaskLayer *masklay);
void ED_masklayer_frame_select_set(struct MaskLayer *masklay, short mode);
void ED_masklayer_frames_select_border(struct MaskLayer *masklay, float min, float max, short select_mode);
void ED_mask_select_frames(struct MaskLayer *masklay, short select_mode);
void ED_mask_select_frame(struct MaskLayer *masklay, int selx, short select_mode);
void delete_masklayer_frames(struct MaskLayer *masklay);
void duplicate_masklayer_frames(struct MaskLayer *masklay);
void ED_masklayer_frames_delete(struct MaskLayer *masklay);
void ED_masklayer_frames_duplicate(struct MaskLayer *masklay);
//void free_gpcopybuf(void);
//void copy_gpdata(void);
//void paste_gpdata(void);
#if 0
void free_gpcopybuf(void);
void copy_gpdata(void);
void paste_gpdata(void);
void snap_masklayer_frames(struct MaskLayer *masklay, short mode);
void mirror_masklayer_frames(struct MaskLayer *masklay, short mode);
void snap_masklayer_frames(struct MaskLayer *masklay, short mode);
void mirror_masklayer_frames(struct MaskLayer *masklay, short mode);
#endif
#endif /* __ED_MASK_H__ */

20
source/blender/editors/mask/mask_editaction.c
View File

@@ -59,7 +59,7 @@
/* Generics - Loopers */
/* Loops over the gp-frames for a gp-layer, and applies the given callback */
short masklayer_frames_looper(MaskLayer *masklay, Scene *scene, short (*masklay_shape_cb)(MaskLayerShape *, Scene *))
short ED_masklayer_frames_looper(MaskLayer *masklay, Scene *scene, short (*masklay_shape_cb)(MaskLayerShape *, Scene *))
{
MaskLayerShape *masklay_shape;
@@ -82,7 +82,7 @@ short masklayer_frames_looper(MaskLayer *masklay, Scene *scene, short (*masklay_
/* Data Conversion Tools */
/* make a listing all the gp-frames in a layer as cfraelems */
void masklayer_make_cfra_list(MaskLayer *masklay, ListBase *elems, short onlysel)
void ED_masklayer_make_cfra_list(MaskLayer *masklay, ListBase *elems, short onlysel)
{
MaskLayerShape *masklay_shape;
CfraElem *ce;
@@ -108,7 +108,7 @@ void masklayer_make_cfra_list(MaskLayer *masklay, ListBase *elems, short onlysel
/* Selection Tools */
/* check if one of the frames in this layer is selected */
short is_masklayer_frame_selected(MaskLayer *masklay)
short ED_masklayer_frame_select_check(MaskLayer *masklay)
{
MaskLayerShape *masklay_shape;
@@ -146,7 +146,7 @@ static void masklayshape_select(MaskLayerShape *masklay_shape, short select_mode
}
/* set all/none/invert select (like above, but with SELECT_* modes) */
void select_mask_frames(MaskLayer *masklay, short select_mode)
void ED_mask_select_frames(MaskLayer *masklay, short select_mode)
{
MaskLayerShape *masklay_shape;
@@ -161,18 +161,18 @@ void select_mask_frames(MaskLayer *masklay, short select_mode)
}
/* set all/none/invert select */
void set_masklayer_frame_selection(MaskLayer *masklay, short mode)
void ED_masklayer_frame_select_set(MaskLayer *masklay, short mode)
{
/* error checking */
if (masklay == NULL)
return;
/* now call the standard function */
select_mask_frames(masklay, mode);
ED_mask_select_frames(masklay, mode);
}
/* select the frame in this layer that occurs on this frame (there should only be one at most) */
void select_mask_frame(MaskLayer *masklay, int selx, short select_mode)
void ED_mask_select_frame(MaskLayer *masklay, int selx, short select_mode)
{
MaskLayerShape *masklay_shape;
@@ -190,7 +190,7 @@ void select_mask_frame(MaskLayer *masklay, int selx, short select_mode)
}
/* select the frames in this layer that occur within the bounds specified */
void borderselect_masklayer_frames(MaskLayer *masklay, float min, float max, short select_mode)
void ED_masklayer_frames_select_border(MaskLayer *masklay, float min, float max, short select_mode)
{
MaskLayerShape *masklay_shape;
@@ -208,7 +208,7 @@ void borderselect_masklayer_frames(MaskLayer *masklay, float min, float max, sho
/* Frame Editing Tools */
/* Delete selected frames */
void delete_masklayer_frames(MaskLayer *masklay)
void ED_masklayer_frames_delete(MaskLayer *masklay)
{
MaskLayerShape *masklay_shape, *masklay_shape_next;
@@ -226,7 +226,7 @@ void delete_masklayer_frames(MaskLayer *masklay)
}
/* Duplicate selected frames from given gp-layer */
void duplicate_masklayer_frames(MaskLayer *masklay)
void ED_masklayer_frames_duplicate(MaskLayer *masklay)
{
MaskLayerShape *masklay_shape, *gpfn;

8
source/blender/editors/space_action/action_edit.c
View File

@@ -702,9 +702,9 @@ static void duplicate_action_keys(bAnimContext *ac)
if (ale->type == ANIMTYPE_FCURVE)
duplicate_fcurve_keys((FCurve *)ale->key_data);
else if (ale->type == ANIMTYPE_GPLAYER)
duplicate_gplayer_frames((bGPDlayer *)ale->data);
ED_gplayer_frames_duplicate((bGPDlayer *)ale->data);
else if (ale->type == ANIMTYPE_MASKLAYER)
duplicate_masklayer_frames((MaskLayer *)ale->data);
ED_masklayer_frames_duplicate((MaskLayer *)ale->data);
else
BLI_assert(0);
}
@@ -777,10 +777,10 @@ static void delete_action_keys(bAnimContext *ac)
/* loop through filtered data and delete selected keys */
for (ale = anim_data.first; ale; ale = ale->next) {
if (ale->type == ANIMTYPE_GPLAYER) {
delete_gplayer_frames((bGPDlayer *)ale->data);
ED_gplayer_frames_delete((bGPDlayer *)ale->data);
}
else if (ale->type == ANIMTYPE_MASKLAYER) {
delete_masklayer_frames((MaskLayer *)ale->data);
ED_masklayer_frames_delete((MaskLayer *)ale->data);
}
else {
FCurve *fcu = (FCurve *)ale->key_data;

34
source/blender/editors/space_action/action_select.c
View File

@@ -109,13 +109,13 @@ static void deselect_action_keys(bAnimContext *ac, short test, short sel)
if (test) {
for (ale = anim_data.first; ale; ale = ale->next) {
if (ale->type == ANIMTYPE_GPLAYER) {
if (is_gplayer_frame_selected(ale->data)) {
if (ED_gplayer_frame_select_check(ale->data)) {
sel = SELECT_SUBTRACT;
break;
}
}
else if (ale->type == ANIMTYPE_MASKLAYER) {
if (is_masklayer_frame_selected(ale->data)) {
if (ED_masklayer_frame_select_check(ale->data)) {
sel = SELECT_SUBTRACT;
break;
}
@@ -135,9 +135,9 @@ static void deselect_action_keys(bAnimContext *ac, short test, short sel)
/* Now set the flags */
for (ale = anim_data.first; ale; ale = ale->next) {
if (ale->type == ANIMTYPE_GPLAYER)
set_gplayer_frame_selection(ale->data, sel);
ED_gplayer_frame_select_set(ale->data, sel);
else if (ale->type == ANIMTYPE_MASKLAYER)
set_masklayer_frame_selection(ale->data, sel);
ED_masklayer_frame_select_set(ale->data, sel);
else
ANIM_fcurve_keyframes_loop(&ked, ale->key_data, NULL, sel_cb, NULL);
}
@@ -259,9 +259,9 @@ static void borderselect_action(bAnimContext *ac, rcti rect, short mode, short s
{
/* loop over data selecting */
if (ale->type == ANIMTYPE_GPLAYER)
borderselect_gplayer_frames(ale->data, rectf.xmin, rectf.xmax, selectmode);
ED_gplayer_frames_select_border(ale->data, rectf.xmin, rectf.xmax, selectmode);
else if (ale->type == ANIMTYPE_MASKLAYER)
borderselect_masklayer_frames(ale->data, rectf.xmin, rectf.xmax, selectmode);
ED_masklayer_frames_select_border(ale->data, rectf.xmin, rectf.xmax, selectmode);
else
ANIM_animchannel_keyframes_loop(&ked, ac->ads, ale, ok_cb, select_cb, NULL);
}
@@ -410,10 +410,10 @@ static void markers_selectkeys_between(bAnimContext *ac)
ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 1, 1);
}
else if (ale->type == ANIMTYPE_GPLAYER) {
borderselect_gplayer_frames(ale->data, min, max, SELECT_ADD);
ED_gplayer_frames_select_border(ale->data, min, max, SELECT_ADD);
}
else if (ale->type == ANIMTYPE_MASKLAYER) {
borderselect_masklayer_frames(ale->data, min, max, SELECT_ADD);
ED_masklayer_frames_select_border(ale->data, min, max, SELECT_ADD);
}
else {
ANIM_fcurve_keyframes_loop(&ked, ale->key_data, ok_cb, select_cb, NULL);
@@ -447,7 +447,7 @@ static void columnselect_action_keys(bAnimContext *ac, short mode)
ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
for (ale = anim_data.first; ale; ale = ale->next)
gplayer_make_cfra_list(ale->data, &ked.list, 1);
ED_gplayer_make_cfra_list(ale->data, &ked.list, 1);
}
else {
filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE /*| ANIMFILTER_CURVESONLY*/);
@@ -503,9 +503,9 @@ static void columnselect_action_keys(bAnimContext *ac, short mode)
/* select elements with frame number matching cfraelem */
if (ale->type == ANIMTYPE_GPLAYER)
select_gpencil_frame(ale->data, ce->cfra, SELECT_ADD);
ED_gpencil_select_frame(ale->data, ce->cfra, SELECT_ADD);
else if (ale->type == ANIMTYPE_MASKLAYER)
select_mask_frame(ale->data, ce->cfra, SELECT_ADD);
ED_mask_select_frame(ale->data, ce->cfra, SELECT_ADD);
else
ANIM_fcurve_keyframes_loop(&ked, ale->key_data, ok_cb, select_cb, NULL);
}
@@ -788,9 +788,9 @@ static void actkeys_select_leftright(bAnimContext *ac, short leftright, short se
ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 1, 1);
}
else if (ale->type == ANIMTYPE_GPLAYER)
borderselect_gplayer_frames(ale->data, ked.f1, ked.f2, select_mode);
ED_gplayer_frames_select_border(ale->data, ked.f1, ked.f2, select_mode);
else if (ale->type == ANIMTYPE_MASKLAYER)
borderselect_masklayer_frames(ale->data, ked.f1, ked.f2, select_mode);
ED_masklayer_frames_select_border(ale->data, ked.f1, ked.f2, select_mode);
else
ANIM_fcurve_keyframes_loop(&ked, ale->key_data, ok_cb, select_cb, NULL);
}
@@ -927,9 +927,9 @@ static void actkeys_mselect_single(bAnimContext *ac, bAnimListElem *ale, short s
/* select the nominated keyframe on the given frame */
if (ale->type == ANIMTYPE_GPLAYER)
select_gpencil_frame(ale->data, selx, select_mode);
ED_gpencil_select_frame(ale->data, selx, select_mode);
else if (ale->type == ANIMTYPE_MASKLAYER)
select_mask_frame(ale->data, selx, select_mode);
ED_mask_select_frame(ale->data, selx, select_mode);
else
ANIM_animchannel_keyframes_loop(&ked, ac->ads, ale, ok_cb, select_cb, NULL);
}
@@ -971,9 +971,9 @@ static void actkeys_mselect_column(bAnimContext *ac, short select_mode, float se
/* select elements with frame number matching cfra */
if (ale->type == ANIMTYPE_GPLAYER)
select_gpencil_frame(ale->key_data, selx, select_mode);
ED_gpencil_select_frame(ale->key_data, selx, select_mode);
else if (ale->type == ANIMTYPE_MASKLAYER)
select_mask_frame(ale->key_data, selx, select_mode);
ED_mask_select_frame(ale->key_data, selx, select_mode);
else
ANIM_fcurve_keyframes_loop(&ked, ale->key_data, ok_cb, select_cb, NULL);
}