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

Merge pull request #43409 from bruvzg/sync_open_simplex_noise

Browse source 
Update "open-simplex-noise-in-c" to fix undefined signed overflow
This commit is contained in:
Rémi Verschelde 2020-11-09 14:29:08 +01:00 committed by GitHub
commit eda8f69c19
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
thirdparty/README.md vendored
View file

@ -378,7 +378,7 @@ Collection of single-file libraries used in Godot components.
* License: Apache 2.0
- `open-simplex-noise.{c,h}`
* Upstream: https://github.com/smcameron/open-simplex-noise-in-c
* Version: git (0d555e7f40527d0870906fe9469a3b1bb4020b7f, 2015) + custom changes
* Version: git (0fef0dbedd76f767da7e3c894822729d0f07e54d, 2020) + custom changes
* License: Unlicense
- `pcg.{cpp,h}`
* Upstream: http://www.pcg-random.org

11
thirdparty/misc/open-simplex-noise.c vendored
View file

@ -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];