asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #89104 from luevano/fix-rand-weighted

Browse source 
Fix `RandomNumberGenerator::rand_weighted` return type
This commit is contained in:
Rémi Verschelde 2024-03-04 13:34:18 +01:00
commit 48aa12011b
No known key found for this signature in database
GPG key ID: C3336907360768E1
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/math/random_number_generator.h
View file

@ -57,7 +57,7 @@ public:
_FORCE_INLINE_ real_t randfn(real_t p_mean = 0.0, real_t p_deviation = 1.0) { return randbase.randfn(p_mean, p_deviation); }
_FORCE_INLINE_ int randi_range(int p_from, int p_to) { return randbase.random(p_from, p_to); }
_FORCE_INLINE_ int rand_weighted(const Vector<float> &p_weights) { return randbase.rand_weighted(p_weights); }
_FORCE_INLINE_ int64_t rand_weighted(const Vector<float> &p_weights) { return randbase.rand_weighted(p_weights); }
RandomNumberGenerator() { randbase.randomize(); }
};

2
core/math/random_pcg.cpp
View file

@ -43,7 +43,7 @@ void RandomPCG::randomize() {
seed(((uint64_t)OS::get_singleton()->get_unix_time() + OS::get_singleton()->get_ticks_usec()) * pcg.state + PCG_DEFAULT_INC_64);
}
int RandomPCG::rand_weighted(const Vector<float> &p_weights) {
int64_t RandomPCG::rand_weighted(const Vector<float> &p_weights) {
ERR_FAIL_COND_V_MSG(p_weights.is_empty(), -1, "Weights array is empty.");
int64_t weights_size = p_weights.size();
const float *weights = p_weights.ptr();

2
core/math/random_pcg.h
View file

@ -90,7 +90,7 @@ public:
return pcg32_boundedrand_r(&pcg, bounds);
}
int rand_weighted(const Vector<float> &p_weights);
int64_t rand_weighted(const Vector<float> &p_weights);
// Obtaining floating point numbers in [0, 1] range with "good enough" uniformity.
// These functions sample the output of rand() as the fraction part of an infinite binary number,

6
doc/classes/RandomNumberGenerator.xml
View file

@ -24,13 +24,13 @@
Returns a random index with non-uniform weights. Prints an error and returns [code]-1[/code] if the array is empty.
[codeblocks]
[gdscript]
var rnd = RandomNumberGenerator.new()
var rng = RandomNumberGenerator.new()
var my_array = ["one", "two", "three, "four"]
var my_array = ["one", "two", "three", "four"]
var weights = PackedFloat32Array([0.5, 1, 1, 2])
# Prints one of the four elements in `my_array`.
# It is more likely to print "four", and less likely to print "two".
# It is more likely to print "four", and less likely to print "one".
print(my_array[rng.rand_weighted(weights)])
[/gdscript]
[/codeblocks]