godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #61094 from Geometror/fix-fnlite-dw-fractal-type-property

This commit is contained in:
Rémi Verschelde 2022-05-16 21:15:47 +02:00 committed by GitHub
parent 61710d823d 1684459a3a
commit 3b60c374a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
modules/noise/fastnoise_lite.cpp
View File

@ -30,6 +30,24 @@
#include "fastnoise_lite.h"
_FastNoiseLite::FractalType FastNoiseLite::_convert_domain_warp_fractal_type_enum(DomainWarpFractalType p_domain_warp_fractal_type) {
_FastNoiseLite::FractalType type;
switch (p_domain_warp_fractal_type) {
case DOMAIN_WARP_FRACTAL_NONE:
type = _FastNoiseLite::FractalType_None;
break;
case DOMAIN_WARP_FRACTAL_PROGRESSIVE:
type = _FastNoiseLite::FractalType_DomainWarpProgressive;
break;
case DOMAIN_WARP_FRACTAL_INDEPENDENT:
type = _FastNoiseLite::FractalType_DomainWarpIndependent;
break;
default:
type = _FastNoiseLite::FractalType_None;
}
return type;
}
FastNoiseLite::FastNoiseLite() {
_noise.SetNoiseType((_FastNoiseLite::NoiseType)noise_type);
_noise.SetSeed(seed);
@ -50,7 +68,7 @@ FastNoiseLite::FastNoiseLite() {
_domain_warp_noise.SetSeed(seed);
_domain_warp_noise.SetDomainWarpAmp(domain_warp_amplitude);
_domain_warp_noise.SetFrequency(domain_warp_frequency);
_domain_warp_noise.SetFractalType(_FastNoiseLite::FractalType_None);
_domain_warp_noise.SetFractalType(_convert_domain_warp_fractal_type_enum(domain_warp_fractal_type));
_domain_warp_noise.SetFractalOctaves(domain_warp_fractal_octaves);
_domain_warp_noise.SetFractalLacunarity(domain_warp_fractal_lacunarity);
_domain_warp_noise.SetFractalGain(domain_warp_fractal_gain);
@ -241,23 +259,7 @@ real_t FastNoiseLite::get_domain_warp_frequency() const {
void FastNoiseLite::set_domain_warp_fractal_type(DomainWarpFractalType p_domain_warp_fractal_type) {
domain_warp_fractal_type = p_domain_warp_fractal_type;
// This needs manual conversion because Godots Inspector property API does not support discontiguous enum indices.
_FastNoiseLite::FractalType type;
switch (p_domain_warp_fractal_type) {
case DOMAIN_WARP_FRACTAL_NONE:
type = _FastNoiseLite::FractalType_None;
break;
case DOMAIN_WARP_FRACTAL_PROGRESSIVE:
type = _FastNoiseLite::FractalType_DomainWarpProgressive;
break;
case DOMAIN_WARP_FRACTAL_INDEPENDENT:
type = _FastNoiseLite::FractalType_DomainWarpIndependent;
break;
default:
type = _FastNoiseLite::FractalType_None;
}
_domain_warp_noise.SetFractalType(type);
_domain_warp_noise.SetFractalType(_convert_domain_warp_fractal_type_enum(p_domain_warp_fractal_type));
emit_changed();
}

3
modules/noise/fastnoise_lite.h
View File

@ -127,6 +127,9 @@ private:
real_t domain_warp_fractal_lacunarity = 6;
real_t domain_warp_fractal_gain = 0.5;
// This needs manual conversion because Godots Inspector property API does not support discontiguous enum indices.
_FastNoiseLite::FractalType _convert_domain_warp_fractal_type_enum(DomainWarpFractalType p_domain_warp_fractal_type);
public:
FastNoiseLite();
~FastNoiseLite();