diff options
author | Chaosus <chaosus89@gmail.com> | 2018-12-03 17:43:14 +0300 |
---|---|---|
committer | Chaosus <chaosus89@gmail.com> | 2018-12-06 14:49:52 +0300 |
commit | d376be2bf4c8c8b5bfcb650647ebb73605f8fc81 (patch) | |
tree | 43e5c522df67e50d808bb980fabc36d77af1ad33 /core/math | |
parent | 8dd00ed1762c4956b3231d709ce0d01ee9b306c8 (diff) |
Added integer number generation function to RNG class
Diffstat (limited to 'core/math')
-rw-r--r-- | core/math/random_number_generator.cpp | 3 | ||||
-rw-r--r-- | core/math/random_number_generator.h | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/core/math/random_number_generator.cpp b/core/math/random_number_generator.cpp index e4ec0dac99..9f0a5bc992 100644 --- a/core/math/random_number_generator.cpp +++ b/core/math/random_number_generator.cpp @@ -40,6 +40,7 @@ void RandomNumberGenerator::_bind_methods() { ClassDB::bind_method(D_METHOD("randi"), &RandomNumberGenerator::randi); ClassDB::bind_method(D_METHOD("randf"), &RandomNumberGenerator::randf); - ClassDB::bind_method(D_METHOD("rand_range", "from", "to"), &RandomNumberGenerator::rand_range); + ClassDB::bind_method(D_METHOD("randf_range", "from", "to"), &RandomNumberGenerator::randf_range); + ClassDB::bind_method(D_METHOD("randi_range", "from", "to"), &RandomNumberGenerator::randi_range); ClassDB::bind_method(D_METHOD("randomize"), &RandomNumberGenerator::randomize); } diff --git a/core/math/random_number_generator.h b/core/math/random_number_generator.h index 557863fdbd..078bfbed60 100644 --- a/core/math/random_number_generator.h +++ b/core/math/random_number_generator.h @@ -53,7 +53,12 @@ public: _FORCE_INLINE_ real_t randf() { return randbase.randf(); } - _FORCE_INLINE_ real_t rand_range(real_t from, real_t to) { return randbase.random(from, to); } + _FORCE_INLINE_ real_t randf_range(real_t from, real_t to) { return randbase.random(from, to); } + + _FORCE_INLINE_ int randi_range(int from, int to) { + unsigned int ret = randbase.rand(); + return ret % (to - from + 1) + from; + } RandomNumberGenerator(); }; |