mask mode for clip editor developed by Sergey Sharybin, Pete Larabell and myself.

see:
http://wiki.blender.org/index.php/User:Nazg-gul/MaskEditor


note - mask editing tools need continued development, feather option is not working 100%

1 files changed, 97 insertions, 3 deletions

diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c
index a6fda200ff4..5e04d5c99cd 100644
--- a/source/blender/editors/space_clip/space_clip.c
+++ b/source/blender/editors/space_clip/space_clip.c
@@ -33,7 +33,9 @@
 #include <stdio.h>
 
 #include "DNA_scene_types.h"
+#include "DNA_mask_types.h"
 #include "DNA_movieclip_types.h"
+#include "DNA_view3d_types.h"	/* for pivot point */
 
 #include "MEM_guardedalloc.h"
 
@@ -49,6 +51,8 @@
 
 #include "IMB_imbuf_types.h"
 
+#include "ED_mask.h"
+#include "ED_space_api.h"
 #include "ED_screen.h"
 #include "ED_clip.h"
 #include "ED_transform.h"
@@ -237,6 +241,7 @@ static SpaceLink *clip_new(const bContext *C)
 	sc->zoom = 1.0f;
 	sc->path_length = 20;
 	sc->scopes.track_preview_height = 120;
+	sc->around = V3D_LOCAL;
 
 	/* header */
 	ar = MEM_callocN(sizeof(ARegion), "header for clip");
@@ -361,6 +366,24 @@ static void clip_listener(ScrArea *sa, wmNotifier *wmn)
 					break;
 			}
 			break;
+		case NC_MASK:
+			switch(wmn->data) {
+				case ND_SELECT:
+				case ND_DATA:
+				case ND_DRAW:
+					ED_area_tag_redraw(sa);
+					break;
+			}
+			switch(wmn->action) {
+				case NA_SELECTED:
+					clip_scopes_tag_refresh(sa);
+					ED_area_tag_redraw(sa);
+					break;
+				case NA_EDITED:
+					ED_area_tag_redraw(sa);
+					break;
+			}
+			break;
 		case NC_GEOM:
 			switch (wmn->data) {
 				case ND_SELECT:
@@ -532,7 +555,7 @@ static void clip_keymap(struct wmKeyConfig *keyconf)
 	/* ******** Hotkeys avalaible for main region only ******** */
 
 	keymap = WM_keymap_find(keyconf, "Clip Editor", SPACE_CLIP, 0);
-
+//	keymap->poll = ED_space_clip_tracking_poll;
 	/* ** View/navigation ** */
 
 	WM_keymap_add_item(keymap, "CLIP_OT_view_pan", MIDDLEMOUSE, KM_PRESS, 0, 0);
@@ -715,7 +738,7 @@ static void clip_keymap(struct wmKeyConfig *keyconf)
 	RNA_boolean_set(kmi->ptr, "extend", TRUE);	/* toggle */
 }
 
-const char *clip_context_dir[] = {"edit_movieclip", NULL};
+const char *clip_context_dir[] = {"edit_movieclip", "edit_mask", NULL};
 
 static int clip_context(const bContext *C, const char *member, bContextDataResult *result)
 {
@@ -729,7 +752,11 @@ static int clip_context(const bContext *C, const char *member, bContextDataResul
 	else if (CTX_data_equals(member, "edit_movieclip")) {
 		if (sc->clip)
 			CTX_data_id_pointer_set(result, &sc->clip->id);
-
+		return TRUE;
+	}
+	else if (CTX_data_equals(member, "edit_mask")) {
+		if (sc->mask)
+			CTX_data_id_pointer_set(result, &sc->mask->id);
 		return TRUE;
 	}
 
@@ -1020,6 +1047,9 @@ static void clip_main_area_init(wmWindowManager *wm, ARegion *ar)
 	UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_STANDARD, ar->winx, ar->winy);
 
 	/* own keymap */
+	keymap= WM_keymap_find(wm->defaultconf, "Mask Editor", 0, 0);
+	WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct);
+
 	keymap = WM_keymap_find(wm->defaultconf, "Clip", SPACE_CLIP, 0);
 	WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct);
 
@@ -1067,6 +1097,49 @@ static void clip_main_area_draw(const bContext *C, ARegion *ar)
 	/* Grease Pencil */
 	clip_draw_grease_pencil((bContext *)C, 1);
 
+	if(sc->mode == SC_MODE_MASKEDITING) {
+		int x, y;
+		int width, height;
+		float zoomx, zoomy, aspx, aspy;
+
+		/* frame image */
+		float maxdim;
+		float xofs, yofs;
+
+		/* find window pixel coordinates of origin */
+		UI_view2d_to_region_no_clip(&ar->v2d, 0.0f, 0.0f, &x, &y);
+
+		ED_space_clip_size(sc, &width, &height);
+		ED_space_clip_zoom(sc, ar, &zoomx, &zoomy);
+		ED_space_clip_aspect(sc, &aspx, &aspy);
+
+		/* frame the image */
+		maxdim = maxf(width, height);
+		if (width == height) {
+			xofs = yofs = 0;
+		}
+		else if (width < height) {
+			xofs = ((height - width) / -2.0f) * zoomx;
+			yofs = 0.0f;
+		}
+		else { /* (width > height) */
+			xofs = 0.0f;
+			yofs = ((width - height) / -2.0f) * zoomy;
+		}
+
+		/* apply transformation so mask editing tools will assume drawing from the origin in normalized space */
+		glPushMatrix();
+		glTranslatef(x + xofs, y + yofs, 0);
+		glScalef(maxdim * zoomx, maxdim * zoomy, 0);
+		glMultMatrixf(sc->stabmat);
+
+		ED_mask_draw((bContext *)C, sc->mask_draw_flag, sc->mask_draw_type);
+
+		ED_region_draw_cb_draw(C, ar, REGION_DRAW_POST_VIEW);
+
+		glPopMatrix();
+	}
+
 	/* reset view matrix */
 	UI_view2d_view_restore(C);
 
@@ -1241,6 +1314,26 @@ static void clip_header_area_draw(const bContext *C, ARegion *ar)
 	ED_region_header(C, ar);
 }
 
+static void clip_header_area_listener(ARegion *ar, wmNotifier *wmn)
+{
+	/* context changes */
+	switch (wmn->category) {
+		case NC_SCENE:
+			switch (wmn->data) {
+				/* for proportional editmode only */
+				case ND_TOOLSETTINGS:
+					/* TODO - should do this when in mask mode only but no datas available */
+					// if(sc->mode == SC_MODE_MASKEDITING)
+					{
+						ED_region_tag_redraw(ar);
+					}
+					break;
+			}
+			break;
+	}
+}
+
+
 /****************** tools region ******************/
 
 /* add handlers, stuff you only do once or on area/region changes */
@@ -1402,6 +1495,7 @@ void ED_spacetype_clip(void)
 
 	art->init = clip_header_area_init;
 	art->draw = clip_header_area_draw;
+	art->listener = clip_header_area_listener;
 
 	BLI_addhead(&st->regiontypes, art);