tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Don't use with_resol suffix for functions which doesn't get resolution

This commit is contained in:
Sergey Sharybin 2013-12-20 16:00:05 +06:00
parent b54ac21622
commit 39daf283ae
5 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/blenkernel/BKE_mask.h
View File

@ -189,23 +189,23 @@ unsigned int BKE_mask_spline_resolution(struct MaskSpline *spline, int width, in
unsigned int BKE_mask_spline_feather_resolution(struct MaskSpline *spline, int width, int height); unsigned int BKE_mask_spline_feather_resolution(struct MaskSpline *spline, int width, int height);
int BKE_mask_spline_differentiate_calc_total(const struct MaskSpline *spline, const unsigned int resol); int BKE_mask_spline_differentiate_calc_total(const struct MaskSpline *spline, const unsigned int resol);
float (*BKE_mask_spline_differentiate_with_resolution_ex(struct MaskSpline *spline, unsigned int *tot_diff_point, float (*BKE_mask_spline_differentiate_with_resolution(struct MaskSpline *spline, unsigned int *tot_diff_point,
const unsigned int resol))[2]; const unsigned int resol))[2];
void BKE_mask_spline_feather_collapse_inner_loops(struct MaskSpline *spline, float (*feather_points)[2], const unsigned int tot_feather_point); void BKE_mask_spline_feather_collapse_inner_loops(struct MaskSpline *spline, float (*feather_points)[2], const unsigned int tot_feather_point);
float (*BKE_mask_spline_differentiate_with_resolution(struct MaskSpline *spline, int width, int height, unsigned int *tot_diff_point))[2]; float (*BKE_mask_spline_differentiate(struct MaskSpline *spline, int width, int height, unsigned int *tot_diff_point))[2];
float (*BKE_mask_spline_feather_differentiated_points_with_resolution_ex(struct MaskSpline *spline, unsigned int *tot_feather_point, float (*BKE_mask_spline_feather_differentiated_points_with_resolution(struct MaskSpline *spline, unsigned int *tot_feather_point,
const unsigned int resol, const int do_feather_isect))[2]; const unsigned int resol, const int do_feather_isect))[2];
/* *** mask point functions which involve evaluation *** */ /* *** mask point functions which involve evaluation *** */
float (*BKE_mask_spline_feather_points(struct MaskSpline *spline, int *tot_feather_point))[2]; float (*BKE_mask_spline_feather_points(struct MaskSpline *spline, int *tot_feather_point))[2];
float *BKE_mask_point_segment_diff_with_resolution(struct MaskSpline *spline, struct MaskSplinePoint *point, float *BKE_mask_point_segment_diff(struct MaskSpline *spline, struct MaskSplinePoint *point,
int width, int height, int width, int height,
unsigned int *tot_diff_point); unsigned int *tot_diff_point);
float *BKE_mask_point_segment_feather_diff_with_resolution(struct MaskSpline *spline, struct MaskSplinePoint *point, float *BKE_mask_point_segment_feather_diff(struct MaskSpline *spline, struct MaskSplinePoint *point,
int width, int height, int width, int height,
unsigned int *tot_feather_point); unsigned int *tot_feather_point);
/* mask_rasterize.c */ /* mask_rasterize.c */
struct MaskRasterHandle; struct MaskRasterHandle;

66
source/blender/blenkernel/intern/mask_evaluate.c
View File

@ -154,10 +154,10 @@ int BKE_mask_spline_differentiate_calc_total(const MaskSpline *spline, const uns
} }
} }
float (*BKE_mask_spline_differentiate_with_resolution_ex(MaskSpline *spline, float (*BKE_mask_spline_differentiate_with_resolution(MaskSpline *spline,
unsigned int *tot_diff_point, unsigned int *tot_diff_point,
const unsigned int resol const unsigned int resol
))[2] ))[2]
{ {
MaskSplinePoint *points_array = BKE_mask_spline_point_array(spline); MaskSplinePoint *points_array = BKE_mask_spline_point_array(spline);
@ -213,13 +213,13 @@ float (*BKE_mask_spline_differentiate_with_resolution_ex(MaskSpline *spline,
return diff_points; return diff_points;
} }
float (*BKE_mask_spline_differentiate_with_resolution(MaskSpline *spline, int width, int height, float (*BKE_mask_spline_differentiate(MaskSpline *spline, int width, int height,
unsigned int *tot_diff_point unsigned int *tot_diff_point
))[2] ))[2]
{ {
int unsigned resol = BKE_mask_spline_resolution(spline, width, height); int unsigned resol = BKE_mask_spline_resolution(spline, width, height);
return BKE_mask_spline_differentiate_with_resolution_ex(spline, tot_diff_point, resol); return BKE_mask_spline_differentiate_with_resolution(spline, tot_diff_point, resol);
} }
/* ** feather points self-intersection collapse routine ** */ /* ** feather points self-intersection collapse routine ** */
@ -501,12 +501,12 @@ void BKE_mask_spline_feather_collapse_inner_loops(MaskSpline *spline, float (*fe
#undef BUCKET_INDEX #undef BUCKET_INDEX
} }
/** only called from #BKE_mask_spline_feather_differentiated_points_with_resolution_ex() ! */ /** only called from #BKE_mask_spline_feather_differentiated_points_with_resolution() ! */
static float (*mask_spline_feather_differentiated_points_with_resolution_ex__even(MaskSpline *spline, static float (*mask_spline_feather_differentiated_points_with_resolution__even(MaskSpline *spline,
unsigned int *tot_feather_point, unsigned int *tot_feather_point,
const unsigned int resol, const unsigned int resol,
const int do_feather_isect const int do_feather_isect
))[2] ))[2]
{ {
MaskSplinePoint *points_array = BKE_mask_spline_point_array(spline); MaskSplinePoint *points_array = BKE_mask_spline_point_array(spline);
MaskSplinePoint *point_curr, *point_prev; MaskSplinePoint *point_curr, *point_prev;
@ -574,12 +574,12 @@ static float (*mask_spline_feather_differentiated_points_with_resolution_ex__eve
return feather; return feather;
} }
/** only called from #BKE_mask_spline_feather_differentiated_points_with_resolution_ex() ! */ /** only called from #BKE_mask_spline_feather_differentiated_points_with_resolution() ! */
static float (*mask_spline_feather_differentiated_points_with_resolution_ex__double(MaskSpline *spline, static float (*mask_spline_feather_differentiated_points_with_resolution__double(MaskSpline *spline,
unsigned int *tot_feather_point, unsigned int *tot_feather_point,
const unsigned int resol, const unsigned int resol,
const int do_feather_isect const int do_feather_isect
))[2] ))[2]
{ {
MaskSplinePoint *points_array = BKE_mask_spline_point_array(spline); MaskSplinePoint *points_array = BKE_mask_spline_point_array(spline);
@ -709,22 +709,22 @@ static float (*mask_spline_feather_differentiated_points_with_resolution_ex__dou
} }
/** /**
* values align with #BKE_mask_spline_differentiate_with_resolution_ex * values align with #BKE_mask_spline_differentiate_with_resolution
* when \a resol arguments match. * when \a resol arguments match.
*/ */
float (*BKE_mask_spline_feather_differentiated_points_with_resolution_ex(MaskSpline *spline, float (*BKE_mask_spline_feather_differentiated_points_with_resolution(MaskSpline *spline,
unsigned int *tot_feather_point, unsigned int *tot_feather_point,
const unsigned int resol, const unsigned int resol,
const int do_feather_isect const int do_feather_isect
))[2] ))[2]
{ {
switch (spline->offset_mode) { switch (spline->offset_mode) {
case MASK_SPLINE_OFFSET_EVEN: case MASK_SPLINE_OFFSET_EVEN:
return mask_spline_feather_differentiated_points_with_resolution_ex__even(spline, tot_feather_point, resol, do_feather_isect); return mask_spline_feather_differentiated_points_with_resolution__even(spline, tot_feather_point, resol, do_feather_isect);
break; break;
case MASK_SPLINE_OFFSET_SMOOTH: case MASK_SPLINE_OFFSET_SMOOTH:
default: default:
return mask_spline_feather_differentiated_points_with_resolution_ex__double(spline, tot_feather_point, resol, do_feather_isect); return mask_spline_feather_differentiated_points_with_resolution__double(spline, tot_feather_point, resol, do_feather_isect);
break; break;
} }
} }
@ -777,9 +777,9 @@ float (*BKE_mask_spline_feather_points(MaskSpline *spline, int *tot_feather_poin
} }
/* *** mask point functions which involve evaluation *** */ /* *** mask point functions which involve evaluation *** */
float *BKE_mask_point_segment_feather_diff_with_resolution(MaskSpline *spline, MaskSplinePoint *point, float *BKE_mask_point_segment_feather_diff(MaskSpline *spline, MaskSplinePoint *point,
int width, int height, int width, int height,
unsigned int *tot_feather_point) unsigned int *tot_feather_point)
{ {
float *feather, *fp; float *feather, *fp;
unsigned int resol = BKE_mask_spline_feather_resolution(spline, width, height); unsigned int resol = BKE_mask_spline_feather_resolution(spline, width, height);
@ -804,8 +804,8 @@ float *BKE_mask_point_segment_feather_diff_with_resolution(MaskSpline *spline, M
return feather; return feather;
} }
float *BKE_mask_point_segment_diff_with_resolution(MaskSpline *spline, MaskSplinePoint *point, float *BKE_mask_point_segment_diff(MaskSpline *spline, MaskSplinePoint *point,
int width, int height, unsigned int *tot_diff_point) int width, int height, unsigned int *tot_diff_point)
{ {
MaskSplinePoint *points_array = BKE_mask_spline_point_array_from_point(spline, point); MaskSplinePoint *points_array = BKE_mask_spline_point_array_from_point(spline, point);

4
source/blender/blenkernel/intern/mask_rasterize.c
View File

@ -626,11 +626,11 @@ void BKE_maskrasterize_handle_init(MaskRasterHandle *mr_handle, struct Mask *mas
const unsigned int resol_b = BKE_mask_spline_feather_resolution(spline, width, height) / 4; const unsigned int resol_b = BKE_mask_spline_feather_resolution(spline, width, height) / 4;
const unsigned int resol = CLAMPIS(MAX2(resol_a, resol_b), 4, 512); const unsigned int resol = CLAMPIS(MAX2(resol_a, resol_b), 4, 512);
diff_points = BKE_mask_spline_differentiate_with_resolution_ex( diff_points = BKE_mask_spline_differentiate_with_resolution(
spline, &tot_diff_point, resol); spline, &tot_diff_point, resol);
if (do_feather) { if (do_feather) {
diff_feather_points = BKE_mask_spline_feather_differentiated_points_with_resolution_ex( diff_feather_points = BKE_mask_spline_feather_differentiated_points_with_resolution(
spline, &tot_diff_feather_points, resol, FALSE); spline, &tot_diff_feather_points, resol, FALSE);
BLI_assert(diff_feather_points); BLI_assert(diff_feather_points);
} }

10
source/blender/editors/mask/mask_add.c
View File

@ -94,8 +94,8 @@ static int find_nearest_diff_point(const bContext *C, Mask *mask, const float no
float *diff_points; float *diff_points;
unsigned int tot_diff_point; unsigned int tot_diff_point;
diff_points = BKE_mask_point_segment_diff_with_resolution(spline, cur_point, width, height, diff_points = BKE_mask_point_segment_diff(spline, cur_point, width, height,
&tot_diff_point); &tot_diff_point);
if (diff_points) { if (diff_points) {
int j, tot_point; int j, tot_point;
@ -103,9 +103,9 @@ static int find_nearest_diff_point(const bContext *C, Mask *mask, const float no
float *feather_points = NULL, *points; float *feather_points = NULL, *points;
if (feather) { if (feather) {
feather_points = BKE_mask_point_segment_feather_diff_with_resolution(spline, cur_point, feather_points = BKE_mask_point_segment_feather_diff(spline, cur_point,
width, height, width, height,
&tot_feather_point); &tot_feather_point);
points = feather_points; points = feather_points;
tot_point = tot_feather_point; tot_point = tot_feather_point;

4
source/blender/editors/mask/mask_draw.c
View File

@ -425,7 +425,7 @@ static void draw_spline_curve(const bContext *C, MaskLayer *masklay, MaskSpline
unsigned int tot_feather_point; unsigned int tot_feather_point;
float (*feather_points)[2]; float (*feather_points)[2];
diff_points = BKE_mask_spline_differentiate_with_resolution_ex(spline, &tot_diff_point, resol); diff_points = BKE_mask_spline_differentiate_with_resolution(spline, &tot_diff_point, resol);
if (!diff_points) if (!diff_points)
return; return;
@ -436,7 +436,7 @@ static void draw_spline_curve(const bContext *C, MaskLayer *masklay, MaskSpline
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
} }
feather_points = BKE_mask_spline_feather_differentiated_points_with_resolution_ex(spline, &tot_feather_point, resol, (is_fill != FALSE)); feather_points = BKE_mask_spline_feather_differentiated_points_with_resolution(spline, &tot_feather_point, resol, (is_fill != FALSE));
/* draw feather */ /* draw feather */
mask_spline_feather_color_get(masklay, spline, is_spline_sel, rgb_tmp); mask_spline_feather_color_get(masklay, spline, is_spline_sel, rgb_tmp);