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

Cleanup: rename mcords to mcoords

Browse Source 
- 'coords' is an abbreviation for coordinates, not 'cords'.
- Rename 'moves' to 'coords_len'.
This commit is contained in:
Campbell Barton
2020-05-04 19:50:06 +10:00
parent 2addc868de
commit 9eb46d6c29
19 changed files with 249 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenlib/BLI_lasso_2d.h
View File

@@ -30,14 +30,14 @@ extern "C" {
struct rcti;
void BLI_lasso_boundbox(struct rcti *rect, const int mcords[][2], const unsigned int moves);
bool BLI_lasso_is_point_inside(const int mcords[][2],
const unsigned int moves,
void BLI_lasso_boundbox(struct rcti *rect, const int mcoords[][2], const unsigned int mcoords_len);
bool BLI_lasso_is_point_inside(const int mcoords[][2],
const unsigned int mcoords_len,
const int sx,
const int sy,
const int error_value);
bool BLI_lasso_is_edge_inside(const int mcords[][2],
const unsigned int moves,
bool BLI_lasso_is_edge_inside(const int mcoords[][2],
const unsigned int mcoords_len,
int x0,
int y0,
int x1,

48
source/blender/blenlib/intern/lasso_2d.c
View File

@@ -28,47 +28,47 @@
#include "BLI_lasso_2d.h" /* own include */
void BLI_lasso_boundbox(rcti *rect, const int mcords[][2], const unsigned int moves)
void BLI_lasso_boundbox(rcti *rect, const int mcoords[][2], const unsigned int mcoords_len)
{
unsigned int a;
rect->xmin = rect->xmax = mcords[0][0];
rect->ymin = rect->ymax = mcords[0][1];
rect->xmin = rect->xmax = mcoords[0][0];
rect->ymin = rect->ymax = mcoords[0][1];
for (a = 1; a < moves; a++) {
if (mcords[a][0] < rect->xmin) {
rect->xmin = mcords[a][0];
for (a = 1; a < mcoords_len; a++) {
if (mcoords[a][0] < rect->xmin) {
rect->xmin = mcoords[a][0];
}
else if (mcords[a][0] > rect->xmax) {
rect->xmax = mcords[a][0];
else if (mcoords[a][0] > rect->xmax) {
rect->xmax = mcoords[a][0];
}
if (mcords[a][1] < rect->ymin) {
rect->ymin = mcords[a][1];
if (mcoords[a][1] < rect->ymin) {
rect->ymin = mcoords[a][1];
}
else if (mcords[a][1] > rect->ymax) {
rect->ymax = mcords[a][1];
else if (mcoords[a][1] > rect->ymax) {
rect->ymax = mcoords[a][1];
}
}
}
bool BLI_lasso_is_point_inside(const int mcords[][2],
const unsigned int moves,
bool BLI_lasso_is_point_inside(const int mcoords[][2],
const unsigned int mcoords_len,
const int sx,
const int sy,
const int error_value)
{
if (sx == error_value || moves == 0) {
if (sx == error_value || mcoords_len == 0) {
return false;
}
else {
int pt[2] = {sx, sy};
return isect_point_poly_v2_int(pt, mcords, moves, true);
return isect_point_poly_v2_int(pt, mcoords, mcoords_len, true);
}
}
/* edge version for lasso select. we assume boundbox check was done */
bool BLI_lasso_is_edge_inside(const int mcords[][2],
const unsigned int moves,
bool BLI_lasso_is_edge_inside(const int mcoords[][2],
const unsigned int mcoords_len,
int x0,
int y0,
int x1,
@@ -76,27 +76,27 @@ bool BLI_lasso_is_edge_inside(const int mcords[][2],
const int error_value)
{
if (x0 == error_value || x1 == error_value || moves == 0) {
if (x0 == error_value || x1 == error_value || mcoords_len == 0) {
return false;
}
const int v1[2] = {x0, y0}, v2[2] = {x1, y1};
/* check points in lasso */
if (BLI_lasso_is_point_inside(mcords, moves, v1[0], v1[1], error_value)) {
if (BLI_lasso_is_point_inside(mcoords, mcoords_len, v1[0], v1[1], error_value)) {
return true;
}
if (BLI_lasso_is_point_inside(mcords, moves, v2[0], v2[1], error_value)) {
if (BLI_lasso_is_point_inside(mcoords, mcoords_len, v2[0], v2[1], error_value)) {
return true;
}
/* no points in lasso, so we have to intersect with lasso edge */
if (isect_seg_seg_v2_int(mcords[0], mcords[moves - 1], v1, v2) > 0) {
if (isect_seg_seg_v2_int(mcoords[0], mcoords[mcoords_len - 1], v1, v2) > 0) {
return true;
}
for (unsigned int a = 0; a < moves - 1; a++) {
if (isect_seg_seg_v2_int(mcords[a], mcords[a + 1], v1, v2) > 0) {
for (unsigned int a = 0; a < mcoords_len - 1; a++) {
if (isect_seg_seg_v2_int(mcoords[a], mcoords[a + 1], v1, v2) > 0) {
return true;
}
}