diff options
Diffstat (limited to 'source/blender/editors/mask/mask_shapekey.c')
| -rw-r--r-- | source/blender/editors/mask/mask_shapekey.c | 663 |
1 files changed, 327 insertions, 336 deletions
diff --git a/source/blender/editors/mask/mask_shapekey.c b/source/blender/editors/mask/mask_shapekey.c index 7d33d13cbd3..edc22943124 100644 --- a/source/blender/editors/mask/mask_shapekey.c +++ b/source/blender/editors/mask/mask_shapekey.c @@ -42,193 +42,190 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_mask.h" /* own include */ +#include "ED_mask.h" /* own include */ -#include "mask_intern.h" /* own include */ +#include "mask_intern.h" /* own include */ static int mask_shape_key_insert_exec(bContext *C, wmOperator *UNUSED(op)) { - Scene *scene = CTX_data_scene(C); - const int frame = CFRA; - Mask *mask = CTX_data_edit_mask(C); - MaskLayer *masklay; - bool changed = false; - - for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) { - MaskLayerShape *masklay_shape; - - if (!ED_mask_layer_select_check(masklay)) { - continue; - } - - masklay_shape = BKE_mask_layer_shape_verify_frame(masklay, frame); - BKE_mask_layer_shape_from_mask(masklay, masklay_shape); - changed = true; - } - - if (changed) { - WM_event_add_notifier(C, NC_MASK | ND_DATA, mask); - DEG_id_tag_update(&mask->id, 0); - - return OPERATOR_FINISHED; - } - else { - return OPERATOR_CANCELLED; - } + Scene *scene = CTX_data_scene(C); + const int frame = CFRA; + Mask *mask = CTX_data_edit_mask(C); + MaskLayer *masklay; + bool changed = false; + + for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) { + MaskLayerShape *masklay_shape; + + if (!ED_mask_layer_select_check(masklay)) { + continue; + } + + masklay_shape = BKE_mask_layer_shape_verify_frame(masklay, frame); + BKE_mask_layer_shape_from_mask(masklay, masklay_shape); + changed = true; + } + + if (changed) { + WM_event_add_notifier(C, NC_MASK | ND_DATA, mask); + DEG_id_tag_update(&mask->id, 0); + + return OPERATOR_FINISHED; + } + else { + return OPERATOR_CANCELLED; + } } void MASK_OT_shape_key_insert(wmOperatorType *ot) { - /* identifiers */ - ot->name = "Insert Shape Key"; - ot->idname = "MASK_OT_shape_key_insert"; + /* identifiers */ + ot->name = "Insert Shape Key"; + ot->idname = "MASK_OT_shape_key_insert"; - /* api callbacks */ - ot->exec = mask_shape_key_insert_exec; - ot->poll = ED_maskedit_mask_poll; + /* api callbacks */ + ot->exec = mask_shape_key_insert_exec; + ot->poll = ED_maskedit_mask_poll; - /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; + /* flags */ + ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; } static int mask_shape_key_clear_exec(bContext *C, wmOperator *UNUSED(op)) { - Scene *scene = CTX_data_scene(C); - const int frame = CFRA; - Mask *mask = CTX_data_edit_mask(C); - MaskLayer *masklay; - bool changed = false; - - for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) { - MaskLayerShape *masklay_shape; - - if (!ED_mask_layer_select_check(masklay)) { - continue; - } - - masklay_shape = BKE_mask_layer_shape_find_frame(masklay, frame); - - if (masklay_shape) { - BKE_mask_layer_shape_unlink(masklay, masklay_shape); - changed = true; - } - } - - if (changed) { - WM_event_add_notifier(C, NC_MASK | ND_DATA, mask); - DEG_id_tag_update(&mask->id, ID_RECALC_GEOMETRY); - - return OPERATOR_FINISHED; - } - else { - return OPERATOR_CANCELLED; - } + Scene *scene = CTX_data_scene(C); + const int frame = CFRA; + Mask *mask = CTX_data_edit_mask(C); + MaskLayer *masklay; + bool changed = false; + + for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) { + MaskLayerShape *masklay_shape; + + if (!ED_mask_layer_select_check(masklay)) { + continue; + } + + masklay_shape = BKE_mask_layer_shape_find_frame(masklay, frame); + + if (masklay_shape) { + BKE_mask_layer_shape_unlink(masklay, masklay_shape); + changed = true; + } + } + + if (changed) { + WM_event_add_notifier(C, NC_MASK | ND_DATA, mask); + DEG_id_tag_update(&mask->id, ID_RECALC_GEOMETRY); + + return OPERATOR_FINISHED; + } + else { + return OPERATOR_CANCELLED; + } } void MASK_OT_shape_key_clear(wmOperatorType *ot) { - /* identifiers */ - ot->name = "Clear Shape Key"; - ot->idname = "MASK_OT_shape_key_clear"; + /* identifiers */ + ot->name = "Clear Shape Key"; + ot->idname = "MASK_OT_shape_key_clear"; - /* api callbacks */ - ot->exec = mask_shape_key_clear_exec; - ot->poll = ED_maskedit_mask_poll; + /* api callbacks */ + ot->exec = mask_shape_key_clear_exec; + ot->poll = ED_maskedit_mask_poll; - /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; + /* flags */ + ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; } static int mask_shape_key_feather_reset_exec(bContext *C, wmOperator *UNUSED(op)) { - Scene *scene = CTX_data_scene(C); - const int frame = CFRA; - Mask *mask = CTX_data_edit_mask(C); - MaskLayer *masklay; - bool changed = false; - - for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) { - - if (masklay->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) { - continue; - } - - if (masklay->splines_shapes.first) { - MaskLayerShape *masklay_shape_reset; - MaskLayerShape *masklay_shape; - - /* get the shapekey of the current state */ - masklay_shape_reset = BKE_mask_layer_shape_alloc(masklay, frame); - /* initialize from mask - as if inseting a keyframe */ - BKE_mask_layer_shape_from_mask(masklay, masklay_shape_reset); - - for (masklay_shape = masklay->splines_shapes.first; - masklay_shape; - masklay_shape = masklay_shape->next) - { - - if (masklay_shape_reset->tot_vert == masklay_shape->tot_vert) { - int i_abs = 0; - int i; - MaskSpline *spline; - MaskLayerShapeElem *shape_ele_src; - MaskLayerShapeElem *shape_ele_dst; - - shape_ele_src = (MaskLayerShapeElem *)masklay_shape_reset->data; - shape_ele_dst = (MaskLayerShapeElem *)masklay_shape->data; - - for (spline = masklay->splines.first; spline; spline = spline->next) { - for (i = 0; i < spline->tot_point; i++) { - MaskSplinePoint *point = &spline->points[i]; - - if (MASKPOINT_ISSEL_ANY(point)) { - /* TODO - nicer access here */ - shape_ele_dst->value[6] = shape_ele_src->value[6]; - } - - shape_ele_src++; - shape_ele_dst++; - - i_abs++; - } - } - - } - else { - // printf("%s: skipping\n", __func__); - } - - changed = true; - } - - BKE_mask_layer_shape_free(masklay_shape_reset); - } - } - - if (changed) { - WM_event_add_notifier(C, NC_MASK | ND_DATA, mask); - DEG_id_tag_update(&mask->id, 0); - - return OPERATOR_FINISHED; - } - else { - return OPERATOR_CANCELLED; - } + Scene *scene = CTX_data_scene(C); + const int frame = CFRA; + Mask *mask = CTX_data_edit_mask(C); + MaskLayer *masklay; + bool changed = false; + + for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) { + + if (masklay->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) { + continue; + } + + if (masklay->splines_shapes.first) { + MaskLayerShape *masklay_shape_reset; + MaskLayerShape *masklay_shape; + + /* get the shapekey of the current state */ + masklay_shape_reset = BKE_mask_layer_shape_alloc(masklay, frame); + /* initialize from mask - as if inseting a keyframe */ + BKE_mask_layer_shape_from_mask(masklay, masklay_shape_reset); + + for (masklay_shape = masklay->splines_shapes.first; masklay_shape; + masklay_shape = masklay_shape->next) { + + if (masklay_shape_reset->tot_vert == masklay_shape->tot_vert) { + int i_abs = 0; + int i; + MaskSpline *spline; + MaskLayerShapeElem *shape_ele_src; + MaskLayerShapeElem *shape_ele_dst; + + shape_ele_src = (MaskLayerShapeElem *)masklay_shape_reset->data; + shape_ele_dst = (MaskLayerShapeElem *)masklay_shape->data; + + for (spline = masklay->splines.first; spline; spline = spline->next) { + for (i = 0; i < spline->tot_point; i++) { + MaskSplinePoint *point = &spline->points[i]; + + if (MASKPOINT_ISSEL_ANY(point)) { + /* TODO - nicer access here */ + shape_ele_dst->value[6] = shape_ele_src->value[6]; + } + + shape_ele_src++; + shape_ele_dst++; + + i_abs++; + } + } + } + else { + // printf("%s: skipping\n", __func__); + } + + changed = true; + } + + BKE_mask_layer_shape_free(masklay_shape_reset); + } + } + + if (changed) { + WM_event_add_notifier(C, NC_MASK | ND_DATA, mask); + DEG_id_tag_update(&mask->id, 0); + + return OPERATOR_FINISHED; + } + else { + return OPERATOR_CANCELLED; + } } void MASK_OT_shape_key_feather_reset(wmOperatorType *ot) { - /* identifiers */ - ot->name = "Feather Reset Animation"; - ot->description = "Reset feather weights on all selected points animation values"; - ot->idname = "MASK_OT_shape_key_feather_reset"; + /* identifiers */ + ot->name = "Feather Reset Animation"; + ot->description = "Reset feather weights on all selected points animation values"; + ot->idname = "MASK_OT_shape_key_feather_reset"; - /* api callbacks */ - ot->exec = mask_shape_key_feather_reset_exec; - ot->poll = ED_maskedit_mask_poll; + /* api callbacks */ + ot->exec = mask_shape_key_feather_reset_exec; + ot->poll = ED_maskedit_mask_poll; - /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; + /* flags */ + ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; } /* @@ -241,208 +238,202 @@ void MASK_OT_shape_key_feather_reset(wmOperatorType *ot) */ static int mask_shape_key_rekey_exec(bContext *C, wmOperator *op) { - Scene *scene = CTX_data_scene(C); - const int frame = CFRA; - Mask *mask = CTX_data_edit_mask(C); - MaskLayer *masklay; - bool changed = false; - - const bool do_feather = RNA_boolean_get(op->ptr, "feather"); - const bool do_location = RNA_boolean_get(op->ptr, "location"); - - for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) { - - if (masklay->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) { - continue; - } - - /* we need at least one point selected here to bother re-interpolating */ - if (!ED_mask_layer_select_check(masklay)) { - continue; - } - - if (masklay->splines_shapes.first) { - MaskLayerShape *masklay_shape, *masklay_shape_next; - MaskLayerShape *masklay_shape_lastsel = NULL; - - for (masklay_shape = masklay->splines_shapes.first; - masklay_shape; - masklay_shape = masklay_shape_next) - { - MaskLayerShape *masklay_shape_a = NULL; - MaskLayerShape *masklay_shape_b = NULL; - - masklay_shape_next = masklay_shape->next; - - /* find contiguous selections */ - if (masklay_shape->flag & MASK_SHAPE_SELECT) { - if (masklay_shape_lastsel == NULL) { - masklay_shape_lastsel = masklay_shape; - } - if ((masklay_shape->next == NULL) || - (((MaskLayerShape *)masklay_shape->next)->flag & MASK_SHAPE_SELECT) == 0) - { - masklay_shape_a = masklay_shape_lastsel; - masklay_shape_b = masklay_shape; - masklay_shape_lastsel = NULL; - - /* this will be freed below, step over selection */ - masklay_shape_next = masklay_shape->next; - } - } - - /* we have a from<>to? - re-interpolate! */ - if (masklay_shape_a && masklay_shape_b) { - ListBase shapes_tmp = {NULL, NULL}; - MaskLayerShape *masklay_shape_tmp; - MaskLayerShape *masklay_shape_tmp_next; - MaskLayerShape *masklay_shape_tmp_last = masklay_shape_b->next; - MaskLayerShape *masklay_shape_tmp_rekey; - - /* move keys */ - for (masklay_shape_tmp = masklay_shape_a; - masklay_shape_tmp && (masklay_shape_tmp != masklay_shape_tmp_last); - masklay_shape_tmp = masklay_shape_tmp_next) - { - masklay_shape_tmp_next = masklay_shape_tmp->next; - BLI_remlink(&masklay->splines_shapes, masklay_shape_tmp); - BLI_addtail(&shapes_tmp, masklay_shape_tmp); - } - - /* re-key, note: cant modify the keys here since it messes uop */ - for (masklay_shape_tmp = shapes_tmp.first; - masklay_shape_tmp; - masklay_shape_tmp = masklay_shape_tmp->next) - { - BKE_mask_layer_evaluate(masklay, masklay_shape_tmp->frame, true); - masklay_shape_tmp_rekey = BKE_mask_layer_shape_verify_frame(masklay, masklay_shape_tmp->frame); - BKE_mask_layer_shape_from_mask(masklay, masklay_shape_tmp_rekey); - masklay_shape_tmp_rekey->flag = masklay_shape_tmp->flag & MASK_SHAPE_SELECT; - } - - /* restore unselected points and free copies */ - for (masklay_shape_tmp = shapes_tmp.first; - masklay_shape_tmp; - masklay_shape_tmp = masklay_shape_tmp_next) - { - /* restore */ - int i_abs = 0; - int i; - MaskSpline *spline; - MaskLayerShapeElem *shape_ele_src; - MaskLayerShapeElem *shape_ele_dst; - - masklay_shape_tmp_next = masklay_shape_tmp->next; - - /* we know this exists, added above */ - masklay_shape_tmp_rekey = BKE_mask_layer_shape_find_frame(masklay, masklay_shape_tmp->frame); - - shape_ele_src = (MaskLayerShapeElem *)masklay_shape_tmp->data; - shape_ele_dst = (MaskLayerShapeElem *)masklay_shape_tmp_rekey->data; - - for (spline = masklay->splines.first; spline; spline = spline->next) { - for (i = 0; i < spline->tot_point; i++) { - MaskSplinePoint *point = &spline->points[i]; - - /* not especially efficient but makes this easier to follow */ - SWAP(MaskLayerShapeElem, *shape_ele_src, *shape_ele_dst); - - if (MASKPOINT_ISSEL_ANY(point)) { - if (do_location) { - memcpy(shape_ele_dst->value, shape_ele_src->value, sizeof(float) * 6); - } - if (do_feather) { - shape_ele_dst->value[6] = shape_ele_src->value[6]; - } - } - - shape_ele_src++; - shape_ele_dst++; - - i_abs++; - } - } - - BKE_mask_layer_shape_free(masklay_shape_tmp); - } - - changed = true; - } - } - - /* re-evaluate */ - BKE_mask_layer_evaluate(masklay, frame, true); - } - } - - if (changed) { - WM_event_add_notifier(C, NC_MASK | ND_DATA, mask); - DEG_id_tag_update(&mask->id, 0); - - return OPERATOR_FINISHED; - } - else { - return OPERATOR_CANCELLED; - } + Scene *scene = CTX_data_scene(C); + const int frame = CFRA; + Mask *mask = CTX_data_edit_mask(C); + MaskLayer *masklay; + bool changed = false; + + const bool do_feather = RNA_boolean_get(op->ptr, "feather"); + const bool do_location = RNA_boolean_get(op->ptr, "location"); + + for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) { + + if (masklay->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) { + continue; + } + + /* we need at least one point selected here to bother re-interpolating */ + if (!ED_mask_layer_select_check(masklay)) { + continue; + } + + if (masklay->splines_shapes.first) { + MaskLayerShape *masklay_shape, *masklay_shape_next; + MaskLayerShape *masklay_shape_lastsel = NULL; + + for (masklay_shape = masklay->splines_shapes.first; masklay_shape; + masklay_shape = masklay_shape_next) { + MaskLayerShape *masklay_shape_a = NULL; + MaskLayerShape *masklay_shape_b = NULL; + + masklay_shape_next = masklay_shape->next; + + /* find contiguous selections */ + if (masklay_shape->flag & MASK_SHAPE_SELECT) { + if (masklay_shape_lastsel == NULL) { + masklay_shape_lastsel = masklay_shape; + } + if ((masklay_shape->next == NULL) || + (((MaskLayerShape *)masklay_shape->next)->flag & MASK_SHAPE_SELECT) == 0) { + masklay_shape_a = masklay_shape_lastsel; + masklay_shape_b = masklay_shape; + masklay_shape_lastsel = NULL; + + /* this will be freed below, step over selection */ + masklay_shape_next = masklay_shape->next; + } + } + + /* we have a from<>to? - re-interpolate! */ + if (masklay_shape_a && masklay_shape_b) { + ListBase shapes_tmp = {NULL, NULL}; + MaskLayerShape *masklay_shape_tmp; + MaskLayerShape *masklay_shape_tmp_next; + MaskLayerShape *masklay_shape_tmp_last = masklay_shape_b->next; + MaskLayerShape *masklay_shape_tmp_rekey; + + /* move keys */ + for (masklay_shape_tmp = masklay_shape_a; + masklay_shape_tmp && (masklay_shape_tmp != masklay_shape_tmp_last); + masklay_shape_tmp = masklay_shape_tmp_next) { + masklay_shape_tmp_next = masklay_shape_tmp->next; + BLI_remlink(&masklay->splines_shapes, masklay_shape_tmp); + BLI_addtail(&shapes_tmp, masklay_shape_tmp); + } + + /* re-key, note: cant modify the keys here since it messes uop */ + for (masklay_shape_tmp = shapes_tmp.first; masklay_shape_tmp; + masklay_shape_tmp = masklay_shape_tmp->next) { + BKE_mask_layer_evaluate(masklay, masklay_shape_tmp->frame, true); + masklay_shape_tmp_rekey = BKE_mask_layer_shape_verify_frame(masklay, + masklay_shape_tmp->frame); + BKE_mask_layer_shape_from_mask(masklay, masklay_shape_tmp_rekey); + masklay_shape_tmp_rekey->flag = masklay_shape_tmp->flag & MASK_SHAPE_SELECT; + } + + /* restore unselected points and free copies */ + for (masklay_shape_tmp = shapes_tmp.first; masklay_shape_tmp; + masklay_shape_tmp = masklay_shape_tmp_next) { + /* restore */ + int i_abs = 0; + int i; + MaskSpline *spline; + MaskLayerShapeElem *shape_ele_src; + MaskLayerShapeElem *shape_ele_dst; + + masklay_shape_tmp_next = masklay_shape_tmp->next; + + /* we know this exists, added above */ + masklay_shape_tmp_rekey = BKE_mask_layer_shape_find_frame(masklay, + masklay_shape_tmp->frame); + + shape_ele_src = (MaskLayerShapeElem *)masklay_shape_tmp->data; + shape_ele_dst = (MaskLayerShapeElem *)masklay_shape_tmp_rekey->data; + + for (spline = masklay->splines.first; spline; spline = spline->next) { + for (i = 0; i < spline->tot_point; i++) { + MaskSplinePoint *point = &spline->points[i]; + + /* not especially efficient but makes this easier to follow */ + SWAP(MaskLayerShapeElem, *shape_ele_src, *shape_ele_dst); + + if (MASKPOINT_ISSEL_ANY(point)) { + if (do_location) { + memcpy(shape_ele_dst->value, shape_ele_src->value, sizeof(float) * 6); + } + if (do_feather) { + shape_ele_dst->value[6] = shape_ele_src->value[6]; + } + } + + shape_ele_src++; + shape_ele_dst++; + + i_abs++; + } + } + + BKE_mask_layer_shape_free(masklay_shape_tmp); + } + + changed = true; + } + } + + /* re-evaluate */ + BKE_mask_layer_evaluate(masklay, frame, true); + } + } + + if (changed) { + WM_event_add_notifier(C, NC_MASK | ND_DATA, mask); + DEG_id_tag_update(&mask->id, 0); + + return OPERATOR_FINISHED; + } + else { + return OPERATOR_CANCELLED; + } } void MASK_OT_shape_key_rekey(wmOperatorType *ot) { - /* identifiers */ - ot->name = "Re-Key Points of Selected Shapes"; - ot->description = "Recalculate animation data on selected points for frames selected in the dopesheet"; - ot->idname = "MASK_OT_shape_key_rekey"; - - /* api callbacks */ - ot->exec = mask_shape_key_rekey_exec; - ot->poll = ED_maskedit_mask_poll; - - /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; - - /* properties */ - RNA_def_boolean(ot->srna, "location", true, "Location", ""); - RNA_def_boolean(ot->srna, "feather", true, "Feather", ""); + /* identifiers */ + ot->name = "Re-Key Points of Selected Shapes"; + ot->description = + "Recalculate animation data on selected points for frames selected in the dopesheet"; + ot->idname = "MASK_OT_shape_key_rekey"; + + /* api callbacks */ + ot->exec = mask_shape_key_rekey_exec; + ot->poll = ED_maskedit_mask_poll; + + /* flags */ + ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; + + /* properties */ + RNA_def_boolean(ot->srna, "location", true, "Location", ""); + RNA_def_boolean(ot->srna, "feather", true, "Feather", ""); } - /* *** Shape Key Utils *** */ void ED_mask_layer_shape_auto_key(MaskLayer *masklay, const int frame) { - MaskLayerShape *masklay_shape; + MaskLayerShape *masklay_shape; - masklay_shape = BKE_mask_layer_shape_verify_frame(masklay, frame); - BKE_mask_layer_shape_from_mask(masklay, masklay_shape); + masklay_shape = BKE_mask_layer_shape_verify_frame(masklay, frame); + BKE_mask_layer_shape_from_mask(masklay, masklay_shape); } bool ED_mask_layer_shape_auto_key_all(Mask *mask, const int frame) { - MaskLayer *masklay; - bool changed = false; + MaskLayer *masklay; + bool changed = false; - for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) { - ED_mask_layer_shape_auto_key(masklay, frame); - changed = true; - } + for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) { + ED_mask_layer_shape_auto_key(masklay, frame); + changed = true; + } - return changed; + return changed; } bool ED_mask_layer_shape_auto_key_select(Mask *mask, const int frame) { - MaskLayer *masklay; - bool changed = false; + MaskLayer *masklay; + bool changed = false; - for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) { + for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) { - if (!ED_mask_layer_select_check(masklay)) { - continue; - } + if (!ED_mask_layer_select_check(masklay)) { + continue; + } - ED_mask_layer_shape_auto_key(masklay, frame); - changed = true; - } + ED_mask_layer_shape_auto_key(masklay, frame); + changed = true; + } - return changed; + return changed; } |