blender
/
blender
130
398
Fork 574
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

BLI_utildefines_iter: Use for iteration helpers

This commit is contained in:
Campbell Barton 2017-09-19 20:21:52 +10:00
parent 02b206780e
commit 868bde5920
2 changed files with 53 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
source/blender/blenlib/BLI_utildefines_iter.h Normal file
View File

@ -0,0 +1,52 @@
/*
* ***** BEGIN GPL LICENSE BLOCK *****
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef __BLI_UTILDEFINES_ITER_H__
#define __BLI_UTILDEFINES_ITER_H__
/** \file BLI_utildefines_iter.h
* \ingroup bli
*
* General looping helpers, use `BLI_FOREACH` prefix.
*/
/**
* Even value distribution.
*
* \a src must be larger than \a dst,
* \a dst defines the number of iterations, their values are evenly spaced.
*
* The following pairs represent (src, dst) arguments and the values they loop over.
* <pre>
* (19, 4) -> [2, 7, 11. 16]
* (100, 5) -> [9, 29, 49, 69, 89]
* (100, 3) -> [16, 49, 83]
* (100, 100) -> [0..99]
* </pre>
* \note this is mainly useful for numbers that might not divide evenly into eachother.
*/
#define BLI_FOREACH_SPARSE_RANGE(src, dst, i) \
for (int _src = (src), _src2 = _src * 2, _dst2 = (dst) * 2, _error = _dst2 - _src, i = 0, _delta; \
((void)(_delta = divide_floor_i(_error, _dst2)), \
(void)(i -= _delta), \
(i < _src)); \
_error -= (_delta * _dst2) + _src2)
#endif /* __BLI_UTILDEFINES_ITER_H__ */

24
source/blender/bmesh/intern/bmesh_edgeloop.c
View File

@ -32,6 +32,7 @@
#include "BLI_math_vector.h"
#include "BLI_listbase.h"
#include "BLI_mempool.h"
#include "BLI_utildefines_iter.h"
#include "bmesh.h"
@ -707,29 +708,6 @@ void BM_edgeloop_expand(
split_swap = !split_swap;
}
/* TODO, move to generic define? */
/**
* Even value distribution.
*
* \a src must be larger than \a dst,
* \a dst defines the number of iterations, their values are evenly spaced.
*
* The following pairs represent (src, dst) arguments and the values they loop over.
* <pre>
* (19, 4) -> [2, 7, 11. 16]
* (100, 5) -> [9, 29, 49, 69, 89]
* (100, 3) -> [16, 49, 83]
* (100, 100) -> [0..99]
* </pre>
* \note this is mainly useful for numbers that might not divide evenly into eachother.
*/
#define BLI_FOREACH_SPARSE_RANGE(src, dst, i) \
for (int _src = (src), _src2 = _src * 2, _dst2 = (dst) * 2, _error = _dst2 - _src, i = 0, _delta; \
((void)(_delta = divide_floor_i(_error, _dst2)), \
(void)(i -= _delta), \
(i < _src)); \
_error -= (_delta * _dst2) + _src2)
if (el_store->len < el_store_len) {
LinkData *node_curr = el_store->verts.first;