diff --git a/fastnoise_noise_params.cpp b/fastnoise_noise_params.cpp index 0e07d79..f6def3f 100644 --- a/fastnoise_noise_params.cpp +++ b/fastnoise_noise_params.cpp @@ -1,5 +1,11 @@ #include "fastnoise_noise_params.h" +#include "core/version.h" + +#if VERSION_MAJOR >= 4 +#define REAL FLOAT +#endif + void FastnoiseNoiseParams::setup_noise(Ref noise) { noise->set_seed(_seed); noise->set_noise_type(_noise_type); diff --git a/lib/FastNoise.cpp b/lib/FastNoise.cpp index f1ede18..bb3601f 100644 --- a/lib/FastNoise.cpp +++ b/lib/FastNoise.cpp @@ -34,6 +34,16 @@ #include #include +#include "core/version.h" + +#if VERSION_MAJOR >= 4 + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wunused-function" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#endif + namespace fastnoise { const FN_DECIMAL GRAD_X[] = @@ -2258,3 +2268,10 @@ void FastNoise::SingleGradientPerturb(unsigned char offset, FN_DECIMAL warpAmp, } } // namespace fastnoise + + + +#if VERSION_MAJOR >= 4 + +#pragma GCC diagnostic pop +#endif \ No newline at end of file diff --git a/noise.h b/noise.h index 3e81859..cf9823f 100644 --- a/noise.h +++ b/noise.h @@ -6,6 +6,14 @@ #include "core/ustring.h" +#include "core/version.h" + +#if VERSION_MAJOR < 4 +#include "core/pool_vector.h" +#else +typedef PackedInt64Array PoolIntArray; +#endif + typedef fastnoise::FastNoise _FastNoise; class FastNoise : public Reference {