[Bf-blender-cvs] [1e0ff6b723d] master: Tracking: Cleanup, make units explicit in new track creation

[Sergey Sharybin]

Commit: 1e0ff6b723d218dd2ba884edad9d46bc99acf75e
Author: Sergey Sharybin
Date:   Fri Nov 20 15:18:33 2020 +0100
Branches: master
https://developer.blender.org/rB1e0ff6b723d218dd2ba884edad9d46bc99acf75e

Tracking: Cleanup, make units explicit in new track creation

===================================================================

M	source/blender/blenkernel/intern/tracking.c

===================================================================

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);