Cleanup: BLI_noise

Use common prefix as this collided with existing API's (eg BLI_voronoi).

Also expand some non-obvious abbreviations:

- 'g'  -> 'generic'
- 'vl' -> 'variable_lacunarity'
- 'V'  -> 'v3'

1 files changed, 41 insertions, 39 deletions

diff --git a/source/blender/blenlib/BLI_noise.h b/source/blender/blenlib/BLI_noise.h
index 8cb30ef62c8..4a41ee68ca9 100644
--- a/source/blender/blenlib/BLI_noise.h
+++ b/source/blender/blenlib/BLI_noise.h
@@ -28,52 +28,54 @@ extern "C" {
 #endif
 
 /* noise.h: */
-float BLI_hnoise(float noisesize, float x, float y, float z);
-float BLI_hnoisep(float noisesize, float x, float y, float z);
-float BLI_turbulence(float noisesize, float x, float y, float z, int nr);
+float BLI_noise_hnoise(float noisesize, float x, float y, float z);
+float BLI_noise_hnoisep(float noisesize, float x, float y, float z);
+float BLI_noise_turbulence(float noisesize, float x, float y, float z, int nr);
 /* newnoise: generic noise & turbulence functions
- * to replace the above BLI_hnoise/p & BLI_turbulence/1.
+ * to replace the above BLI_noise_hnoise/p & BLI_noise_turbulence/1.
  * This is done so different noise basis functions can be used */
-float BLI_gNoise(float noisesize, float x, float y, float z, int hard, int noisebasis);
-float BLI_gTurbulence(
+float BLI_noise_generic_noise(
+    float noisesize, float x, float y, float z, int hard, int noisebasis);
+float BLI_noise_generic_turbulence(
     float noisesize, float x, float y, float z, int oct, int hard, int noisebasis);
 /* newnoise: musgrave functions */
-float BLI_mg_fBm(
+float BLI_noise_mg_fbm(
     float x, float y, float z, float H, float lacunarity, float octaves, int noisebasis);
-float BLI_mg_MultiFractal(
+float BLI_noise_mg_multi_fractal(
     float x, float y, float z, float H, float lacunarity, float octaves, int noisebasis);
-float BLI_mg_VLNoise(float x, float y, float z, float distortion, int nbas1, int nbas2);
-float BLI_mg_HeteroTerrain(float x,
-                           float y,
-                           float z,
-                           float H,
-                           float lacunarity,
-                           float octaves,
-                           float offset,
-                           int noisebasis);
-float BLI_mg_HybridMultiFractal(float x,
-                                float y,
-                                float z,
-                                float H,
-                                float lacunarity,
-                                float octaves,
-                                float offset,
-                                float gain,
-                                int noisebasis);
-float BLI_mg_RidgedMultiFractal(float x,
-                                float y,
-                                float z,
-                                float H,
-                                float lacunarity,
-                                float octaves,
-                                float offset,
-                                float gain,
-                                int noisebasis);
+float BLI_noise_mg_variable_lacunarity(
+    float x, float y, float z, float distortion, int nbas1, int nbas2);
+float BLI_noise_mg_hetero_terrain(float x,
+                                  float y,
+                                  float z,
+                                  float H,
+                                  float lacunarity,
+                                  float octaves,
+                                  float offset,
+                                  int noisebasis);
+float BLI_noise_mg_hybrid_multi_fractal(float x,
+                                        float y,
+                                        float z,
+                                        float H,
+                                        float lacunarity,
+                                        float octaves,
+                                        float offset,
+                                        float gain,
+                                        int noisebasis);
+float BLI_noise_mg_ridged_multi_fractal(float x,
+                                        float y,
+                                        float z,
+                                        float H,
+                                        float lacunarity,
+                                        float octaves,
+                                        float offset,
+                                        float gain,
+                                        int noisebasis);
 /* newnoise: voronoi */
-void BLI_voronoi(float x, float y, float z, float *da, float *pa, float me, int dtype);
-/* newnoise: BLI_cellNoise & BLI_cellNoiseV (for vector/point/color) */
-float BLI_cellNoise(float x, float y, float z);
-void BLI_cellNoiseV(float x, float y, float z, float r_ca[3]);
+void BLI_noise_voronoi(float x, float y, float z, float *da, float *pa, float me, int dtype);
+/* newnoise: BLI_noise_cell & BLI_noise_cell_v3 (for vector/point/color) */
+float BLI_noise_cell(float x, float y, float z);
+void BLI_noise_cell_v3(float x, float y, float z, float r_ca[3]);
 
 #ifdef __cplusplus
 }