Merge pull request #44862 from Calinou/opensimplex-no-max-octaves-define

Use `static const int` instead of `#define` for OpenSimplexNoise octaves
This commit is contained in:
Rémi Verschelde 2021-01-01 22:26:50 +01:00 committed by GitHub
commit 3e10962dbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -37,15 +37,15 @@
#include "thirdparty/misc/open-simplex-noise.h"
// The maximum number of octaves allowed. Note that these are statically allocated.
// Higher values become exponentially slower, so this shouldn't be set too high
// to avoid freezing the editor for long periods of time.
#define MAX_OCTAVES 9
class OpenSimplexNoise : public Resource {
GDCLASS(OpenSimplexNoise, Resource);
OBJ_SAVE_TYPE(OpenSimplexNoise);
// The maximum number of octaves allowed. Note that these are statically allocated.
// Higher values become exponentially slower, so this shouldn't be set too high
// to avoid freezing the editor for long periods of time.
static const int MAX_OCTAVES = 9;
osn_context contexts[MAX_OCTAVES];
int seed;