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

Cleanup: use "num" as a suffix in: source/blender/blenlib

Browse Source 
Also replace "num" with:
- "number" when it's not used to denote the number of items.
- "digits" when digits in a string are being manipulated.
This commit is contained in:
Campbell Barton
2022-03-30 17:26:42 +11:00
parent af3aaf8034
commit a8ec7845e0
49 changed files with 737 additions and 737 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/blenlib/intern/rand.cc
View File

@@ -117,18 +117,18 @@ void BLI_rng_get_tri_sample_float_v3(
copy_v3_v3(r_pt, rng->rng.get_triangle_sample_3d(v1, v2, v3));
}
void BLI_rng_shuffle_array(RNG *rng, void *data, unsigned int elem_size_i, unsigned int elem_tot)
void BLI_rng_shuffle_array(RNG *rng, void *data, unsigned int elem_size_i, unsigned int elem_num)
{
if (elem_tot <= 1) {
if (elem_num <= 1) {
return;
}
const uint elem_size = elem_size_i;
unsigned int i = elem_tot;
unsigned int i = elem_num;
void *temp = malloc(elem_size);
while (i--) {
const unsigned int j = BLI_rng_get_uint(rng) % elem_tot;
const unsigned int j = BLI_rng_get_uint(rng) % elem_num;
if (i != j) {
void *iElem = (unsigned char *)data + i * elem_size_i;
void *jElem = (unsigned char *)data + j * elem_size_i;
@@ -141,15 +141,15 @@ void BLI_rng_shuffle_array(RNG *rng, void *data, unsigned int elem_size_i, unsig
free(temp);
}
void BLI_rng_shuffle_bitmap(struct RNG *rng, BLI_bitmap *bitmap, unsigned int bits_tot)
void BLI_rng_shuffle_bitmap(struct RNG *rng, BLI_bitmap *bitmap, unsigned int bits_num)
{
if (bits_tot <= 1) {
if (bits_num <= 1) {
return;
}
unsigned int i = bits_tot;
unsigned int i = bits_num;
while (i--) {
const unsigned int j = BLI_rng_get_uint(rng) % bits_tot;
const unsigned int j = BLI_rng_get_uint(rng) % bits_num;
if (i != j) {
const bool i_bit = BLI_BITMAP_TEST(bitmap, i);
const bool j_bit = BLI_BITMAP_TEST(bitmap, j);
@@ -187,21 +187,21 @@ float BLI_hash_frand(unsigned int seed)
void BLI_array_randomize(void *data,
unsigned int elem_size,
unsigned int elem_tot,
unsigned int elem_num,
unsigned int seed)
{
RNG rng;
BLI_rng_seed(&rng, seed);
BLI_rng_shuffle_array(&rng, data, elem_size, elem_tot);
BLI_rng_shuffle_array(&rng, data, elem_size, elem_num);
}
void BLI_bitmap_randomize(BLI_bitmap *bitmap, unsigned int bits_tot, unsigned int seed)
void BLI_bitmap_randomize(BLI_bitmap *bitmap, unsigned int bits_num, unsigned int seed)
{
RNG rng;
BLI_rng_seed(&rng, seed);
BLI_rng_shuffle_bitmap(&rng, bitmap, bits_tot);
BLI_rng_shuffle_bitmap(&rng, bitmap, bits_num);
}
/* ********* for threaded random ************** */