Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/editors/space_clip/clip_draw.c')
-rw-r--r--source/blender/editors/space_clip/clip_draw.c430
1 files changed, 223 insertions, 207 deletions
diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c
index 920b8dc3ccb..ef83a62c290 100644
--- a/source/blender/editors/space_clip/clip_draw.c
+++ b/source/blender/editors/space_clip/clip_draw.c
@@ -107,10 +107,10 @@ static void draw_movieclip_cache(SpaceClip *sc, ARegion *ar, MovieClip *clip, Sc
/* cached segments -- could be usefu lto debug caching strategies */
BKE_movieclip_get_cache_segments(clip, &sc->user, &totseg, &points);
- if(totseg) {
+ if (totseg) {
glColor4ub(128, 128, 255, 128);
- for(a= 0; a<totseg; a++) {
+ for (a= 0; a<totseg; a++) {
float x1, x2;
x1= (points[a*2]-sfra)/(efra-sfra+1)*ar->winx;
@@ -121,31 +121,31 @@ static void draw_movieclip_cache(SpaceClip *sc, ARegion *ar, MovieClip *clip, Sc
}
/* track */
- if(act_track) {
+ if (act_track) {
MovieTrackingTrack *track= act_track;
- for(i= sfra, a= 0; i <= efra; i++) {
+ for (i= sfra, a= 0; i <= efra; i++) {
int framenr;
MovieTrackingMarker *marker;
- while(a<track->markersnr) {
- if(track->markers[a].framenr>=i)
+ while (a<track->markersnr) {
+ if (track->markers[a].framenr>=i)
break;
- if(a<track->markersnr-1 && track->markers[a+1].framenr>i)
+ if (a<track->markersnr-1 && track->markers[a+1].framenr>i)
break;
a++;
}
- if(a<track->markersnr) marker= &track->markers[a];
+ if (a<track->markersnr) marker= &track->markers[a];
else marker= &track->markers[track->markersnr-1];
- if((marker->flag&MARKER_DISABLED)==0) {
+ if ((marker->flag&MARKER_DISABLED)==0) {
framenr= marker->framenr;
- if(framenr!=i) glColor4ub(128, 128, 0, 96);
- else if((marker->flag&MARKER_TRACKED)==0) glColor4ub(255, 255, 0, 196);
+ if (framenr!=i) glColor4ub(128, 128, 0, 96);
+ else if ((marker->flag&MARKER_TRACKED)==0) glColor4ub(255, 255, 0, 196);
else glColor4ub(255, 255, 0, 96);
glRecti((i-sfra)*framelen, 0, (i-sfra+1)*framelen, 4);
@@ -154,28 +154,28 @@ static void draw_movieclip_cache(SpaceClip *sc, ARegion *ar, MovieClip *clip, Sc
}
/* failed frames */
- if(reconstruction->flag&TRACKING_RECONSTRUCTED) {
+ if (reconstruction->flag&TRACKING_RECONSTRUCTED) {
int n= reconstruction->camnr;
MovieReconstructedCamera *cameras= reconstruction->cameras;
glColor4ub(255, 0, 0, 96);
- for(i= sfra, a= 0; i <= efra; i++) {
+ for (i= sfra, a= 0; i <= efra; i++) {
int ok= 0;
- while(a<n) {
- if(cameras[a].framenr==i) {
+ while (a<n) {
+ if (cameras[a].framenr==i) {
ok= 1;
break;
}
- else if(cameras[a].framenr>i) {
+ else if (cameras[a].framenr>i) {
break;
}
a++;
}
- if(!ok)
+ if (!ok)
glRecti((i-sfra)*framelen, 0, (i-sfra+1)*framelen, 8);
}
}
@@ -198,15 +198,16 @@ static void draw_movieclip_notes(SpaceClip *sc, ARegion *ar)
char str[256]= {0};
int block= 0;
- if(tracking->stats) {
+ if (tracking->stats) {
BLI_strncpy(str, tracking->stats->message, sizeof(str));
block= 1;
- } else {
- if(sc->flag&SC_LOCK_SELECTION)
+ }
+ else {
+ if (sc->flag&SC_LOCK_SELECTION)
strcpy(str, "Locked");
}
- if(str[0])
+ if (str[0])
ED_region_info_draw(ar, str, block, 0.6f);
}
@@ -222,20 +223,21 @@ static void draw_movieclip_buffer(SpaceClip *sc, ARegion *ar, ImBuf *ibuf,
/* find window pixel coordinates of origin */
UI_view2d_to_region_no_clip(&ar->v2d, 0.0f, 0.0f, &x, &y);
- if(sc->flag&SC_MUTE_FOOTAGE) {
+ if (sc->flag&SC_MUTE_FOOTAGE) {
glColor3f(0.0f, 0.0f, 0.0f);
glRectf(x, y, x+zoomx*width, y+zoomy*height);
- } else {
- if(ibuf->rect_float && !ibuf->rect) {
+ }
+ else {
+ if (ibuf->rect_float && !ibuf->rect) {
IMB_rect_from_float(ibuf);
}
- if(ibuf->rect)
+ if (ibuf->rect)
glaDrawPixelsSafe(x, y, ibuf->x, ibuf->y, ibuf->x, GL_RGBA, GL_UNSIGNED_BYTE, ibuf->rect);
}
/* draw boundary border for frame if stabilization is enabled */
- if(sc->flag&SC_SHOW_STABLE && clip->tracking.stabilization.flag&TRACKING_2D_STABILIZATION) {
+ if (sc->flag&SC_SHOW_STABLE && clip->tracking.stabilization.flag&TRACKING_2D_STABILIZATION) {
glColor3f(0.0f, 0.0f, 0.0f);
glLineStipple(3, 0xaaaa);
glEnable(GL_LINE_STIPPLE);
@@ -274,63 +276,66 @@ static void draw_track_path(SpaceClip *sc, MovieClip *UNUSED(clip), MovieTrackin
int tiny= sc->flag&SC_SHOW_TINY_MARKER, framenr;
MovieTrackingMarker *marker;
- if(count==0)
+ if (count==0)
return;
marker= BKE_tracking_get_marker(track, sc->user.framenr);
- if(marker->framenr!=sc->user.framenr || marker->flag&MARKER_DISABLED)
+ if (marker->framenr!=sc->user.framenr || marker->flag&MARKER_DISABLED)
return;
framenr= marker->framenr;
a= count;
i= framenr-1;
- while(i>=framenr-count) {
+ while (i>=framenr-count) {
marker= BKE_tracking_get_marker(track, i);
- if(!marker || marker->flag&MARKER_DISABLED)
+ if (!marker || marker->flag&MARKER_DISABLED)
break;
- if(marker->framenr==i) {
+ if (marker->framenr==i) {
add_v2_v2v2(path[--a], marker->pos, track->offset);
ED_clip_point_undistorted_pos(sc, path[a], path[a]);
- if(marker->framenr==sc->user.framenr)
+ if (marker->framenr==sc->user.framenr)
curindex= a;
- } else
+ }
+ else {
break;
+ }
i--;
}
b= count;
i= framenr;
- while(i<=framenr+count) {
+ while (i<=framenr+count) {
marker= BKE_tracking_get_marker(track, i);
- if(!marker || marker->flag&MARKER_DISABLED)
+ if (!marker || marker->flag&MARKER_DISABLED)
break;
- if(marker->framenr==i) {
- if(marker->framenr==sc->user.framenr)
+ if (marker->framenr==i) {
+ if (marker->framenr==sc->user.framenr)
curindex= b;
add_v2_v2v2(path[b++], marker->pos, track->offset);
ED_clip_point_undistorted_pos(sc, path[b-1], path[b-1]);
- } else
+ }
+ else
break;
i++;
}
- if(!tiny) {
+ if (!tiny) {
UI_ThemeColor(TH_MARKER_OUTLINE);
- if(TRACK_VIEW_SELECTED(sc, track)) {
+ if (TRACK_VIEW_SELECTED(sc, track)) {
glPointSize(5.0f);
glBegin(GL_POINTS);
- for(i= a; i<b; i++) {
- if(i!=curindex)
+ for (i= a; i<b; i++) {
+ if (i!=curindex)
glVertex2f(path[i][0], path[i][1]);
}
glEnd();
@@ -338,7 +343,7 @@ static void draw_track_path(SpaceClip *sc, MovieClip *UNUSED(clip), MovieTrackin
glLineWidth(3.0f);
glBegin(GL_LINE_STRIP);
- for(i= a; i<b; i++)
+ for (i= a; i<b; i++)
glVertex2f(path[i][0], path[i][1]);
glEnd();
glLineWidth(1.0f);
@@ -346,14 +351,14 @@ static void draw_track_path(SpaceClip *sc, MovieClip *UNUSED(clip), MovieTrackin
UI_ThemeColor(TH_PATH_BEFORE);
- if(TRACK_VIEW_SELECTED(sc, track)) {
+ if (TRACK_VIEW_SELECTED(sc, track)) {
glPointSize(3.0f);
glBegin(GL_POINTS);
- for(i= a; i<b; i++) {
- if(i==count+1)
+ for (i= a; i<b; i++) {
+ if (i==count+1)
UI_ThemeColor(TH_PATH_AFTER);
- if(i!=curindex)
+ if (i!=curindex)
glVertex2f(path[i][0], path[i][1]);
}
glEnd();
@@ -362,8 +367,8 @@ static void draw_track_path(SpaceClip *sc, MovieClip *UNUSED(clip), MovieTrackin
UI_ThemeColor(TH_PATH_BEFORE);
glBegin(GL_LINE_STRIP);
- for(i= a; i<b; i++) {
- if(i==count+1)
+ for (i= a; i<b; i++) {
+ if (i==count+1)
UI_ThemeColor(TH_PATH_AFTER);
glVertex2f(path[i][0], path[i][1]);
@@ -383,7 +388,7 @@ static void draw_marker_outline(SpaceClip *sc, MovieTrackingTrack *track, MovieT
px[0]= 1.0f/width/sc->zoom;
px[1]= 1.0f/height/sc->zoom;
- if((marker->flag&MARKER_DISABLED)==0) {
+ if ((marker->flag&MARKER_DISABLED)==0) {
float pos[2];
rctf r;
@@ -392,15 +397,16 @@ static void draw_marker_outline(SpaceClip *sc, MovieTrackingTrack *track, MovieT
ED_clip_point_undistorted_pos(sc, pos, pos);
- if(BLI_in_rctf(&r, pos[0]-marker_pos[0], pos[1]-marker_pos[1])) {
- if(tiny) glPointSize(3.0f);
+ if (BLI_in_rctf(&r, pos[0]-marker_pos[0], pos[1]-marker_pos[1])) {
+ if (tiny) glPointSize(3.0f);
else glPointSize(4.0f);
glBegin(GL_POINTS);
glVertex2f(pos[0], pos[1]);
glEnd();
glPointSize(1.0f);
- } else {
- if(!tiny) glLineWidth(3.0f);
+ }
+ else {
+ if (!tiny) glLineWidth(3.0f);
glBegin(GL_LINES);
glVertex2f(pos[0] + px[0]*2, pos[1]);
glVertex2f(pos[0] + px[0]*8, pos[1]);
@@ -414,7 +420,7 @@ static void draw_marker_outline(SpaceClip *sc, MovieTrackingTrack *track, MovieT
glVertex2f(pos[0], pos[1] + px[1]*2);
glVertex2f(pos[0], pos[1] + px[1]*8);
glEnd();
- if(!tiny) glLineWidth(1.0f);
+ if (!tiny) glLineWidth(1.0f);
}
}
@@ -422,9 +428,9 @@ static void draw_marker_outline(SpaceClip *sc, MovieTrackingTrack *track, MovieT
glPushMatrix();
glTranslatef(marker_pos[0], marker_pos[1], 0);
- if(!tiny) glLineWidth(3.0f);
+ if (!tiny) glLineWidth(3.0f);
- if(sc->flag&SC_SHOW_MARKER_PATTERN) {
+ if (sc->flag&SC_SHOW_MARKER_PATTERN) {
glBegin(GL_LINE_LOOP);
glVertex2f(track->pat_min[0], track->pat_min[1]);
glVertex2f(track->pat_max[0], track->pat_min[1]);
@@ -434,7 +440,7 @@ static void draw_marker_outline(SpaceClip *sc, MovieTrackingTrack *track, MovieT
}
show_search= TRACK_VIEW_SELECTED(sc, track) && ((marker->flag&MARKER_DISABLED)==0 || (sc->flag&SC_SHOW_MARKER_PATTERN)==0);
- if(sc->flag&SC_SHOW_MARKER_SEARCH && show_search) {
+ if (sc->flag&SC_SHOW_MARKER_SEARCH && show_search) {
glBegin(GL_LINE_LOOP);
glVertex2f(track->search_min[0], track->search_min[1]);
glVertex2f(track->search_max[0], track->search_min[1]);
@@ -444,20 +450,21 @@ static void draw_marker_outline(SpaceClip *sc, MovieTrackingTrack *track, MovieT
}
glPopMatrix();
- if(!tiny) glLineWidth(1.0f);
+ if (!tiny) glLineWidth(1.0f);
}
static void track_colors(MovieTrackingTrack *track, int act, float col[3], float scol[3])
{
- if(track->flag&TRACK_CUSTOMCOLOR) {
- if(act) UI_GetThemeColor3fv(TH_ACT_MARKER, scol);
+ if (track->flag&TRACK_CUSTOMCOLOR) {
+ if (act) UI_GetThemeColor3fv(TH_ACT_MARKER, scol);
else copy_v3_v3(scol, track->color);
mul_v3_v3fl(col, track->color, 0.5f);
- } else {
+ }
+ else {
UI_GetThemeColor3fv(TH_MARKER, col);
- if(act) UI_GetThemeColor3fv(TH_ACT_MARKER, scol);
+ if (act) UI_GetThemeColor3fv(TH_ACT_MARKER, scol);
else UI_GetThemeColor3fv(TH_SEL_MARKER, scol);
}
}
@@ -474,16 +481,17 @@ static void draw_marker_areas(SpaceClip *sc, MovieTrackingTrack *track, MovieTra
px[1]= 1.0f/height/sc->zoom;
/* marker position and offset position */
- if((track->flag&SELECT)==sel && (marker->flag&MARKER_DISABLED)==0) {
+ if ((track->flag&SELECT)==sel && (marker->flag&MARKER_DISABLED)==0) {
float pos[2];
rctf r;
- if(track->flag&TRACK_LOCKED) {
- if(act) UI_ThemeColor(TH_ACT_MARKER);
- else if(track->flag&SELECT) UI_ThemeColorShade(TH_LOCK_MARKER, 64);
+ if (track->flag&TRACK_LOCKED) {
+ if (act) UI_ThemeColor(TH_ACT_MARKER);
+ else if (track->flag&SELECT) UI_ThemeColorShade(TH_LOCK_MARKER, 64);
else UI_ThemeColor(TH_LOCK_MARKER);
- } else {
- if(track->flag&SELECT) glColor3fv(scol);
+ }
+ else {
+ if (track->flag&SELECT) glColor3fv(scol);
else glColor3fv(col);
}
@@ -491,13 +499,14 @@ static void draw_marker_areas(SpaceClip *sc, MovieTrackingTrack *track, MovieTra
add_v2_v2v2(pos, marker->pos, track->offset);
ED_clip_point_undistorted_pos(sc, pos, pos);
- if(BLI_in_rctf(&r, pos[0]-marker_pos[0], pos[1]-marker_pos[1])) {
- if(!tiny) glPointSize(2.0f);
+ if (BLI_in_rctf(&r, pos[0]-marker_pos[0], pos[1]-marker_pos[1])) {
+ if (!tiny) glPointSize(2.0f);
glBegin(GL_POINTS);
glVertex2f(pos[0], pos[1]);
glEnd();
- if(!tiny) glPointSize(1.0f);
- } else {
+ if (!tiny) glPointSize(1.0f);
+ }
+ else {
glBegin(GL_LINES);
glVertex2f(pos[0] + px[0]*3, pos[1]);
glVertex2f(pos[0] + px[0]*7, pos[1]);
@@ -532,23 +541,24 @@ static void draw_marker_areas(SpaceClip *sc, MovieTrackingTrack *track, MovieTra
glPushMatrix();
glTranslatef(marker_pos[0], marker_pos[1], 0);
- if(tiny) {
+ if (tiny) {
glLineStipple(3, 0xaaaa);
glEnable(GL_LINE_STIPPLE);
}
- if((track->pat_flag&SELECT)==sel && (sc->flag&SC_SHOW_MARKER_PATTERN)) {
- if(track->flag&TRACK_LOCKED) {
- if(act) UI_ThemeColor(TH_ACT_MARKER);
- else if(track->pat_flag&SELECT) UI_ThemeColorShade(TH_LOCK_MARKER, 64);
+ if ((track->pat_flag&SELECT)==sel && (sc->flag&SC_SHOW_MARKER_PATTERN)) {
+ if (track->flag&TRACK_LOCKED) {
+ if (act) UI_ThemeColor(TH_ACT_MARKER);
+ else if (track->pat_flag&SELECT) UI_ThemeColorShade(TH_LOCK_MARKER, 64);
else UI_ThemeColor(TH_LOCK_MARKER);
}
- else if(marker->flag&MARKER_DISABLED) {
- if(act) UI_ThemeColor(TH_ACT_MARKER);
- else if(track->pat_flag&SELECT) UI_ThemeColorShade(TH_DIS_MARKER, 128);
+ else if (marker->flag&MARKER_DISABLED) {
+ if (act) UI_ThemeColor(TH_ACT_MARKER);
+ else if (track->pat_flag&SELECT) UI_ThemeColorShade(TH_DIS_MARKER, 128);
else UI_ThemeColor(TH_DIS_MARKER);
- } else {
- if(track->pat_flag&SELECT) glColor3fv(scol);
+ }
+ else {
+ if (track->pat_flag&SELECT) glColor3fv(scol);
else glColor3fv(col);
}
@@ -562,18 +572,19 @@ static void draw_marker_areas(SpaceClip *sc, MovieTrackingTrack *track, MovieTra
/* search */
show_search= TRACK_VIEW_SELECTED(sc, track) && ((marker->flag&MARKER_DISABLED)==0 || (sc->flag&SC_SHOW_MARKER_PATTERN)==0);
- if((track->search_flag&SELECT)==sel && (sc->flag&SC_SHOW_MARKER_SEARCH) && show_search) {
- if(track->flag&TRACK_LOCKED) {
- if(act) UI_ThemeColor(TH_ACT_MARKER);
- else if(track->search_flag&SELECT) UI_ThemeColorShade(TH_LOCK_MARKER, 64);
+ if ((track->search_flag&SELECT)==sel && (sc->flag&SC_SHOW_MARKER_SEARCH) && show_search) {
+ if (track->flag&TRACK_LOCKED) {
+ if (act) UI_ThemeColor(TH_ACT_MARKER);
+ else if (track->search_flag&SELECT) UI_ThemeColorShade(TH_LOCK_MARKER, 64);
else UI_ThemeColor(TH_LOCK_MARKER);
}
- else if(marker->flag&MARKER_DISABLED) {
- if(act) UI_ThemeColor(TH_ACT_MARKER);
- else if(track->search_flag&SELECT) UI_ThemeColorShade(TH_DIS_MARKER, 128);
+ else if (marker->flag&MARKER_DISABLED) {
+ if (act) UI_ThemeColor(TH_ACT_MARKER);
+ else if (track->search_flag&SELECT) UI_ThemeColorShade(TH_DIS_MARKER, 128);
else UI_ThemeColor(TH_DIS_MARKER);
- } else {
- if(track->search_flag&SELECT) glColor3fv(scol);
+ }
+ else {
+ if (track->search_flag&SELECT) glColor3fv(scol);
else glColor3fv(col);
}
@@ -586,18 +597,19 @@ static void draw_marker_areas(SpaceClip *sc, MovieTrackingTrack *track, MovieTra
}
/* pyramid */
- if(sel && TRACK_VIEW_SELECTED(sc, track) && (track->tracker==TRACKER_KLT) && (marker->flag&MARKER_DISABLED)==0) {
- if(track->flag&TRACK_LOCKED) {
- if(act) UI_ThemeColor(TH_ACT_MARKER);
- else if(track->pat_flag&SELECT) UI_ThemeColorShade(TH_LOCK_MARKER, 64);
+ if (sel && TRACK_VIEW_SELECTED(sc, track) && (track->tracker==TRACKER_KLT) && (marker->flag&MARKER_DISABLED)==0) {
+ if (track->flag&TRACK_LOCKED) {
+ if (act) UI_ThemeColor(TH_ACT_MARKER);
+ else if (track->pat_flag&SELECT) UI_ThemeColorShade(TH_LOCK_MARKER, 64);
else UI_ThemeColor(TH_LOCK_MARKER);
}
- else if(marker->flag&MARKER_DISABLED) {
- if(act) UI_ThemeColor(TH_ACT_MARKER);
- else if(track->pat_flag&SELECT) UI_ThemeColorShade(TH_DIS_MARKER, 128);
+ else if (marker->flag&MARKER_DISABLED) {
+ if (act) UI_ThemeColor(TH_ACT_MARKER);
+ else if (track->pat_flag&SELECT) UI_ThemeColorShade(TH_DIS_MARKER, 128);
else UI_ThemeColor(TH_DIS_MARKER);
- } else {
- if(track->pat_flag&SELECT) glColor3fv(scol);
+ }
+ else {
+ if (track->pat_flag&SELECT) glColor3fv(scol);
else glColor3fv(col);
}
@@ -620,7 +632,7 @@ static void draw_marker_areas(SpaceClip *sc, MovieTrackingTrack *track, MovieTra
}
}
- if(tiny)
+ if (tiny)
glDisable(GL_LINE_STIPPLE);
glPopMatrix();
@@ -633,15 +645,15 @@ static void draw_marker_slide_zones(SpaceClip *sc, MovieTrackingTrack *track, Mo
int tiny= sc->flag&SC_SHOW_TINY_MARKER;
float col[3], scol[3], px[2];
- if((tiny && outline) || (marker->flag&MARKER_DISABLED))
+ if ((tiny && outline) || (marker->flag&MARKER_DISABLED))
return;
- if(!TRACK_VIEW_SELECTED(sc, track) || track->flag&TRACK_LOCKED)
+ if (!TRACK_VIEW_SELECTED(sc, track) || track->flag&TRACK_LOCKED)
return;
track_colors(track, act, col, scol);
- if(outline) {
+ if (outline) {
glLineWidth(3.0f);
UI_ThemeColor(TH_MARKER_OUTLINE);
}
@@ -661,9 +673,9 @@ static void draw_marker_slide_zones(SpaceClip *sc, MovieTrackingTrack *track, Mo
px[0]= 1.0f/sc->zoom/width/sc->scale;
px[1]= 1.0f/sc->zoom/height/sc->scale;
- if((sc->flag&SC_SHOW_MARKER_SEARCH) && ((track->search_flag&SELECT)==sel || outline)) {
- if(!outline) {
- if(track->search_flag&SELECT) glColor3fv(scol);
+ if ((sc->flag&SC_SHOW_MARKER_SEARCH) && ((track->search_flag&SELECT)==sel || outline)) {
+ if (!outline) {
+ if (track->search_flag&SELECT) glColor3fv(scol);
else glColor3fv(col);
}
@@ -674,7 +686,7 @@ static void draw_marker_slide_zones(SpaceClip *sc, MovieTrackingTrack *track, Mo
tdx= searchdx;
tdy= searchdy;
- if(outline) {
+ if (outline) {
tdx+= px[0];
tdy+= px[1];
}
@@ -693,7 +705,7 @@ static void draw_marker_slide_zones(SpaceClip *sc, MovieTrackingTrack *track, Mo
tdx= searchdx*2.0f;
tdy= searchdy*2.0f;
- if(outline) {
+ if (outline) {
tdx+= px[0];
tdy+= px[1];
}
@@ -705,9 +717,9 @@ static void draw_marker_slide_zones(SpaceClip *sc, MovieTrackingTrack *track, Mo
glEnd();
}
- if((sc->flag&SC_SHOW_MARKER_PATTERN) && ((track->pat_flag&SELECT)==sel || outline)) {
- if(!outline) {
- if(track->pat_flag&SELECT) glColor3fv(scol);
+ if ((sc->flag&SC_SHOW_MARKER_PATTERN) && ((track->pat_flag&SELECT)==sel || outline)) {
+ if (!outline) {
+ if (track->pat_flag&SELECT) glColor3fv(scol);
else glColor3fv(col);
}
@@ -718,7 +730,7 @@ static void draw_marker_slide_zones(SpaceClip *sc, MovieTrackingTrack *track, Mo
tdx= patdx;
tdy= patdy;
- if(outline) {
+ if (outline) {
tdx+= px[0];
tdy+= px[1];
}
@@ -737,7 +749,7 @@ static void draw_marker_slide_zones(SpaceClip *sc, MovieTrackingTrack *track, Mo
tdx= patdx*2.0f;
tdy= patdy*2.0f;
- if(outline) {
+ if (outline) {
tdx+= px[0];
tdy+= px[1];
}
@@ -751,7 +763,7 @@ static void draw_marker_slide_zones(SpaceClip *sc, MovieTrackingTrack *track, Mo
glPopMatrix();
- if(outline)
+ if (outline)
glLineWidth(1.0f);
}
@@ -763,26 +775,28 @@ static void draw_marker_texts(SpaceClip *sc, MovieTrackingTrack *track, MovieTra
uiStyle *style= U.uistyles.first;
int fontid= style->widget.uifont_id;
- if(!TRACK_VIEW_SELECTED(sc, track))
+ if (!TRACK_VIEW_SELECTED(sc, track))
return;
BLF_size(fontid, 11.0f, U.dpi);
fontsize= BLF_height_max(fontid);
- if(marker->flag&MARKER_DISABLED) {
- if(act) UI_ThemeColor(TH_ACT_MARKER);
+ if (marker->flag&MARKER_DISABLED) {
+ if (act) UI_ThemeColor(TH_ACT_MARKER);
else UI_ThemeColorShade(TH_DIS_MARKER, 128);
- } else {
- if(act) UI_ThemeColor(TH_ACT_MARKER);
+ }
+ else {
+ if (act) UI_ThemeColor(TH_ACT_MARKER);
else UI_ThemeColor(TH_SEL_MARKER);
}
- if((sc->flag&SC_SHOW_MARKER_SEARCH) &&
+ if ((sc->flag&SC_SHOW_MARKER_SEARCH) &&
((marker->flag&MARKER_DISABLED)==0 || (sc->flag&SC_SHOW_MARKER_PATTERN)==0))
{
dx= track->search_min[0];
dy= track->search_min[1];
- } else if(sc->flag&SC_SHOW_MARKER_PATTERN) {
+ }
+ else if (sc->flag&SC_SHOW_MARKER_PATTERN) {
dx= track->pat_min[0];
dy= track->pat_min[1];
}
@@ -796,12 +810,12 @@ static void draw_marker_texts(SpaceClip *sc, MovieTrackingTrack *track, MovieTra
pos[0]= pos[0]*zoomx;
pos[1]= pos[1]*zoomy - fontsize;
- if(marker->flag&MARKER_DISABLED) strcpy(state, "disabled");
- else if(marker->framenr!=sc->user.framenr) strcpy(state, "estimated");
- else if(marker->flag&MARKER_TRACKED) strcpy(state, "tracked");
+ if (marker->flag&MARKER_DISABLED) strcpy(state, "disabled");
+ else if (marker->framenr!=sc->user.framenr) strcpy(state, "estimated");
+ else if (marker->flag&MARKER_TRACKED) strcpy(state, "tracked");
else strcpy(state, "keyframed");
- if(state[0])
+ if (state[0])
BLI_snprintf(str, sizeof(str), "%s: %s", track->name, state);
else
BLI_snprintf(str, sizeof(str), "%s", track->name);
@@ -810,14 +824,14 @@ static void draw_marker_texts(SpaceClip *sc, MovieTrackingTrack *track, MovieTra
BLF_draw(fontid, str, sizeof(str));
pos[1]-= fontsize;
- if(track->flag&TRACK_HAS_BUNDLE) {
+ if (track->flag&TRACK_HAS_BUNDLE) {
BLI_snprintf(str, sizeof(str), "Average error: %.3f", track->error);
BLF_position(fontid, pos[0], pos[1], 0.0f);
BLF_draw(fontid, str, sizeof(str));
pos[1]-= fontsize;
}
- if(track->flag&TRACK_LOCKED) {
+ if (track->flag&TRACK_LOCKED) {
BLF_position(fontid, pos[0], pos[1], 0.0f);
BLF_draw(fontid, "locked", 6);
}
@@ -865,16 +879,16 @@ static void draw_tracking_tracks(SpaceClip *sc, ARegion *ar, MovieClip *clip,
act_track= BKE_tracking_active_track(tracking);
- if(sc->user.render_flag&MCLIP_PROXY_RENDER_UNDISTORT) {
+ if (sc->user.render_flag&MCLIP_PROXY_RENDER_UNDISTORT) {
int count= 0;
/* count */
track= tracksbase->first;
- while(track) {
- if((track->flag&TRACK_HIDDEN)==0) {
+ while (track) {
+ if ((track->flag&TRACK_HIDDEN)==0) {
marker= BKE_tracking_get_marker(track, framenr);
- if(MARKER_VISIBLE(sc, marker))
+ if (MARKER_VISIBLE(sc, marker))
count++;
}
@@ -882,19 +896,19 @@ static void draw_tracking_tracks(SpaceClip *sc, ARegion *ar, MovieClip *clip,
}
/* undistort */
- if(count) {
+ if (count) {
marker_pos= MEM_callocN(2*sizeof(float)*count, "draw_tracking_tracks marker_pos");
track= tracksbase->first;
fp= marker_pos;
- while(track) {
- if((track->flag&TRACK_HIDDEN)==0) {
+ while (track) {
+ if ((track->flag&TRACK_HIDDEN)==0) {
marker= BKE_tracking_get_marker(track, framenr);
- if(MARKER_VISIBLE(sc, marker)) {
+ if (MARKER_VISIBLE(sc, marker)) {
ED_clip_point_undistorted_pos(sc, marker->pos, fp);
- if(track==act_track)
+ if (track==act_track)
active_pos= fp;
fp+= 2;
@@ -906,10 +920,10 @@ static void draw_tracking_tracks(SpaceClip *sc, ARegion *ar, MovieClip *clip,
}
}
- if(sc->flag&SC_SHOW_TRACK_PATH) {
+ if (sc->flag&SC_SHOW_TRACK_PATH) {
track= tracksbase->first;
- while(track) {
- if((track->flag&TRACK_HIDDEN)==0)
+ while (track) {
+ if ((track->flag&TRACK_HIDDEN)==0)
draw_track_path(sc, clip, track);
track= track->next;
@@ -919,11 +933,11 @@ static void draw_tracking_tracks(SpaceClip *sc, ARegion *ar, MovieClip *clip,
/* markers outline and non-selected areas */
track= tracksbase->first;
fp= marker_pos;
- while(track) {
- if((track->flag&TRACK_HIDDEN)==0) {
+ while (track) {
+ if ((track->flag&TRACK_HIDDEN)==0) {
marker= BKE_tracking_get_marker(track, framenr);
- if(MARKER_VISIBLE(sc, marker)) {
+ if (MARKER_VISIBLE(sc, marker)) {
copy_v2_v2(cur_pos, fp ? fp : marker->pos);
draw_marker_outline(sc, track, marker, cur_pos, width, height);
@@ -931,7 +945,7 @@ static void draw_tracking_tracks(SpaceClip *sc, ARegion *ar, MovieClip *clip,
draw_marker_slide_zones(sc, track, marker, cur_pos, 1, 0, 0, width, height);
draw_marker_slide_zones(sc, track, marker, cur_pos, 0, 0, 0, width, height);
- if(fp)
+ if (fp)
fp+= 2;
}
}
@@ -943,20 +957,20 @@ static void draw_tracking_tracks(SpaceClip *sc, ARegion *ar, MovieClip *clip,
* non-selected areas */
track= tracksbase->first;
fp= marker_pos;
- while(track) {
- if((track->flag&TRACK_HIDDEN)==0) {
+ while (track) {
+ if ((track->flag&TRACK_HIDDEN)==0) {
int act= track==act_track;
marker= BKE_tracking_get_marker(track, framenr);
- if(MARKER_VISIBLE(sc, marker)) {
- if(!act) {
+ if (MARKER_VISIBLE(sc, marker)) {
+ if (!act) {
copy_v2_v2(cur_pos, fp ? fp : marker->pos);
draw_marker_areas(sc, track, marker, cur_pos, width, height, 0, 1);
draw_marker_slide_zones(sc, track, marker, cur_pos, 0, 1, 0, width, height);
}
- if(fp)
+ if (fp)
fp+= 2;
}
}
@@ -965,11 +979,11 @@ static void draw_tracking_tracks(SpaceClip *sc, ARegion *ar, MovieClip *clip,
}
/* active marker would be displayed on top of everything else */
- if(act_track) {
- if((act_track->flag&TRACK_HIDDEN)==0) {
+ if (act_track) {
+ if ((act_track->flag&TRACK_HIDDEN)==0) {
marker= BKE_tracking_get_marker(act_track, framenr);
- if(MARKER_VISIBLE(sc, marker)) {
+ if (MARKER_VISIBLE(sc, marker)) {
copy_v2_v2(cur_pos, active_pos ? active_pos : marker->pos);
draw_marker_areas(sc, act_track, marker, cur_pos, width, height, 1, 1);
@@ -978,7 +992,7 @@ static void draw_tracking_tracks(SpaceClip *sc, ARegion *ar, MovieClip *clip,
}
}
- if(sc->flag&SC_SHOW_BUNDLES) {
+ if (sc->flag&SC_SHOW_BUNDLES) {
MovieTrackingObject *object= BKE_tracking_active_object(tracking);
float pos[4], vec[4], mat[4][4], aspy;
@@ -989,11 +1003,11 @@ static void draw_tracking_tracks(SpaceClip *sc, ARegion *ar, MovieClip *clip,
BKE_tracking_projection_matrix(tracking, object, framenr, width, height, mat);
track= tracksbase->first;
- while(track) {
- if((track->flag&TRACK_HIDDEN)==0 && track->flag&TRACK_HAS_BUNDLE) {
+ while (track) {
+ if ((track->flag&TRACK_HIDDEN)==0 && track->flag&TRACK_HAS_BUNDLE) {
marker= BKE_tracking_get_marker(track, framenr);
- if(MARKER_VISIBLE(sc, marker)) {
+ if (MARKER_VISIBLE(sc, marker)) {
float npos[2];
copy_v4_v4(vec, track->bundle_pos);
vec[3]=1;
@@ -1005,17 +1019,17 @@ static void draw_tracking_tracks(SpaceClip *sc, ARegion *ar, MovieClip *clip,
BKE_tracking_apply_intrinsics(tracking, pos, npos);
- if(npos[0]>=0.0f && npos[1]>=0.0f && npos[0]<=width && npos[1]<=height*aspy) {
+ if (npos[0]>=0.0f && npos[1]>=0.0f && npos[0]<=width && npos[1]<=height*aspy) {
vec[0]= (marker->pos[0]+track->offset[0])*width;
vec[1]= (marker->pos[1]+track->offset[1])*height*aspy;
sub_v2_v2(vec, npos);
- if(len_v2(vec)<3) glColor3f(0.0f, 1.0f, 0.0f);
+ if (len_v2(vec)<3) glColor3f(0.0f, 1.0f, 0.0f);
else glColor3f(1.0f, 0.0f, 0.0f);
glBegin(GL_POINTS);
- if(undistort) glVertex3f(pos[0]/width, pos[1]/(height*aspy), 0);
+ if (undistort) glVertex3f(pos[0]/width, pos[1]/(height*aspy), 0);
else glVertex3f(npos[0]/width, npos[1]/(height*aspy), 0);
glEnd();
}
@@ -1031,22 +1045,22 @@ static void draw_tracking_tracks(SpaceClip *sc, ARegion *ar, MovieClip *clip,
glPopMatrix();
- if(sc->flag&SC_SHOW_NAMES) {
+ if (sc->flag&SC_SHOW_NAMES) {
/* scaling should be cleared before drawing texts, otherwise font would also be scaled */
track= tracksbase->first;
fp= marker_pos;
- while(track) {
- if((track->flag&TRACK_HIDDEN)==0) {
+ while (track) {
+ if ((track->flag&TRACK_HIDDEN)==0) {
marker= BKE_tracking_get_marker(track, framenr);
- if(MARKER_VISIBLE(sc, marker)) {
+ if (MARKER_VISIBLE(sc, marker)) {
int act= track==act_track;
copy_v2_v2(cur_pos, fp ? fp : marker->pos);
draw_marker_texts(sc, track, marker, cur_pos, act, width, height, zoomx, zoomy);
- if(fp) fp+= 2;
+ if (fp) fp+= 2;
}
}
@@ -1056,7 +1070,7 @@ static void draw_tracking_tracks(SpaceClip *sc, ARegion *ar, MovieClip *clip,
glPopMatrix();
- if(marker_pos)
+ if (marker_pos)
MEM_freeN(marker_pos);
}
@@ -1070,13 +1084,13 @@ static void draw_distortion(SpaceClip *sc, ARegion *ar, MovieClip *clip, int wid
float aspy= 1.0f/tracking->camera.pixel_aspect;
float dx= (float)width/n, dy= (float)height/n*aspy;
- if(sc->mode!=SC_MODE_DISTORTION)
+ if (sc->mode!=SC_MODE_DISTORTION)
return;
- if(!tracking->camera.focal)
+ if (!tracking->camera.focal)
return;
- if((sc->flag&SC_SHOW_GRID)==0 && (sc->flag&SC_MANUAL_CALIBRATION)==0)
+ if ((sc->flag&SC_SHOW_GRID)==0 && (sc->flag&SC_MANUAL_CALIBRATION)==0)
return;
view2d_to_region_float(&ar->v2d, 0.0f, 0.0f, &x, &y);
@@ -1088,28 +1102,28 @@ static void draw_distortion(SpaceClip *sc, ARegion *ar, MovieClip *clip, int wid
glScalef(width, height, 0);
/* grid */
- if(sc->flag&SC_SHOW_GRID) {
+ if (sc->flag&SC_SHOW_GRID) {
float val[4][2], idx[4][2];
float min[2], max[2];
- for(a=0; a<4; a++) {
- if(a<2) val[a][a%2]= FLT_MAX;
+ for (a=0; a<4; a++) {
+ if (a<2) val[a][a%2]= FLT_MAX;
else val[a][a%2]= -FLT_MAX;
}
zero_v2(pos);
- for(i= 0; i<=n; i++) {
- for(j= 0; j<=n; j++) {
- if(i==0 || j==0 || i==n || j==n) {
+ for (i= 0; i<=n; i++) {
+ for (j= 0; j<=n; j++) {
+ if (i==0 || j==0 || i==n || j==n) {
BKE_tracking_apply_intrinsics(tracking, pos, tpos);
- for(a=0; a<4; a++) {
+ for (a=0; a<4; a++) {
int ok;
- if(a<2) ok= tpos[a%2] < val[a][a%2];
+ if (a<2) ok= tpos[a%2] < val[a][a%2];
else ok= tpos[a%2] > val[a][a%2];
- if(ok) {
+ if (ok) {
copy_v2_v2(val[a], tpos);
idx[a][0]= j;
idx[a][1]= i;
@@ -1126,7 +1140,7 @@ static void draw_distortion(SpaceClip *sc, ARegion *ar, MovieClip *clip, int wid
INIT_MINMAX2(min, max);
- for(a= 0; a<4; a++) {
+ for (a= 0; a<4; a++) {
pos[0]= idx[a][0]*dx;
pos[1]= idx[a][1]*dy;
@@ -1139,8 +1153,8 @@ static void draw_distortion(SpaceClip *sc, ARegion *ar, MovieClip *clip, int wid
dx= (max[0]-min[0])/n;
dy= (max[1]-min[1])/n;
- for(i= 0; i<=n; i++) {
- for(j= 0; j<=n; j++) {
+ for (i= 0; i<=n; i++) {
+ for (j= 0; j<=n; j++) {
BKE_tracking_apply_intrinsics(tracking, pos, grid[i][j]);
grid[i][j][0]/= width;
@@ -1155,30 +1169,30 @@ static void draw_distortion(SpaceClip *sc, ARegion *ar, MovieClip *clip, int wid
glColor3f(1.0f, 0.0f, 0.0f);
- for(i= 0; i<=n; i++) {
+ for (i= 0; i<=n; i++) {
glBegin(GL_LINE_STRIP);
- for(j= 0; j<=n; j++) {
+ for (j= 0; j<=n; j++) {
glVertex2fv(grid[i][j]);
}
glEnd();
}
- for(j= 0; j<=n; j++) {
+ for (j= 0; j<=n; j++) {
glBegin(GL_LINE_STRIP);
- for(i= 0; i<=n; i++) {
+ for (i= 0; i<=n; i++) {
glVertex2fv(grid[i][j]);
}
glEnd();
}
}
- if(sc->flag&SC_MANUAL_CALIBRATION && clip->gpd) {
+ if (sc->flag&SC_MANUAL_CALIBRATION && clip->gpd) {
bGPDlayer *layer= clip->gpd->layers.first;
- while(layer) {
+ while (layer) {
bGPDframe *frame= layer->frames.first;
- if(layer->flag & GP_LAYER_HIDE) {
+ if (layer->flag & GP_LAYER_HIDE) {
layer= layer->next;
continue;
}
@@ -1187,14 +1201,14 @@ static void draw_distortion(SpaceClip *sc, ARegion *ar, MovieClip *clip, int wid
glLineWidth(layer->thickness);
glPointSize((float)(layer->thickness + 2));
- while(frame) {
+ while (frame) {
bGPDstroke *stroke= frame->strokes.first;
- while(stroke) {
- if(stroke->flag&GP_STROKE_2DSPACE) {
- if(stroke->totpoints>1) {
+ while (stroke) {
+ if (stroke->flag&GP_STROKE_2DSPACE) {
+ if (stroke->totpoints>1) {
glBegin(GL_LINE_STRIP);
- for(i= 0; i<stroke->totpoints-1; i++) {
+ for (i= 0; i<stroke->totpoints-1; i++) {
float npos[2], dpos[2], len;
int steps;
@@ -1208,7 +1222,7 @@ static void draw_distortion(SpaceClip *sc, ARegion *ar, MovieClip *clip, int wid
steps= ceil(len/5.0f);
/* we want to distort only long straight lines */
- if(stroke->totpoints==2) {
+ if (stroke->totpoints==2) {
BKE_tracking_invert_intrinsics(tracking, pos, pos);
BKE_tracking_invert_intrinsics(tracking, npos, npos);
}
@@ -1216,7 +1230,7 @@ static void draw_distortion(SpaceClip *sc, ARegion *ar, MovieClip *clip, int wid
sub_v2_v2v2(dpos, npos, pos);
mul_v2_fl(dpos, 1.0f/steps);
- for(j= 0; j<=steps; j++) {
+ for (j= 0; j<=steps; j++) {
BKE_tracking_apply_intrinsics(tracking, pos, tpos);
glVertex2f(tpos[0]/width, tpos[1]/(height*aspy));
@@ -1225,7 +1239,7 @@ static void draw_distortion(SpaceClip *sc, ARegion *ar, MovieClip *clip, int wid
}
glEnd();
}
- else if(stroke->totpoints==1) {
+ else if (stroke->totpoints==1) {
glBegin(GL_POINTS);
glVertex2f(stroke->points[0].x, stroke->points[0].y);
glEnd();
@@ -1256,22 +1270,22 @@ void clip_draw_main(SpaceClip *sc, ARegion *ar, Scene *scene)
float zoomx, zoomy;
/* if no clip, nothing to do */
- if(!clip)
+ if (!clip)
return;
ED_space_clip_size(sc, &width, &height);
ED_space_clip_zoom(sc, ar, &zoomx, &zoomy);
- if(sc->flag&SC_SHOW_STABLE) {
+ if (sc->flag&SC_SHOW_STABLE) {
float smat[4][4], ismat[4][4];
ibuf= ED_space_clip_get_stable_buffer(sc, sc->loc, &sc->scale, &sc->angle);
- if(ibuf) {
+ if (ibuf) {
float loc[2];
float aspect= clip->tracking.camera.pixel_aspect;
- if(width != ibuf->x)
+ if (width != ibuf->x)
mul_v2_v2fl(loc, sc->loc, (float)width / ibuf->x);
else
copy_v2_v2(loc, sc->loc);
@@ -1285,7 +1299,8 @@ void clip_draw_main(SpaceClip *sc, ARegion *ar, Scene *scene)
mul_serie_m4(sc->unistabmat, smat, sc->stabmat, ismat, NULL, NULL, NULL, NULL, NULL);
}
- } else {
+ }
+ else {
ibuf= ED_space_clip_get_buffer(sc);
zero_v2(sc->loc);
@@ -1294,7 +1309,7 @@ void clip_draw_main(SpaceClip *sc, ARegion *ar, Scene *scene)
unit_m4(sc->unistabmat);
}
- if(ibuf) {
+ if (ibuf) {
draw_movieclip_buffer(sc, ar, ibuf, width, height, zoomx, zoomy);
IMB_freeImBuf(ibuf);
@@ -1313,16 +1328,16 @@ void clip_draw_grease_pencil(bContext *C, int onlyv2d)
MovieClip *clip= ED_space_clip(sc);
ImBuf *ibuf;
- if(!clip)
+ if (!clip)
return;
- if(onlyv2d) {
+ if (onlyv2d) {
/* if manual calibration is used then grease pencil data is already
* drawed in draw_distortion */
- if((sc->flag&SC_MANUAL_CALIBRATION)==0 || sc->mode!=SC_MODE_DISTORTION) {
+ if ((sc->flag&SC_MANUAL_CALIBRATION)==0 || sc->mode!=SC_MODE_DISTORTION) {
ibuf= ED_space_clip_get_buffer(sc);
- if(ibuf) {
+ if (ibuf) {
glPushMatrix();
glMultMatrixf(sc->unistabmat);
draw_gpencil_2dimage(C, ibuf);
@@ -1331,7 +1346,8 @@ void clip_draw_grease_pencil(bContext *C, int onlyv2d)
glPopMatrix();
}
}
- } else {
+ }
+ else {
draw_gpencil_view2d(C, 0);
}
}