Object tracking fixes:

- Do not draw bundles for object for opengl selection
- Display reconstruction info for active object in cache line and graph editor
This commit is contained in:
Sergey Sharybin
2011-12-15 16:10:13 +00:00
parent ba16e7d631
commit 53f37cd1ed
3 changed files with 9 additions and 4 deletions

View File

@@ -97,6 +97,7 @@ static void draw_movieclip_cache(SpaceClip *sc, ARegion *ar, MovieClip *clip, Sc
int *points, totseg, i, a;
float sfra= SFRA, efra= EFRA, framelen= ar->winx/(efra-sfra+1);
MovieTrackingTrack *act_track= BKE_tracking_active_track(&clip->tracking);
MovieTrackingReconstruction *reconstruction= BKE_tracking_get_reconstruction(&clip->tracking);
glEnable(GL_BLEND);
@@ -153,9 +154,9 @@ static void draw_movieclip_cache(SpaceClip *sc, ARegion *ar, MovieClip *clip, Sc
}
/* failed frames */
if(clip->tracking.reconstruction.flag&TRACKING_RECONSTRUCTED) {
int n= clip->tracking.reconstruction.camnr;
MovieReconstructedCamera *cameras= clip->tracking.reconstruction.cameras;
if(reconstruction->flag&TRACKING_RECONSTRUCTED) {
int n= reconstruction->camnr;
MovieReconstructedCamera *cameras= reconstruction->cameras;
glColor4ub(255, 0, 0, 96);

View File

@@ -207,7 +207,7 @@ static void draw_frame_curves(SpaceClip *sc)
{
MovieClip *clip= ED_space_clip(sc);
MovieTracking *tracking= &clip->tracking;
MovieTrackingReconstruction *reconstruction= &tracking->reconstruction;
MovieTrackingReconstruction *reconstruction= BKE_tracking_get_reconstruction(tracking);
int i, lines= 0, prevfra= 0;
glColor3f(0.0f, 0.0f, 1.0f);

View File

@@ -1487,6 +1487,10 @@ static void draw_viewport_object_reconstruction(Scene *scene, Base *base, View3D
else {
float obmat[4][4];
if(flag & DRAW_PICKING) {
return;
}
BKE_tracking_get_interpolated_camera(tracking, tracking_object, scene->r.cfra, obmat);
invert_m4_m4(imat, obmat);