Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Some small fixed for camera tracking:

Browse Source 
- Lock to selection and center to selection will now work fine with undistorted rendering
- Do not display pyramid for disabled tracks
- Corrected fix for wrong correlation_min property name
This commit is contained in:
Sergey Sharybin
2011-11-07 15:32:32 +00:00
parent 9b5652215a
commit a3e5bd02bb
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_ui/space_clip.py
View File

@@ -445,7 +445,7 @@ class CLIP_PT_track_settings(Panel):
if active.tracker == "KLT": if active.tracker == "KLT":
layout.prop(active, "pyramid_levels") layout.prop(active, "pyramid_levels")
if active.tracker == "SAD": if active.tracker == "SAD":
layout.prop(active, "minimum_correlation") layout.prop(active, "correlation_min")
layout.prop(settings, "frames_adjust") layout.prop(settings, "frames_adjust")
layout.prop(settings, "speed") layout.prop(settings, "speed")

4
source/blender/editors/space_clip/clip_draw.c
View File

@@ -594,7 +594,7 @@ static void draw_marker_areas(SpaceClip *sc, MovieTrackingTrack *track, MovieTra
} }
/* pyramid */ /* pyramid */
if((sel == TRACK_SELECTED(track) && sel && (sc->flag&SC_SHOW_PYRAMID_LEVELS) && (track->tracker==TRACKER_KLT))) { if(sel && TRACK_SELECTED(track) && (sc->flag&SC_SHOW_PYRAMID_LEVELS) && (track->tracker==TRACKER_KLT) && (marker->flag&MARKER_DISABLED)==0) {
if(track->flag&TRACK_LOCKED) { if(track->flag&TRACK_LOCKED) {
if(act) UI_ThemeColor(TH_ACT_MARKER); if(act) UI_ThemeColor(TH_ACT_MARKER);
else if(track->pat_flag&SELECT) UI_ThemeColorShade(TH_LOCK_MARKER, 64); else if(track->pat_flag&SELECT) UI_ThemeColorShade(TH_LOCK_MARKER, 64);
@@ -626,7 +626,7 @@ static void draw_marker_areas(SpaceClip *sc, MovieTrackingTrack *track, MovieTra
glDisable(GL_LINE_STIPPLE); glDisable(GL_LINE_STIPPLE);
glPopMatrix(); glPopMatrix();
} }
} }
if(tiny) if(tiny)
glDisable(GL_LINE_STIPPLE); glDisable(GL_LINE_STIPPLE);

12
source/blender/editors/space_clip/clip_editor.c
View File

@@ -184,10 +184,18 @@ static int selected_boundbox(SpaceClip *sc, float min[2], float max[2])
if(marker) { if(marker) {
float pos[3]; float pos[3];
pos[0]= (marker->pos[0]+track->offset[0])*width; pos[0]= marker->pos[0]+track->offset[0];
pos[1]= (marker->pos[1]+track->offset[1])*height; pos[1]= marker->pos[1]+track->offset[1];
pos[2]= 0.0f; pos[2]= 0.0f;
/* undistortion happens for normalized coords */
if(sc->user.render_flag&MCLIP_PROXY_RENDER_UNDISTORT)
/* undistortion happens for normalized coords */
ED_clip_point_undistorted_pos(sc, pos, pos);
pos[0]*= width;
pos[1]*= height;
mul_v3_m4v3(pos, sc->stabmat, pos); mul_v3_m4v3(pos, sc->stabmat, pos);
DO_MINMAX2(pos, min, max); DO_MINMAX2(pos, min, max);

2
source/blender/makesrna/intern/rna_tracking.c
View File

@@ -488,7 +488,7 @@ static void rna_def_trackingTrack(BlenderRNA *brna)
RNA_def_property_update(prop, NC_MOVIECLIP|NA_EDITED, "rna_tracking_trackerPyramid_update"); RNA_def_property_update(prop, NC_MOVIECLIP|NA_EDITED, "rna_tracking_trackerPyramid_update");
/* minmal correlation - only used for SAD tracker */ /* minmal correlation - only used for SAD tracker */
prop= RNA_def_property(srna, "minimum_correlation", PROP_FLOAT, PROP_NONE); prop= RNA_def_property(srna, "correlation_min", PROP_FLOAT, PROP_NONE);
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
RNA_def_property_float_sdna(prop, NULL, "minimum_correlation"); RNA_def_property_float_sdna(prop, NULL, "minimum_correlation");
RNA_def_property_range(prop, -1.0f, 1.0f); RNA_def_property_range(prop, -1.0f, 1.0f);