Added configurable ambient_occlusion_gamma. Default is 2.2 (same as previous hardcode...

[dragonfireclient.git] / src / noise.cpp

diff --git a/src/noise.cpp b/src/noise.cpp
index 0d8b118aa8d88b602089b8192dc24921260653c8..5223450dcf25f1d6a06fd64babce115c469d44c7 100644 (file)
--- a/src/noise.cpp
+++ b/src/noise.cpp
@@ -314,7 +314,60 @@ float contour(float v)
 }
 
 
-///////////////////////// [ New perlin stuff ] ////////////////////////////
+///////////////////////// [ New noise ] ////////////////////////////
+
+
+float NoisePerlin2D(NoiseParams *np, float x, float y, int seed)
+{
+       float a = 0;
+       float f = 1.0;
+       float g = 1.0;
+
+       x /= np->spread.X;
+       y /= np->spread.Y;
+       seed += np->seed;
+
+       for (size_t i = 0; i < np->octaves; i++) {
+               float noiseval = noise2d_gradient(x * f, y * f, seed + i,
+                       np->flags & (NOISE_FLAG_DEFAULTS | NOISE_FLAG_EASED));
+
+               if (np->flags & NOISE_FLAG_ABSVALUE)
+                       noiseval = fabs(noiseval);
+
+               a += g * noiseval;
+               f *= np->lacunarity;
+               g *= np->persist;
+       }
+
+       return np->offset + a * np->scale;
+}
+
+
+float NoisePerlin3D(NoiseParams *np, float x, float y, float z, int seed)
+{
+       float a = 0;
+       float f = 1.0;
+       float g = 1.0;
+
+       x /= np->spread.X;
+       y /= np->spread.Y;
+       z /= np->spread.Z;
+       seed += np->seed;
+
+       for (size_t i = 0; i < np->octaves; i++) {
+               float noiseval = noise3d_gradient(x * f, y * f, z * f, seed + i,
+                       np->flags & NOISE_FLAG_EASED);
+
+               if (np->flags & NOISE_FLAG_ABSVALUE)
+                       noiseval = fabs(noiseval);
+
+               a += g * noiseval;
+               f *= np->lacunarity;
+               g *= np->persist;
+       }
+
+       return np->offset + a * np->scale;
+}
 
 
 Noise::Noise(NoiseParams *np_, int seed, int sx, int sy, int sz)
@@ -329,12 +382,6 @@ Noise::Noise(NoiseParams *np_, int seed, int sx, int sy, int sz)
        this->gradient_buf = NULL;
        this->result       = NULL;
 
-       if (np.flags & NOISE_FLAG_DEFAULTS) {
-               // By default, only 2d noise is eased.
-               if (sz <= 1)
-                       np.flags |= NOISE_FLAG_EASED;
-       }
-
        allocBuffers();
 }
 
@@ -440,7 +487,8 @@ void Noise::gradientMap2D(
        int index, i, j, x0, y0, noisex, noisey;
        int nlx, nly;
 
-       Interp2dFxn interpolate = (np.flags & NOISE_FLAG_EASED) ?
+       bool eased = np.flags & (NOISE_FLAG_DEFAULTS | NOISE_FLAG_EASED);
+       Interp2dFxn interpolate = eased ?
                biLinearInterpolation : biLinearInterpolationNoEase;
 
        x0 = floor(x);
@@ -611,6 +659,11 @@ float *Noise::perlinMap2D(float x, float y, float *persistence_map)
                g *= np.persist;
        }
 
+       if (fabs(np.offset - 0.f) > 0.00001 || fabs(np.scale - 1.f) > 0.00001) {
+               for (size_t i = 0; i != bufsize; i++)
+                       result[i] = result[i] * np.scale + np.offset;
+       }
+
        return result;
 }
 
@@ -644,6 +697,11 @@ float *Noise::perlinMap3D(float x, float y, float z, float *persistence_map)
                g *= np.persist;
        }
 
+       if (fabs(np.offset - 0.f) > 0.00001 || fabs(np.scale - 1.f) > 0.00001) {
+               for (size_t i = 0; i != bufsize; i++)
+                       result[i] = result[i] * np.scale + np.offset;
+       }
+
        return result;
 }
 
@@ -675,16 +733,3 @@ void Noise::updateResults(float g, float *gmap,
                }
        }
 }
-
-
-void Noise::transformNoiseMap()
-{
-       // Because sx, sy, and sz are object members whose values may conceivably be
-       // modified in other threads. gcc (at least) will consider the buffer size
-       // computation as invalidated between loop comparisons, resulting in a ~2x
-       // slowdown even with -O2.  To prevent this, store the value in a local.
-       size_t bufsize = sx * sy * sz;
-       for (size_t i = 0; i != bufsize; i++)
-               result[i] = result[i] * np.scale + np.offset;
-}
-