diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-11-09 14:29:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-09 14:29:08 +0100 |
| commit | eda8f69c19ffaa219bdb0afe67dfb7df17a46d1c (patch) | |
| tree | 3920fa0cb5dbdf275f9fa49ed046f53f7325ecae /thirdparty/misc | |
| parent | 593e35346ab182c36068c3dcfc741eeb7311a19e (diff) | |
| parent | 70bdf0ecf2e0f372f1258cd4fe8a72d3c5280611 (diff) | |
Merge pull request #43409 from bruvzg/sync_open_simplex_noise
Update "open-simplex-noise-in-c" to fix undefined signed overflow
Diffstat (limited to 'thirdparty/misc')
| -rw-r--r-- | thirdparty/misc/open-simplex-noise.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/thirdparty/misc/open-simplex-noise.c b/thirdparty/misc/open-simplex-noise.c index 42f2fbb5be..88fbd3e51d 100644 --- a/thirdparty/misc/open-simplex-noise.c +++ b/thirdparty/misc/open-simplex-noise.c @@ -189,14 +189,15 @@ int open_simplex_noise(int64_t seed, struct osn_context *ctx) permGradIndex3D = ctx->permGradIndex3D; // -- GODOT end -- + uint64_t seedU = seed; for (i = 0; i < 256; i++) source[i] = (int16_t) i; - seed = seed * 6364136223846793005LL + 1442695040888963407LL; - seed = seed * 6364136223846793005LL + 1442695040888963407LL; - seed = seed * 6364136223846793005LL + 1442695040888963407LL; + seedU = seedU * 6364136223846793005ULL + 1442695040888963407ULL; + seedU = seedU * 6364136223846793005ULL + 1442695040888963407ULL; + seedU = seedU * 6364136223846793005ULL + 1442695040888963407ULL; for (i = 255; i >= 0; i--) { - seed = seed * 6364136223846793005LL + 1442695040888963407LL; - r = (int)((seed + 31) % (i + 1)); + seedU = seedU * 6364136223846793005ULL + 1442695040888963407ULL; + r = (int)((seedU + 31) % (i + 1)); if (r < 0) r += (i + 1); perm[i] = source[r]; |