Noise::gen -> Noise::fbm

artfwo · May 27, 2018 · fdf4ecc · fdf4ecc
1 parent 3b1c80c
commit fdf4ecc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/Source/AndesVoice.cpp b/Source/AndesVoice.cpp
@@ -90,7 +90,7 @@ void AndesVoice::renderNextBlock(AudioSampleBuffer& outputBuffer, int startSampl
         {
             float phase = fmod(currentPhase, 2);
             const float envLevel = envGen.next();
-            const float currentSample = processor.noise.gen(phase,
+            const float currentSample = processor.noise.fbm(phase,
                                                             (int) *processor.parameters.getRawParameterValue("octaves"),
                                                             *processor.parameters.getRawParameterValue("persistence"),
                                                             *processor.parameters.getRawParameterValue("offset"),

diff --git a/Source/Noise.cpp b/Source/Noise.cpp
@@ -44,12 +44,7 @@ void Noise::setSeed(uint32_t seed)
     }
 }
 
-static inline float lerp(float a0, float a1, float w)
-{
-    return (1.0f - w) * a0 + w * a1;
-}
-
-float Noise::gen1(float z, float offset)
+float Noise::noise(float z, float offset)
 {
     float g1, g2, d2;
     float result = 0;
@@ -82,16 +77,16 @@ float Noise::gen1(float z, float offset)
     return result * 3.33; // temp normalization value
 }
 
-float Noise::gen(float z, int octaves, float persistence, float offset, float warping)
+float Noise::fbm(float z, int octaves, float persistence, float offset, float warping)
 {
     float result = 0;
     float multiplier = 1.0f;
-    float warpOffset = gen1(z, offset) * warping;
+    float warpOffset = noise(z, offset) * warping;
 
     for (int octave = 0; octave < octaves; ++octave)
     {
         float t = fmod(offset, 4);
-        float value = gen1(z * (1 << octave) + warpOffset, t) * multiplier;
+        float value = noise(z * (1 << octave) + warpOffset, t) * multiplier;
         warpOffset = value * warping;
         result += value;
         multiplier *= persistence;

diff --git a/Source/Noise.h b/Source/Noise.h
@@ -26,7 +26,7 @@ class Noise
     Noise();
     ~Noise();
 
-    float gen(float z, int octaves, float persistence, float offset, float warping);
+    float fbm(float z, int octaves, float persistence, float offset, float warping);
 
     uint32_t getSeed();
     void setSeed(uint32_t seed);
@@ -36,5 +36,5 @@ class Noise
     std::mt19937 random;
     uint32_t seed_;
 
-    float gen1(float z, float offset);
+    float noise(float z, float offset);
 };
diff --git a/Source/WaveformVisualiser.cpp b/Source/WaveformVisualiser.cpp
@@ -55,7 +55,7 @@ void WaveformVisualiser::paint(Graphics& g)
     {
         float z = ((float) i) / ((float) w) * 2.0f;
 
-        p.lineTo(i, h / 2 - (processor.noise.gen(
+        p.lineTo(i, h / 2 - (processor.noise.fbm(
             z,
             (int) *processor.parameters.getRawParameterValue("octaves"),
             *processor.parameters.getRawParameterValue("persistence"),