diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-03-25 09:58:58 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-03-25 09:58:58 +0300 |
commit | 2bc791437e3b8e42c1369daf15c72934474b1e73 (patch) | |
tree | f2202c3753c8288bea47d3c0edd10bcf01cdf339 /source/blender/editors/space_clip/tracking_select.c | |
parent | c3764fe1e80670cd578df7bbc5c37c267e81013a (diff) |
Cleanup: use 'r_' prefix for output arguments
Also pass some args as 'const'.
Diffstat (limited to 'source/blender/editors/space_clip/tracking_select.c')
-rw-r--r-- | source/blender/editors/space_clip/tracking_select.c | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/source/blender/editors/space_clip/tracking_select.c b/source/blender/editors/space_clip/tracking_select.c index 2166cff4883..67c453825f7 100644 --- a/source/blender/editors/space_clip/tracking_select.c +++ b/source/blender/editors/space_clip/tracking_select.c @@ -52,7 +52,7 @@ #include "clip_intern.h" /* own include */ #include "tracking_ops_intern.h" /* own include */ -static float dist_to_crns(float co[2], float pos[2], float crns[4][2]); +static float dist_to_crns(const float co[2], const float pos[2], const float crns[4][2]); /********************** mouse select operator *********************/ @@ -70,8 +70,12 @@ static int mouse_on_side( return (co[0] >= x1 - epsx && co[0] <= x2 + epsx) && (co[1] >= y1 - epsy && co[1] <= y2 + epsy); } -static int mouse_on_rect( - const float co[2], float pos[2], float min[2], float max[2], float epsx, float epsy) +static int mouse_on_rect(const float co[2], + const float pos[2], + const float min[2], + const float max[2], + float epsx, + float epsy) { return mouse_on_side( co, pos[0] + min[0], pos[1] + min[1], pos[0] + max[0], pos[1] + min[1], epsx, epsy) || @@ -83,14 +87,15 @@ static int mouse_on_rect( co, pos[0] + max[0], pos[1] + min[1], pos[0] + max[0], pos[1] + max[1], epsx, epsy); } -static int mouse_on_crns(float co[2], float pos[2], float crns[4][2], float epsx, float epsy) +static int mouse_on_crns( + const float co[2], const float pos[2], const float crns[4][2], float epsx, float epsy) { float dist = dist_to_crns(co, pos, crns); return dist < max_ff(epsx, epsy); } -static int track_mouse_area(const bContext *C, float co[2], MovieTrackingTrack *track) +static int track_mouse_area(const bContext *C, const float co[2], MovieTrackingTrack *track) { SpaceClip *sc = CTX_wm_space_clip(C); int framenr = ED_space_clip_get_clip_frame_number(sc); @@ -142,7 +147,10 @@ static int track_mouse_area(const bContext *C, float co[2], MovieTrackingTrack * return TRACK_AREA_NONE; } -static float dist_to_rect(float co[2], float pos[2], float min[2], float max[2]) +static float dist_to_rect(const float co[2], + const float pos[2], + const float min[2], + const float max[2]) { float d1, d2, d3, d4; float p[2] = {co[0] - pos[0], co[1] - pos[1]}; @@ -158,7 +166,7 @@ static float dist_to_rect(float co[2], float pos[2], float min[2], float max[2]) } /* Distance to quad defined by it's corners, corners are relative to pos */ -static float dist_to_crns(float co[2], float pos[2], float crns[4][2]) +static float dist_to_crns(const float co[2], const float pos[2], const float crns[4][2]) { float d1, d2, d3, d4; float p[2] = {co[0] - pos[0], co[1] - pos[1]}; @@ -174,7 +182,7 @@ static float dist_to_crns(float co[2], float pos[2], float crns[4][2]) } /* Same as above, but all the coordinates are absolute */ -static float dist_to_crns_abs(float co[2], float corners[4][2]) +static float dist_to_crns_abs(const float co[2], const float corners[4][2]) { float d1, d2, d3, d4; const float *v1 = corners[0], *v2 = corners[1]; @@ -190,8 +198,8 @@ static float dist_to_crns_abs(float co[2], float corners[4][2]) static MovieTrackingTrack *find_nearest_track(SpaceClip *sc, ListBase *tracksbase, - float co[2], - float *distance_r) + const float co[2], + float *r_distance) { MovieTrackingTrack *track = NULL, *cur; float mindist = 0.0f; @@ -231,15 +239,15 @@ static MovieTrackingTrack *find_nearest_track(SpaceClip *sc, cur = cur->next; } - *distance_r = mindist; + *r_distance = mindist; return track; } static MovieTrackingPlaneTrack *find_nearest_plane_track(SpaceClip *sc, ListBase *plane_tracks_base, - float co[2], - float *distance_r) + const float co[2], + float *r_distance) { MovieTrackingPlaneTrack *plane_track = NULL, *current_plane_track; float min_distance = 0.0f; @@ -259,7 +267,7 @@ static MovieTrackingPlaneTrack *find_nearest_plane_track(SpaceClip *sc, } } - *distance_r = min_distance; + *r_distance = min_distance; return plane_track; } @@ -281,7 +289,7 @@ void ed_tracking_deselect_all_plane_tracks(ListBase *plane_tracks_base) } } -static int mouse_select(bContext *C, float co[2], const bool extend, const bool deselect_all) +static int mouse_select(bContext *C, const float co[2], const bool extend, const bool deselect_all) { SpaceClip *sc = CTX_wm_space_clip(C); MovieClip *clip = ED_space_clip_get_clip(sc); |