diff options
Diffstat (limited to 'source/blender/editors/transform/transform_conversions.c')
-rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 254 |
1 files changed, 250 insertions, 4 deletions
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 6de854ff6c9..0a6f49f7c9f 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -51,6 +51,7 @@ #include "DNA_scene_types.h" #include "DNA_meshdata_types.h" #include "DNA_gpencil_types.h" +#include "DNA_movieclip_types.h" #include "MEM_guardedalloc.h" @@ -74,6 +75,9 @@ #include "BKE_bmesh.h" #include "BKE_scene.h" #include "BKE_report.h" +#include "BKE_tracking.h" +#include "BKE_movieclip.h" +#include "BKE_node.h" #include "ED_anim_api.h" @@ -88,8 +92,12 @@ #include "ED_node.h" #include "ED_types.h" #include "ED_uvedit.h" +#include "ED_clip.h" #include "ED_util.h" /* for crazyspace correction */ +#include "WM_api.h" /* for WM_event_add_notifier to deal with stabilization nodes */ +#include "WM_types.h" + #include "UI_view2d.h" #include "BLI_math.h" @@ -2960,8 +2968,8 @@ static TransData *ActionFCurveToTransData(TransData *td, TransData2D **td2dv, FC td2d->h1 = bezt->vec[0]; td2d->h2 = bezt->vec[2]; - VECCOPY2D(td2d->ih1, td2d->h1); - VECCOPY2D(td2d->ih2, td2d->h2); + copy_v2_v2(td2d->ih1, td2d->h1); + copy_v2_v2(td2d->ih2, td2d->h2); td++; td2d++; @@ -3217,14 +3225,14 @@ static void bezt_to_transdata (TransData *td, TransData2D *td2d, AnimData *adt, if (td->flag & TD_MOVEHANDLE1) { td2d->h1 = bezt->vec[0]; - VECCOPY2D(td2d->ih1, td2d->h1); + copy_v2_v2(td2d->ih1, td2d->h1); } else td2d->h1 = NULL; if (td->flag & TD_MOVEHANDLE2) { td2d->h2 = bezt->vec[2]; - VECCOPY2D(td2d->ih2, td2d->h2); + copy_v2_v2(td2d->ih2, td2d->h2); } else td2d->h2 = NULL; @@ -4796,6 +4804,17 @@ void special_aftertrans_update(bContext *C, TransInfo *t) /* clear link line */ ED_node_link_intersect_test(t->sa, 0); } + else if (t->spacetype == SPACE_CLIP) { + SpaceClip *sc= t->sa->spacedata.first; + MovieClip *clip= ED_space_clip(sc); + + if(t->scene->nodetree) { + /* tracks can be used for stabilization nodes, + flush update for such nodes */ + nodeUpdateID(t->scene->nodetree, &clip->id); + WM_event_add_notifier(C, NC_SCENE|ND_NODES, NULL); + } + } else if (t->spacetype == SPACE_ACTION) { SpaceAction *saction= (SpaceAction *)t->sa->spacedata.first; bAnimContext ac; @@ -5264,6 +5283,229 @@ static void createTransNodeData(bContext *C, TransInfo *t) CTX_DATA_END } +/* *** CLIP EDITOR *** */ + +typedef struct TransDataTracking { + int area; + float *relative, *loc; + float soffset[2], srelative[2]; + float offset[2]; + + float (*smarkers)[2]; + int markersnr; + MovieTrackingMarker *markers; +} TransDataTracking; + +static void markerToTransDataInit(TransData *td, TransData2D *td2d, + TransDataTracking *tdt, MovieTrackingTrack *track, int area, float *loc, float *rel, float *off) +{ + int anchor = area==TRACK_AREA_POINT && off; + + if(anchor) { + td2d->loc[0] = rel[0]; /* hold original location */ + td2d->loc[1] = rel[1]; + + tdt->loc= loc; + td2d->loc2d = loc; /* current location */ + } else { + td2d->loc[0] = loc[0]; /* hold original location */ + td2d->loc[1] = loc[1]; + + td2d->loc2d = loc; /* current location */ + } + td2d->loc[2] = 0.0f; + + tdt->relative= rel; + tdt->area= area; + + tdt->markersnr= track->markersnr; + tdt->markers= track->markers; + + if(rel) { + if(!anchor) { + td2d->loc[0]+= rel[0]; + td2d->loc[1]+= rel[1]; + } + + copy_v2_v2(tdt->srelative, rel); + } + + if(off) + copy_v2_v2(tdt->soffset, off); + + td->flag = 0; + td->loc = td2d->loc; + VECCOPY(td->center, td->loc); + VECCOPY(td->iloc, td->loc); + + memset(td->axismtx, 0, sizeof(td->axismtx)); + td->axismtx[2][2] = 1.0f; + + td->ext= NULL; td->val= NULL; + + td->flag |= TD_SELECTED; + td->dist= 0.0; + + unit_m3(td->mtx); + unit_m3(td->smtx); +} + +static void trackToTransData(SpaceClip *sc, TransData *td, TransData2D *td2d, + TransDataTracking *tdt, MovieTrackingTrack *track) +{ + MovieTrackingMarker *marker= BKE_tracking_ensure_marker(track, sc->user.framenr); + + track->transflag= marker->flag; + + marker->flag&= ~(MARKER_DISABLED|MARKER_TRACKED); + + markerToTransDataInit(td++, td2d++, tdt++, track, TRACK_AREA_POINT, track->offset, marker->pos, track->offset); + + if(track->flag&SELECT) + markerToTransDataInit(td++, td2d++, tdt++, track, TRACK_AREA_POINT, marker->pos, NULL, NULL); + + if(track->pat_flag&SELECT) { + markerToTransDataInit(td++, td2d++, tdt++, track, TRACK_AREA_PAT, track->pat_min, marker->pos, NULL); + markerToTransDataInit(td++, td2d++, tdt++, track, TRACK_AREA_PAT, track->pat_max, marker->pos, NULL); + } + + if(track->search_flag&SELECT) { + markerToTransDataInit(td++, td2d++, tdt++, track, TRACK_AREA_SEARCH, track->search_min, marker->pos, NULL); + markerToTransDataInit(td++, td2d++, tdt++, track, TRACK_AREA_SEARCH, track->search_max, marker->pos, NULL); + } +} + +static void transDataTrackingFree(TransInfo *t) +{ + TransDataTracking *tdt= t->customData; + + if(tdt) { + if(tdt->smarkers) MEM_freeN(tdt->smarkers); + MEM_freeN(tdt); + } +} + +static void createTransTrackingData(bContext *C, TransInfo *t) +{ + TransData *td; + TransData2D *td2d; + SpaceClip *sc = CTX_wm_space_clip(C); + MovieClip *clip = ED_space_clip(sc); + MovieTrackingTrack *track; + MovieTrackingMarker *marker; + TransDataTracking *tdt; + int framenr = sc->user.framenr; + + if(clip && !BKE_movieclip_has_frame(clip, &sc->user)) { + t->total = 0; + return; + } + + /* count */ + t->total = 0; + + track = clip->tracking.tracks.first; + while(track) { + if(TRACK_VIEW_SELECTED(sc, track) && (track->flag&TRACK_LOCKED)==0) { + marker= BKE_tracking_get_marker(track, framenr); + + if(marker) { + t->total++; /* offset */ + + if(track->flag&SELECT) t->total++; + if(track->pat_flag&SELECT) t->total+= 2; + if(track->search_flag&SELECT) t->total+= 2; + } + } + + track = track->next; + } + + if(t->total==0) + return; + + td = t->data = MEM_callocN(t->total*sizeof(TransData), "TransTracking TransData"); + td2d = t->data2d = MEM_callocN(t->total*sizeof(TransData2D), "TransTracking TransData2D"); + tdt = t->customData = MEM_callocN(t->total*sizeof(TransDataTracking), "TransTracking TransDataTracking"); + + t->customFree= transDataTrackingFree; + + /* create actual data */ + track = clip->tracking.tracks.first; + while(track) { + if(TRACK_VIEW_SELECTED(sc, track) && (track->flag&TRACK_LOCKED)==0) { + marker= BKE_tracking_get_marker(track, framenr); + + trackToTransData(sc, td, td2d, tdt, track); + + /* offset */ + td++; + td2d++; + tdt++; + + if((marker->flag&MARKER_DISABLED)==0) { + if(track->flag&SELECT) {td++; td2d++; tdt++;} + if(track->pat_flag&SELECT) {td+= 2; td2d+= 2;tdt+=2;} + } + + if(track->search_flag&SELECT) { + td+= 2; + td2d+= 2; + tdt+= 2; + + if(marker->flag&MARKER_DISABLED) { + td+= 3; + td2d+= 3; + tdt+= 3; + }; + } + } + + track = track->next; + } +} + +void flushTransTracking(TransInfo *t) +{ + TransData *td; + TransData2D *td2d; + TransDataTracking *tdt; + int a; + + /* flush to 2d vector from internally used 3d vector */ + for(a=0, td= t->data, td2d= t->data2d, tdt= t->customData; a<t->total; a++, td2d++, td++, tdt++) { + if(t->flag&T_ALT_TRANSFORM) { + if(tdt->area==TRACK_AREA_POINT && tdt->relative) { + float d[2], d2[2]; + + if(!tdt->smarkers) { + tdt->smarkers= MEM_callocN(sizeof(*tdt->smarkers)*tdt->markersnr, "flushTransTracking markers"); + for(a= 0; a<tdt->markersnr; a++) + copy_v2_v2(tdt->smarkers[a], tdt->markers[a].pos); + } + + sub_v2_v2v2(d, td2d->loc, tdt->soffset); + sub_v2_v2(d, tdt->srelative); + + sub_v2_v2v2(d2, td2d->loc, tdt->srelative); + + for(a= 0; a<tdt->markersnr; a++) + add_v2_v2v2(tdt->markers[a].pos, tdt->smarkers[a], d2); + + negate_v2_v2(td2d->loc2d, d); + } + } + + if(tdt->area!=TRACK_AREA_POINT || tdt->relative==0) { + td2d->loc2d[0] = td2d->loc[0]; + td2d->loc2d[1] = td2d->loc[1]; + + if(tdt->relative) + sub_v2_v2(td2d->loc2d, tdt->relative); + } + } +} + void createTransData(bContext *C, TransInfo *t) { Scene *scene = t->scene; @@ -5329,6 +5571,10 @@ void createTransData(bContext *C, TransInfo *t) sort_trans_data_dist(t); } } + else if (t->spacetype == SPACE_CLIP) { + t->flag |= T_POINTS|T_2D_EDIT; + createTransTrackingData(C, t); + } else if (t->obedit) { t->ext = NULL; if (t->obedit->type == OB_MESH) { |