blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

GP: Primitive: Add RMB behaviour to Grab/Move

This commit is contained in:
Charlie Jolly 2018-12-19 10:17:14 +00:00
parent 76d04f9514
commit ac8cde69f5
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/editors/gpencil/gpencil_intern.h
View File

@ -162,6 +162,7 @@ typedef struct tGPDprimitive {
int point_count; /* number of edges allocated */
int tot_stored_edges; /* stored number of polygon edges */
int tot_edges; /* number of polygon edges */
float move[2]; /* move distance */
float origin[2]; /* initial box corner */
float start[2]; /* first box corner */
float end[2]; /* last box corner */

24
source/blender/editors/gpencil/gpencil_primitive.c
View File

@ -1302,10 +1302,19 @@ static void gpencil_primitive_edit_event_handling(bContext *C, wmOperator *op, w
}
/* move */
static void gpencil_primitive_move(tGPDprimitive *tgpi)
static void gpencil_primitive_move(tGPDprimitive *tgpi, bool reset)
{
float move[2];
sub_v2_v2v2(move, tgpi->mval, tgpi->mvalo);
zero_v2(move);
if (reset) {
sub_v2_v2(move, tgpi->move);
zero_v2(tgpi->move);
}
else {
sub_v2_v2v2(move, tgpi->mval, tgpi->mvalo);
add_v2_v2(tgpi->move, move);
}
bGPDstroke *gps = tgpi->gpf->strokes.first;
tGPspoint *points2D = tgpi->points;
@ -1335,14 +1344,21 @@ static int gpencil_primitive_modal(bContext *C, wmOperator *op, const wmEvent *e
switch (event->type) {
case MOUSEMOVE:
gpencil_primitive_move(tgpi);
gpencil_primitive_move(tgpi, false);
gpencil_primitive_update(C, op, tgpi);
break;
case ESCKEY:
case RIGHTMOUSE:
case LEFTMOUSE:
zero_v2(tgpi->move);
tgpi->flag = IN_CURVE_EDIT;
break;
case RIGHTMOUSE:
if (event->val == KM_RELEASE) {
tgpi->flag = IN_CURVE_EDIT;
gpencil_primitive_move(tgpi, true);
gpencil_primitive_update(C, op, tgpi);
}
break;
}
copy_v2_v2(tgpi->mvalo, tgpi->mval);
return OPERATOR_RUNNING_MODAL;