archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Followup to the previous commit

Browse Source 
Need to take weight into account when drawing per-frame track
reprojection curve and when computing per-track average error.
This commit is contained in:
Sergey Sharybin
2014-01-28 18:01:03 +06:00
parent c2da706a36
commit be6643b5ec
4 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
extern/libmv/libmv-capi.cc vendored
View File

@@ -760,18 +760,19 @@ double libmv_reprojectionErrorForTrack(const struct libmv_Reconstruction *libmv_
double total_error = 0.0;
for (int i = 0; i < markers.size(); ++i) {
double weight = markers[i].weight;
const libmv::EuclideanCamera *camera = reconstruction->CameraForImage(markers[i].image);
const libmv::EuclideanPoint *point = reconstruction->PointForTrack(markers[i].track);
if (!camera || !point) {
if (!camera || !point || weight == 0.0) {
continue;
}
num_reprojected++;
libmv::Marker reprojected_marker = ProjectMarker(*point, *camera, *intrinsics);
double ex = reprojected_marker.x - markers[i].x;
double ey = reprojected_marker.y - markers[i].y;
double ex = (reprojected_marker.x - markers[i].x) * weight;
double ey = (reprojected_marker.y - markers[i].y) * weight;
total_error += sqrt(ex * ex + ey * ey);
}

2
source/blender/blenkernel/BKE_tracking.h
View File

@@ -98,6 +98,8 @@ struct MovieTrackingTrack *BKE_tracking_track_get_active(struct MovieTracking *t
float *BKE_tracking_track_get_mask(int frame_width, int frame_height, struct MovieTrackingTrack *track,
struct MovieTrackingMarker *marker);
float BKE_tracking_track_get_weight_for_marker(struct MovieClip *clip, struct MovieTrackingTrack *track, struct MovieTrackingMarker *marker);
/* selection */
void BKE_tracking_track_select(struct ListBase *tracksbase, struct MovieTrackingTrack *track, int area, bool extend);
void BKE_tracking_track_deselect(struct MovieTrackingTrack *track, int area);

17
source/blender/blenkernel/intern/tracking.c
View File

@@ -864,6 +864,23 @@ float *BKE_tracking_track_get_mask(int frame_width, int frame_height,
return mask;
}
float BKE_tracking_track_get_weight_for_marker(MovieClip *clip, MovieTrackingTrack *track, MovieTrackingMarker *marker)
{
FCurve *weight_fcurve;
float weight = track->weight;
weight_fcurve = id_data_find_fcurve(&clip->id, track, &RNA_MovieTrackingTrack,
"weight", 0, NULL);
if (weight_fcurve) {
int scene_framenr =
BKE_movieclip_remap_clip_to_scene_frame(clip, marker->framenr);
weight = evaluate_fcurve(weight_fcurve, scene_framenr);
}
return weight;
}
/* area - which part of marker should be selected. see TRACK_AREA_* constants */
void BKE_tracking_track_select(ListBase *tracksbase, MovieTrackingTrack *track, int area, bool extend)
{

5
source/blender/editors/space_clip/clip_graph_draw.c
View File

@@ -192,6 +192,7 @@ static void draw_tracks_motion_curves(View2D *v2d, SpaceClip *sc)
}
typedef struct TrackErrorCurveUserData {
MovieClip *clip;
MovieTracking *tracking;
MovieTrackingObject *tracking_object;
MovieTrackingTrack *active_track;
@@ -210,6 +211,7 @@ static void tracking_error_segment_point_cb(void *userdata,
TrackErrorCurveUserData *data = (TrackErrorCurveUserData *) userdata;
float reprojected_position[4], bundle_position[4], marker_position[2], delta[2];
float reprojection_error;
float weight = BKE_tracking_track_get_weight_for_marker(data->clip, track, marker);
if (!data->matrix_initialized || data->matrix_frame != scene_framenr) {
BKE_tracking_get_projection_matrix(data->tracking, data->tracking_object,
@@ -232,7 +234,7 @@ static void tracking_error_segment_point_cb(void *userdata,
marker_position[1] = (marker->pos[1] + track->offset[1]) * data->height * data->aspy;
sub_v2_v2v2(delta, reprojected_position, marker_position);
reprojection_error = len_v2(delta);
reprojection_error = len_v2(delta) * track->weight;
glVertex2f(scene_framenr, reprojection_error);
}
@@ -273,6 +275,7 @@ static void draw_tracks_error_curves(SpaceClip *sc)
MovieTracking *tracking = &clip->tracking;
TrackErrorCurveUserData data;
data.clip = clip;
data.tracking = tracking;
data.tracking_object = BKE_tracking_object_get_active(tracking);
data.active_track = BKE_tracking_track_get_active(tracking);