From 2c903d0b8858b0ffc6b2100be12352585f6985c6 Mon Sep 17 00:00:00 2001 From: Jordan Peck Date: Fri, 3 Feb 2017 19:13:59 +0000 Subject: [PATCH] Renamed gradient to perlin, renamed position warp to perturb --- FastNoise.cpp | 160 +++++++++++++++++++++++++------------------------- FastNoise.h | 52 ++++++++-------- 2 files changed, 106 insertions(+), 106 deletions(-) diff --git a/FastNoise.cpp b/FastNoise.cpp index cba959f..c53dec6 100644 --- a/FastNoise.cpp +++ b/FastNoise.cpp @@ -315,17 +315,17 @@ float FastNoise::GetNoise(float x, float y, float z) default: return 0.0f; } - case Gradient: - return SingleGradient(0, x, y, z); - case GradientFractal: + case Perlin: + return SinglePerlin(0, x, y, z); + case PerlinFractal: switch (m_fractalType) { case FBM: - return SingleGradientFractalFBM(x, y, z); + return SinglePerlinFractalFBM(x, y, z); case Billow: - return SingleGradientFractalBillow(x, y, z); + return SinglePerlinFractalBillow(x, y, z); case RigidMulti: - return SingleGradientFractalRigidMulti(x, y, z); + return SinglePerlinFractalRigidMulti(x, y, z); default: return 0.0f; } @@ -381,17 +381,17 @@ float FastNoise::GetNoise(float x, float y) default: return 0.0f; } - case Gradient: - return SingleGradient(0, x, y); - case GradientFractal: + case Perlin: + return SinglePerlin(0, x, y); + case PerlinFractal: switch (m_fractalType) { case FBM: - return SingleGradientFractalFBM(x, y); + return SinglePerlinFractalFBM(x, y); case Billow: - return SingleGradientFractalBillow(x, y); + return SinglePerlinFractalBillow(x, y); case RigidMulti: - return SingleGradientFractalRigidMulti(x, y); + return SinglePerlinFractalRigidMulti(x, y); default: return 0.0f; } @@ -490,7 +490,7 @@ float FastNoise::SingleValueFractalFBM(float x, float y, float z) { float sum = SingleValue(m_perm[0], x, y, z); float amp = 1.0f; - unsigned int i = 0; + int i = 0; while (++i < m_octaves) { @@ -509,7 +509,7 @@ float FastNoise::SingleValueFractalBillow(float x, float y, float z) { float sum = FastAbs(SingleValue(m_perm[0], x, y, z)) * 2.0f - 1.0f; float amp = 1.0f; - unsigned int i = 0; + int i = 0; while (++i < m_octaves) { @@ -528,7 +528,7 @@ float FastNoise::SingleValueFractalRigidMulti(float x, float y, float z) { float sum = 1.0f - FastAbs(SingleValue(m_perm[0], x, y, z)); float amp = 1.0f; - unsigned int i = 0; + int i = 0; while (++i < m_octaves) { @@ -610,7 +610,7 @@ float FastNoise::SingleValueFractalFBM(float x, float y) { float sum = SingleValue(m_perm[0], x, y); float amp = 1.0f; - unsigned int i = 0; + int i = 0; while (++i < m_octaves) { @@ -628,7 +628,7 @@ float FastNoise::SingleValueFractalBillow(float x, float y) { float sum = FastAbs(SingleValue(m_perm[0], x, y)) * 2.0f - 1.0f; float amp = 1.0f; - unsigned int i = 0; + int i = 0; while (++i < m_octaves) { @@ -645,7 +645,7 @@ float FastNoise::SingleValueFractalRigidMulti(float x, float y) { float sum = 1.0f - FastAbs(SingleValue(m_perm[0], x, y)); float amp = 1.0f; - unsigned int i = 0; + int i = 0; while (++i < m_octaves) { @@ -694,8 +694,8 @@ float FastNoise::SingleValue(unsigned char offset, float x, float y) return Lerp(xf0, xf1, ys); } -// Gradient Noise -float FastNoise::GetGradientFractal(float x, float y, float z) +// Perlin Noise +float FastNoise::GetPerlinFractal(float x, float y, float z) { x *= m_frequency; y *= m_frequency; @@ -704,21 +704,21 @@ float FastNoise::GetGradientFractal(float x, float y, float z) switch (m_fractalType) { case FBM: - return SingleGradientFractalFBM(x, y, z); + return SinglePerlinFractalFBM(x, y, z); case Billow: - return SingleGradientFractalBillow(x, y, z); + return SinglePerlinFractalBillow(x, y, z); case RigidMulti: - return SingleGradientFractalRigidMulti(x, y, z); + return SinglePerlinFractalRigidMulti(x, y, z); default: return 0.0f; } } -float FastNoise::SingleGradientFractalFBM(float x, float y, float z) +float FastNoise::SinglePerlinFractalFBM(float x, float y, float z) { - float sum = SingleGradient(m_perm[0], x, y, z); + float sum = SinglePerlin(m_perm[0], x, y, z); float amp = 1.0f; - unsigned int i = 0; + int i = 0; while (++i < m_octaves) { @@ -727,17 +727,17 @@ float FastNoise::SingleGradientFractalFBM(float x, float y, float z) z *= m_lacunarity; amp *= m_gain; - sum += SingleGradient(m_perm[i], x, y, z) * amp; + sum += SinglePerlin(m_perm[i], x, y, z) * amp; } return sum * m_fractalBounding; } -float FastNoise::SingleGradientFractalBillow(float x, float y, float z) +float FastNoise::SinglePerlinFractalBillow(float x, float y, float z) { - float sum = FastAbs(SingleGradient(m_perm[0], x, y, z)) * 2.0f - 1.0f; + float sum = FastAbs(SinglePerlin(m_perm[0], x, y, z)) * 2.0f - 1.0f; float amp = 1.0f; - unsigned int i = 0; + int i = 0; while (++i < m_octaves) { @@ -746,17 +746,17 @@ float FastNoise::SingleGradientFractalBillow(float x, float y, float z) z *= m_lacunarity; amp *= m_gain; - sum += (FastAbs(SingleGradient(m_perm[i], x, y, z)) * 2.0f - 1.0f) * amp; + sum += (FastAbs(SinglePerlin(m_perm[i], x, y, z)) * 2.0f - 1.0f) * amp; } return sum * m_fractalBounding; } -float FastNoise::SingleGradientFractalRigidMulti(float x, float y, float z) +float FastNoise::SinglePerlinFractalRigidMulti(float x, float y, float z) { - float sum = 1.0f - FastAbs(SingleGradient(m_perm[0], x, y, z)); + float sum = 1.0f - FastAbs(SinglePerlin(m_perm[0], x, y, z)); float amp = 1.0f; - unsigned int i = 0; + int i = 0; while (++i < m_octaves) { @@ -765,18 +765,18 @@ float FastNoise::SingleGradientFractalRigidMulti(float x, float y, float z) z *= m_lacunarity; amp *= m_gain; - sum -= (1.0f - FastAbs(SingleGradient(m_perm[i], x, y, z))) * amp; + sum -= (1.0f - FastAbs(SinglePerlin(m_perm[i], x, y, z))) * amp; } return sum; } -float FastNoise::GetGradient(float x, float y, float z) +float FastNoise::GetPerlin(float x, float y, float z) { - return SingleGradient(0, x * m_frequency, y * m_frequency, z * m_frequency); + return SinglePerlin(0, x * m_frequency, y * m_frequency, z * m_frequency); } -float FastNoise::SingleGradient(unsigned char offset, float x, float y, float z) +float FastNoise::SinglePerlin(unsigned char offset, float x, float y, float z) { int x0 = FastFloor(x); int y0 = FastFloor(y); @@ -823,7 +823,7 @@ float FastNoise::SingleGradient(unsigned char offset, float x, float y, float z) return Lerp(yf0, yf1, zs); } -float FastNoise::GetGradientFractal(float x, float y) +float FastNoise::GetPerlinFractal(float x, float y) { x *= m_frequency; y *= m_frequency; @@ -831,21 +831,21 @@ float FastNoise::GetGradientFractal(float x, float y) switch (m_fractalType) { case FBM: - return SingleGradientFractalFBM(x, y); + return SinglePerlinFractalFBM(x, y); case Billow: - return SingleGradientFractalBillow(x, y); + return SinglePerlinFractalBillow(x, y); case RigidMulti: - return SingleGradientFractalRigidMulti(x, y); + return SinglePerlinFractalRigidMulti(x, y); default: return 0.0f; } } -float FastNoise::SingleGradientFractalFBM(float x, float y) +float FastNoise::SinglePerlinFractalFBM(float x, float y) { - float sum = SingleGradient(m_perm[0], x, y); + float sum = SinglePerlin(m_perm[0], x, y); float amp = 1.0f; - unsigned int i = 0; + int i = 0; while (++i < m_octaves) { @@ -853,17 +853,17 @@ float FastNoise::SingleGradientFractalFBM(float x, float y) y *= m_lacunarity; amp *= m_gain; - sum += SingleGradient(m_perm[i], x, y) * amp; + sum += SinglePerlin(m_perm[i], x, y) * amp; } return sum * m_fractalBounding; } -float FastNoise::SingleGradientFractalBillow(float x, float y) +float FastNoise::SinglePerlinFractalBillow(float x, float y) { - float sum = FastAbs(SingleGradient(m_perm[0], x, y)) * 2.0f - 1.0f; + float sum = FastAbs(SinglePerlin(m_perm[0], x, y)) * 2.0f - 1.0f; float amp = 1.0f; - unsigned int i = 0; + int i = 0; while (++i < m_octaves) { @@ -871,17 +871,17 @@ float FastNoise::SingleGradientFractalBillow(float x, float y) y *= m_lacunarity; amp *= m_gain; - sum += (FastAbs(SingleGradient(m_perm[i], x, y)) * 2.0f - 1.0f) * amp; + sum += (FastAbs(SinglePerlin(m_perm[i], x, y)) * 2.0f - 1.0f) * amp; } return sum * m_fractalBounding; } -float FastNoise::SingleGradientFractalRigidMulti(float x, float y) +float FastNoise::SinglePerlinFractalRigidMulti(float x, float y) { - float sum = 1.0f - FastAbs(SingleGradient(m_perm[0], x, y)); + float sum = 1.0f - FastAbs(SinglePerlin(m_perm[0], x, y)); float amp = 1.0f; - unsigned int i = 0; + int i = 0; while (++i < m_octaves) { @@ -889,18 +889,18 @@ float FastNoise::SingleGradientFractalRigidMulti(float x, float y) y *= m_lacunarity; amp *= m_gain; - sum -= (1.0f - FastAbs(SingleGradient(m_perm[i], x, y))) * amp; + sum -= (1.0f - FastAbs(SinglePerlin(m_perm[i], x, y))) * amp; } return sum; } -float FastNoise::GetGradient(float x, float y) +float FastNoise::GetPerlin(float x, float y) { - return SingleGradient(0, x * m_frequency, y * m_frequency); + return SinglePerlin(0, x * m_frequency, y * m_frequency); } -float FastNoise::SingleGradient(unsigned char offset, float x, float y) +float FastNoise::SinglePerlin(unsigned char offset, float x, float y) { int x0 = FastFloor(x); int y0 = FastFloor(y); @@ -960,7 +960,7 @@ float FastNoise::SingleSimplexFractalFBM(float x, float y, float z) { float sum = SingleSimplex(m_perm[0], x, y, z); float amp = 1.0f; - unsigned int i = 0; + int i = 0; while (++i < m_octaves) { @@ -979,7 +979,7 @@ float FastNoise::SingleSimplexFractalBillow(float x, float y, float z) { float sum = FastAbs(SingleSimplex(m_perm[0], x, y, z)) * 2.0f - 1.0f; float amp = 1.0f; - unsigned int i = 0; + int i = 0; while (++i < m_octaves) { @@ -998,7 +998,7 @@ float FastNoise::SingleSimplexFractalRigidMulti(float x, float y, float z) { float sum = 1.0f - FastAbs(SingleSimplex(m_perm[0], x, y, z)); float amp = 1.0f; - unsigned int i = 0; + int i = 0; while (++i < m_octaves) { @@ -1140,7 +1140,7 @@ float FastNoise::SingleSimplexFractalFBM(float x, float y) { float sum = SingleSimplex(m_perm[0], x, y); float amp = 1.0f; - unsigned int i = 0; + int i = 0; while (++i < m_octaves) { @@ -1158,7 +1158,7 @@ float FastNoise::SingleSimplexFractalBillow(float x, float y) { float sum = FastAbs(SingleSimplex(m_perm[0], x, y)) * 2.0f - 1.0f; float amp = 1.0f; - unsigned int i = 0; + int i = 0; while (++i < m_octaves) { @@ -1176,7 +1176,7 @@ float FastNoise::SingleSimplexFractalRigidMulti(float x, float y) { float sum = 1.0f - FastAbs(SingleSimplex(m_perm[0], x, y)); float amp = 1.0f; - unsigned int i = 0; + int i = 0; while (++i < m_octaves) { @@ -1194,7 +1194,7 @@ float FastNoise::SingleSimplexFractalBlend(float x, float y) { float sum = SingleSimplex(m_perm[0], x, y); float amp = 1.0f; - unsigned int i = 0; + int i = 0; while (++i < m_octaves) { @@ -1800,28 +1800,28 @@ float FastNoise::SingleCellular2Edge(float x, float y) } } -void FastNoise::PositionWarp(float& x, float& y, float& z) +void FastNoise::Perturb(float& x, float& y, float& z) { - SinglePositionWarp(0, m_positionWarpAmp, m_frequency, x, y, z); + SinglePerturb(0, m_perturbAmp, m_frequency, x, y, z); } -void FastNoise::PositionWarpFractal(float& x, float& y, float& z) +void FastNoise::PerturbFractal(float& x, float& y, float& z) { - float amp = m_positionWarpAmp * m_fractalBounding; + float amp = m_perturbAmp * m_fractalBounding; float freq = m_frequency; - unsigned int i = 0; + int i = 0; - SinglePositionWarp(m_perm[0], amp, m_frequency, x, y, z); + SinglePerturb(m_perm[0], amp, m_frequency, x, y, z); while (++i < m_octaves) { freq *= m_lacunarity; amp *= m_gain; - SinglePositionWarp(m_perm[i], amp, freq, x, y, z); + SinglePerturb(m_perm[i], amp, freq, x, y, z); } } -void FastNoise::SinglePositionWarp(unsigned char offset, float warpAmp, float frequency, float& x, float& y, float& z) +void FastNoise::SinglePerturb(unsigned char offset, float warpAmp, float frequency, float& x, float& y, float& z) { float xf = x * frequency; float yf = y * frequency; @@ -1892,28 +1892,28 @@ void FastNoise::SinglePositionWarp(unsigned char offset, float warpAmp, float fr z += Lerp(lz0y, Lerp(lz0x, lz1x, ys), zs) * warpAmp; } -void FastNoise::PositionWarp(float& x, float& y) +void FastNoise::Perturb(float& x, float& y) { - SinglePositionWarp(0, m_positionWarpAmp, m_frequency, x, y); + SinglePerturb(0, m_perturbAmp, m_frequency, x, y); } -void FastNoise::PositionWarpFractal(float& x, float& y) +void FastNoise::PerturbFractal(float& x, float& y) { - float amp = m_positionWarpAmp * m_fractalBounding; + float amp = m_perturbAmp * m_fractalBounding; float freq = m_frequency; - unsigned int i = 0; + int i = 0; - SinglePositionWarp(m_perm[0], amp, m_frequency, x, y); + SinglePerturb(m_perm[0], amp, m_frequency, x, y); while (++i < m_octaves) { freq *= m_lacunarity; amp *= m_gain; - SinglePositionWarp(m_perm[i], amp, freq, x, y); + SinglePerturb(m_perm[i], amp, freq, x, y); } } -void FastNoise::SinglePositionWarp(unsigned char offset, float warpAmp, float frequency, float& x, float& y) +void FastNoise::SinglePerturb(unsigned char offset, float warpAmp, float frequency, float& x, float& y) { float xf = x * frequency; float yf = y * frequency; diff --git a/FastNoise.h b/FastNoise.h index 1fc06e1..87ab4dd 100644 --- a/FastNoise.h +++ b/FastNoise.h @@ -35,7 +35,7 @@ class FastNoise FastNoise(int seed = 1337) { SetSeed(seed); CalculateFractalBounding(); }; ~FastNoise() { delete m_cellularNoiseLookup; } - enum NoiseType { Value, ValueFractal, Gradient, GradientFractal, Simplex, SimplexFractal, Cellular, WhiteNoise }; + enum NoiseType { Value, ValueFractal, Perlin, PerlinFractal, Simplex, SimplexFractal, Cellular, WhiteNoise }; enum Interp { Linear, Hermite, Quintic }; enum FractalType { FBM, Billow, RigidMulti }; enum CellularDistanceFunction { Euclidean, Manhattan, Natural }; @@ -57,7 +57,7 @@ class FastNoise // - Linear // - Hermite // - Quintic - // Used in Value, Gradient Noise and Position Warping + // Used in Value, Perlin Noise and Position Warping // Default: Quintic void SetInterp(Interp interp) { m_interp = interp; } @@ -67,7 +67,7 @@ class FastNoise // Sets octave count for all fractal noise types // Default: 3 - void SetFractalOctaves(unsigned int octaves) { m_octaves = octaves; CalculateFractalBounding(); } + void SetFractalOctaves(int octaves) { m_octaves = octaves; CalculateFractalBounding(); } // Sets octave lacunarity for all fractal noise types // Default: 2.0 @@ -91,19 +91,19 @@ class FastNoise void SetCellularReturnType(CellularReturnType cellularReturnType) { m_cellularReturnType = cellularReturnType; } // Noise used to calculate a cell value if cellular return type is NoiseLookup - // The lookup value is acquired through GetNoise() so ensure you SetNoiseType() on the noise lookup, value, gradient or simplex is recommended + // The lookup value is acquired through GetNoise() so ensure you SetNoiseType() on the noise lookup, value, Perlin or simplex is recommended void SetCellularNoiseLookup(FastNoise* noise) { m_cellularNoiseLookup = noise; } - // Sets the maximum warp distance from original location when using PositionWarp{Fractal}(...) + // Sets the maximum warp distance from original location when using Perturb{Fractal}(...) // Default: 1.0 - void SetPositionWarpAmp(float positionWarpAmp) { m_positionWarpAmp = positionWarpAmp / 0.45f; } + void SetPerturbAmp(float perturbAmp) { m_perturbAmp = perturbAmp / 0.45f; } //2D float GetValue(float x, float y); float GetValueFractal(float x, float y); - float GetGradient(float x, float y); - float GetGradientFractal(float x, float y); + float GetPerlin(float x, float y); + float GetPerlinFractal(float x, float y); float GetSimplex(float x, float y); float GetSimplexFractal(float x, float y); @@ -115,15 +115,15 @@ class FastNoise float GetNoise(float x, float y); - void PositionWarp(float& x, float& y); - void PositionWarpFractal(float& x, float& y); + void Perturb(float& x, float& y); + void PerturbFractal(float& x, float& y); //3D float GetValue(float x, float y, float z); float GetValueFractal(float x, float y, float z); - float GetGradient(float x, float y, float z); - float GetGradientFractal(float x, float y, float z); + float GetPerlin(float x, float y, float z); + float GetPerlinFractal(float x, float y, float z); float GetSimplex(float x, float y, float z); float GetSimplexFractal(float x, float y, float z); @@ -135,8 +135,8 @@ class FastNoise float GetNoise(float x, float y, float z); - void PositionWarp(float& x, float& y, float& z); - void PositionWarpFractal(float& x, float& y, float& z); + void Perturb(float& x, float& y, float& z); + void PerturbFractal(float& x, float& y, float& z); //4D float GetSimplex(float x, float y, float z, float w); @@ -153,7 +153,7 @@ class FastNoise Interp m_interp = Quintic; NoiseType m_noiseType = Simplex; - unsigned int m_octaves = 3; + int m_octaves = 3; float m_lacunarity = 2.0f; float m_gain = 0.5f; FractalType m_fractalType = FBM; @@ -175,7 +175,7 @@ class FastNoise CellularReturnType m_cellularReturnType = CellValue; FastNoise* m_cellularNoiseLookup = nullptr; - float m_positionWarpAmp = 1.0f / 0.45f; + float m_perturbAmp = 1.0f / 0.45f; //2D float SingleValueFractalFBM(float x, float y); @@ -183,10 +183,10 @@ class FastNoise float SingleValueFractalRigidMulti(float x, float y); float SingleValue(unsigned char offset, float x, float y); - float SingleGradientFractalFBM(float x, float y); - float SingleGradientFractalBillow(float x, float y); - float SingleGradientFractalRigidMulti(float x, float y); - float SingleGradient(unsigned char offset, float x, float y); + float SinglePerlinFractalFBM(float x, float y); + float SinglePerlinFractalBillow(float x, float y); + float SinglePerlinFractalRigidMulti(float x, float y); + float SinglePerlin(unsigned char offset, float x, float y); float SingleSimplexFractalFBM(float x, float y); float SingleSimplexFractalBillow(float x, float y); @@ -197,7 +197,7 @@ class FastNoise float SingleCellular(float x, float y); float SingleCellular2Edge(float x, float y); - void SinglePositionWarp(unsigned char offset, float warpAmp, float frequency, float& x, float& y); + void SinglePerturb(unsigned char offset, float warpAmp, float frequency, float& x, float& y); //3D float SingleValueFractalFBM(float x, float y, float z); @@ -205,10 +205,10 @@ class FastNoise float SingleValueFractalRigidMulti(float x, float y, float z); float SingleValue(unsigned char offset, float x, float y, float z); - float SingleGradientFractalFBM(float x, float y, float z); - float SingleGradientFractalBillow(float x, float y, float z); - float SingleGradientFractalRigidMulti(float x, float y, float z); - float SingleGradient(unsigned char offset, float x, float y, float z); + float SinglePerlinFractalFBM(float x, float y, float z); + float SinglePerlinFractalBillow(float x, float y, float z); + float SinglePerlinFractalRigidMulti(float x, float y, float z); + float SinglePerlin(unsigned char offset, float x, float y, float z); float SingleSimplexFractalFBM(float x, float y, float z); float SingleSimplexFractalBillow(float x, float y, float z); @@ -218,7 +218,7 @@ class FastNoise float SingleCellular(float x, float y, float z); float SingleCellular2Edge(float x, float y, float z); - void SinglePositionWarp(unsigned char offset, float warpAmp, float frequency, float& x, float& y, float& z); + void SinglePerturb(unsigned char offset, float warpAmp, float frequency, float& x, float& y, float& z); //4D float SingleSimplex(unsigned char offset, float x, float y, float z, float w);