diff options
author | Sergey Sharybin <sergey@blender.org> | 2020-11-20 17:18:33 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey@blender.org> | 2020-11-23 11:23:19 +0300 |
commit | 1e0ff6b723d218dd2ba884edad9d46bc99acf75e (patch) | |
tree | 45c5e4c0a2a1539eb3257c8e4c9388f7c3853971 /source | |
parent | 6d314c940ed36ca18296a8bdff2bb56e57107dcb (diff) |
Tracking: Cleanup, make units explicit in new track creation
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/tracking.c | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index 3b6479318dd..e083f7ceec0 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -585,36 +585,33 @@ MovieTrackingTrack *BKE_tracking_track_add(MovieTracking *tracking, int width, int height) { - MovieTrackingTrack *track = BKE_tracking_track_add_empty(tracking, tracksbase); - MovieTrackingMarker marker; - MovieTrackingSettings *settings = &tracking->settings; + const MovieTrackingSettings *settings = &tracking->settings; - float half_pattern = (float)settings->default_pattern_size / 2.0f; - float half_search = (float)settings->default_search_size / 2.0f; - float pat[2], search[2]; + const float half_pattern_px = settings->default_pattern_size / 2.0f; + const float half_search_px = settings->default_search_size / 2.0f; - pat[0] = half_pattern / (float)width; - pat[1] = half_pattern / (float)height; + const float pattern_size[2] = {half_pattern_px / width, half_pattern_px / height}; + const float search_size[2] = {half_search_px / width, half_search_px / height}; - search[0] = half_search / (float)width; - search[1] = half_search / (float)height; + MovieTrackingTrack *track = BKE_tracking_track_add_empty(tracking, tracksbase); + MovieTrackingMarker marker; memset(&marker, 0, sizeof(marker)); marker.pos[0] = x; marker.pos[1] = y; marker.framenr = framenr; - marker.pattern_corners[0][0] = -pat[0]; - marker.pattern_corners[0][1] = -pat[1]; + marker.pattern_corners[0][0] = -pattern_size[0]; + marker.pattern_corners[0][1] = -pattern_size[1]; - marker.pattern_corners[1][0] = pat[0]; - marker.pattern_corners[1][1] = -pat[1]; + marker.pattern_corners[1][0] = pattern_size[0]; + marker.pattern_corners[1][1] = -pattern_size[1]; negate_v2_v2(marker.pattern_corners[2], marker.pattern_corners[0]); negate_v2_v2(marker.pattern_corners[3], marker.pattern_corners[1]); - copy_v2_v2(marker.search_max, search); - negate_v2_v2(marker.search_min, search); + copy_v2_v2(marker.search_max, search_size); + negate_v2_v2(marker.search_min, search_size); BKE_tracking_marker_insert(track, &marker); |