Page MenuHome
Differential D5343 Diff 16723 source/blender/editors/gpencil/annotate_paint.c

Changeset View

Standalone View

View Options

source/blender/editors/gpencil/annotate_paint.c

Show First 20 Lines • Show All 1,067 Lines • ▼ Show 20 Lines if (G.debug & G_DEBUG) {
printf("Error: No active view for painting\n"); printf("Error: No active view for painting\n");
} }
return 0; return 0;
} }
/* pass on current scene and window */ /* pass on current scene and window */
p->bmain = CTX_data_main(C); p->bmain = CTX_data_main(C);
p->scene = CTX_data_scene(C); p->scene = CTX_data_scene(C);
p->depsgraph = CTX_data_depsgraph(C); p->depsgraph = CTX_data_ensure_evaluated_depsgraph(C);
p->win = CTX_wm_window(C); p->win = CTX_wm_window(C);
unit_m4(p->imat); unit_m4(p->imat);
unit_m4(p->mat); unit_m4(p->mat);
switch (curarea->spacetype) { switch (curarea->spacetype) {
/* supported views first */ /* supported views first */
case SPACE_VIEW3D: { case SPACE_VIEW3D: {
▲ Show 20 Lines • Show All 540 Lines • ▼ Show 20 Linesstatic int gpencil_draw_init(bContext *C, wmOperator *op, const wmEvent *event)
p = op->customdata = gp_session_initpaint(C); p = op->customdata = gp_session_initpaint(C);
if ((p == NULL) || (p->status == GP_STATUS_ERROR)) { if ((p == NULL) || (p->status == GP_STATUS_ERROR)) {
/* something wasn't set correctly in context */ /* something wasn't set correctly in context */
gpencil_draw_exit(C, op); gpencil_draw_exit(C, op);
return 0; return 0;
} }
/* init painting data */ /* init painting data */
gp_paint_initstroke(p, paintmode, CTX_data_depsgraph(C)); gp_paint_initstroke(p, paintmode, CTX_data_ensure_evaluated_depsgraph(C));
if (p->status == GP_STATUS_ERROR) { if (p->status == GP_STATUS_ERROR) {
gpencil_draw_exit(C, op); gpencil_draw_exit(C, op);
return 0; return 0;
} }
if (event != NULL) { if (event != NULL) {
p->keymodifier = event->keymodifier; p->keymodifier = event->keymodifier;
} }
▲ Show 20 Lines • Show All 256 Lines • ▼ Show 20 Lines
} }
/* ------------------------------- */ /* ------------------------------- */
/* operator 'redo' (i.e. after changing some properties, but also for repeat last) */ /* operator 'redo' (i.e. after changing some properties, but also for repeat last) */
static int gpencil_draw_exec(bContext *C, wmOperator *op) static int gpencil_draw_exec(bContext *C, wmOperator *op)
{ {
tGPsdata *p = NULL; tGPsdata *p = NULL;
Depsgraph *depsgraph = CTX_data_depsgraph(C); Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C);
/* printf("GPencil - Starting Re-Drawing\n"); */ /* printf("GPencil - Starting Re-Drawing\n"); */
/* try to initialize context data needed while drawing */ /* try to initialize context data needed while drawing */
if (!gpencil_draw_init(C, op, NULL)) { if (!gpencil_draw_init(C, op, NULL)) {
if (op->customdata) { if (op->customdata) {
MEM_freeN(op->customdata); MEM_freeN(op->customdata);
} }
▲ Show 20 Lines • Show All 137 Lines • ▼ Show 20 Linesstatic int gpencil_draw_invoke(bContext *C, wmOperator *op, const wmEvent *event)
/* only start drawing immediately if we're allowed to do so... */ /* only start drawing immediately if we're allowed to do so... */
if (RNA_boolean_get(op->ptr, "wait_for_input") == false) { if (RNA_boolean_get(op->ptr, "wait_for_input") == false) {
/* hotkey invoked - start drawing */ /* hotkey invoked - start drawing */
/* printf("\tGP - set first spot\n"); */ /* printf("\tGP - set first spot\n"); */
p->status = GP_STATUS_PAINTING; p->status = GP_STATUS_PAINTING;
/* handle the initial drawing - i.e. for just doing a simple dot */ /* handle the initial drawing - i.e. for just doing a simple dot */
annotation_draw_apply_event(op, event, CTX_data_depsgraph(C), 0.0f, 0.0f); annotation_draw_apply_event(op, event, CTX_data_ensure_evaluated_depsgraph(C), 0.0f, 0.0f);
op->flag |= OP_IS_MODAL_CURSOR_REGION; op->flag |= OP_IS_MODAL_CURSOR_REGION;
} }
else { else {
/* toolbar invoked - don't start drawing yet... */ /* toolbar invoked - don't start drawing yet... */
/* printf("\tGP - hotkey invoked... waiting for click-drag\n"); */ /* printf("\tGP - hotkey invoked... waiting for click-drag\n"); */
op->flag |= OP_IS_MODAL_CURSOR_REGION; op->flag |= OP_IS_MODAL_CURSOR_REGION;
} }
Show All 24 Linesstatic tGPsdata *gpencil_stroke_begin(bContext *C, wmOperator *op)
/* printf("\t\tGP - start stroke\n"); */ /* printf("\t\tGP - start stroke\n"); */
/* we may need to set up paint env again if we're resuming */ /* we may need to set up paint env again if we're resuming */
/* XXX: watch it with the paintmode! in future, /* XXX: watch it with the paintmode! in future,
* it'd be nice to allow changing paint-mode when in sketching-sessions */ * it'd be nice to allow changing paint-mode when in sketching-sessions */
if (gp_session_initdata(C, p)) { if (gp_session_initdata(C, p)) {
gp_paint_initstroke(p, p->paintmode, CTX_data_depsgraph(C)); gp_paint_initstroke(p, p->paintmode, CTX_data_ensure_evaluated_depsgraph(C));
} }
if (p->status != GP_STATUS_ERROR) { if (p->status != GP_STATUS_ERROR) {
p->status = GP_STATUS_PAINTING; p->status = GP_STATUS_PAINTING;
op->flag &= ~OP_IS_MODAL_CURSOR_REGION; op->flag &= ~OP_IS_MODAL_CURSOR_REGION;
} }
return op->customdata; return op->customdata;
Show All 18 Lines
} }
/* add events for missing mouse movements when the artist draw very fast */ /* add events for missing mouse movements when the artist draw very fast */
static void annotation_add_missing_events(bContext *C, static void annotation_add_missing_events(bContext *C,
wmOperator *op, wmOperator *op,
const wmEvent *event, const wmEvent *event,
tGPsdata *p) tGPsdata *p)
{ {
Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C);
float pt[2], a[2], b[2]; float pt[2], a[2], b[2];
float factor = 10.0f; float factor = 10.0f;
copy_v2_v2(a, p->mvalo); copy_v2_v2(a, p->mvalo);
b[0] = (float)event->mval[0] + 1.0f; b[0] = (float)event->mval[0] + 1.0f;
b[1] = (float)event->mval[1] + 1.0f; b[1] = (float)event->mval[1] + 1.0f;
/* get distance in pixels */ /* get distance in pixels */
float dist = len_v2v2(a, b); float dist = len_v2v2(a, b);
/* for very small distances, add a half way point */ /* for very small distances, add a half way point */
if (dist <= 2.0f) { if (dist <= 2.0f) {
interp_v2_v2v2(pt, a, b, 0.5f); interp_v2_v2v2(pt, a, b, 0.5f);
sub_v2_v2v2(pt, b, pt); sub_v2_v2v2(pt, b, pt);
/* create fake event */ /* create fake event */
annotation_draw_apply_event(op, event, CTX_data_depsgraph(C), pt[0], pt[1]); annotation_draw_apply_event(op, event, depsgraph, pt[0], pt[1]);
} }
else if (dist >= factor) { else if (dist >= factor) {
int slices = 2 + (int)((dist - 1.0) / factor); int slices = 2 + (int)((dist - 1.0) / factor);
float n = 1.0f / slices; float n = 1.0f / slices;
for (int i = 1; i < slices; i++) { for (int i = 1; i < slices; i++) {
interp_v2_v2v2(pt, a, b, n * i); interp_v2_v2v2(pt, a, b, n * i);
sub_v2_v2v2(pt, b, pt); sub_v2_v2v2(pt, b, pt);
/* create fake event */ /* create fake event */
annotation_draw_apply_event(op, event, CTX_data_depsgraph(C), pt[0], pt[1]); annotation_draw_apply_event(op, event, depsgraph, pt[0], pt[1]);
} }
} }
} }
/* events handling during interactive drawing part of operator */ /* events handling during interactive drawing part of operator */
static int gpencil_draw_modal(bContext *C, wmOperator *op, const wmEvent *event) static int gpencil_draw_modal(bContext *C, wmOperator *op, const wmEvent *event)
{ {
tGPsdata *p = op->customdata; tGPsdata *p = op->customdata;
▲ Show 20 Lines • Show All 213 Lines • ▼ Show 20 Linesstatic int gpencil_draw_modal(bContext *C, wmOperator *op, const wmEvent *event)
if (p->status == GP_STATUS_PAINTING) { if (p->status == GP_STATUS_PAINTING) {
/* handle painting mouse-movements? */ /* handle painting mouse-movements? */
if (ELEM(event->type, MOUSEMOVE, INBETWEEN_MOUSEMOVE) || (p->flags & GP_PAINTFLAG_FIRSTRUN)) { if (ELEM(event->type, MOUSEMOVE, INBETWEEN_MOUSEMOVE) || (p->flags & GP_PAINTFLAG_FIRSTRUN)) {
/* handle drawing event */ /* handle drawing event */
if ((p->flags & GP_PAINTFLAG_FIRSTRUN) == 0) { if ((p->flags & GP_PAINTFLAG_FIRSTRUN) == 0) {
annotation_add_missing_events(C, op, event, p); annotation_add_missing_events(C, op, event, p);
} }
annotation_draw_apply_event(op, event, CTX_data_depsgraph(C), 0.0f, 0.0f); /* TODO(sergey): Possibly evaluating dependency graph from modal operator? */
annotation_draw_apply_event(op, event, CTX_data_ensure_evaluated_depsgraph(C), 0.0f, 0.0f);
/* finish painting operation if anything went wrong just now */ /* finish painting operation if anything went wrong just now */
if (p->status == GP_STATUS_ERROR) { if (p->status == GP_STATUS_ERROR) {
printf("\t\t\t\tGP - add error done!\n"); printf("\t\t\t\tGP - add error done!\n");
estate = OPERATOR_CANCELLED; estate = OPERATOR_CANCELLED;
} }
else { else {
/* event handled, so just tag as running modal */ /* event handled, so just tag as running modal */
▲ Show 20 Lines • Show All 134 Lines • Show Last 20 Lines