Fix memory leaks due to messed up memory handling for particles as well as their...

[minetest.git] / src / noise.h

diff --git a/src/noise.h b/src/noise.h
index 1f7bdbbf46e025ceb8943a5c5073898945d0a103..05c877b3237c6b0f66a90d0a0465792250094737 100644 (file)
--- a/src/noise.h
+++ b/src/noise.h
@@ -30,6 +30,8 @@
 #include "irr_v3d.h"
 #include "util/string.h"
 
+#define PSEUDORANDOM_MAX 32767
+
 extern FlagDesc flagdesc_noiseparams[];
 
 class PseudoRandom
@@ -45,15 +47,15 @@ class PseudoRandom
        {
                m_next = seed;
        }
-       // Returns 0...32767
+       // Returns 0...PSEUDORANDOM_MAX
        int next()
        {
                m_next = m_next * 1103515245 + 12345;
-               return((unsigned)(m_next/65536) % 32768);
+               return((unsigned)(m_next/65536) % (PSEUDORANDOM_MAX + 1));
        }
        int range(int min, int max)
        {
-               if(max-min > 32768/10)
+               if (max-min > (PSEUDORANDOM_MAX + 1) / 10)
                {
                        //dstream<<"WARNING: PseudoRandom::range: max > 32767"<<std::endl;
                        assert(0);
@@ -122,13 +124,14 @@ struct NoiseParams {
 
 class Noise {
 public:
-       NoiseParams *np;
+       NoiseParams np;
        int seed;
        int sx;
        int sy;
        int sz;
-       float *noisebuf;
-       float *buf;
+       float *noise_buf;
+       float *gradient_buf;
+       float *persist_buf;
        float *result;
 
        Noise(NoiseParams *np, int seed, int sx, int sy, int sz=1);
@@ -137,7 +140,6 @@ class Noise {
        void setSize(int sx, int sy, int sz=1);
        void setSpreadFactor(v3f spread);
        void setOctaves(int octaves);
-       void resizeNoiseBuf(bool is3d);
 
        void gradientMap2D(
                float x, float y,
@@ -151,10 +153,54 @@ class Noise {
        float *perlinMap2D(float x, float y, float *persistence_map=NULL);
        float *perlinMap3D(float x, float y, float z, float *persistence_map=NULL);
 
+       inline float *perlinMap2D_PO(float x, float xoff, float y, float yoff,
+               float *persistence_map=NULL)
+       {
+               return perlinMap2D(
+                       x + xoff * np.spread.X,
+                       y + yoff * np.spread.Y,
+                       persistence_map);
+       }
+
+       inline float *perlinMap3D_PO(float x, float xoff, float y, float yoff,
+               float z, float zoff, float *persistence_map=NULL)
+       {
+               return perlinMap3D(
+                       x + xoff * np.spread.X,
+                       y + yoff * np.spread.Y,
+                       z + zoff * np.spread.Z,
+                       persistence_map);
+       }
+
+private:
+       void allocBuffers();
+       void resizeNoiseBuf(bool is3d);
        void updateResults(float g, float *gmap, float *persistence_map, size_t bufsize);
-       void transformNoiseMap();
+
 };
 
+float NoisePerlin2D(NoiseParams *np, float x, float y, int seed);
+float NoisePerlin3D(NoiseParams *np, float x, float y, float z, int seed);
+
+inline float NoisePerlin2D_PO(NoiseParams *np, float x, float xoff,
+       float y, float yoff, int seed)
+{
+       return NoisePerlin2D(np,
+               x + xoff * np->spread.X,
+               y + yoff * np->spread.Y,
+               seed);
+}
+
+inline float NoisePerlin3D_PO(NoiseParams *np, float x, float xoff,
+       float y, float yoff, float z, float zoff, int seed)
+{
+       return NoisePerlin3D(np,
+               x + xoff * np->spread.X,
+               y + yoff * np->spread.Y,
+               z + zoff * np->spread.Z,
+               seed);
+}
+
 // Return value: -1 ... 1
 float noise2d(int x, int y, int seed);
 float noise3d(int x, int y, int z, int seed);
@@ -174,44 +220,12 @@ float noise3d_perlin(float x, float y, float z, int seed,
 float noise3d_perlin_abs(float x, float y, float z, int seed,
                int octaves, float persistence, bool eased=false);
 
-inline float easeCurve(float t) {
+inline float easeCurve(float t)
+{
        return t * t * t * (t * (6.f * t - 15.f) + 10.f);
 }
 
 float contour(float v);
 
-#define NoisePerlin2D(np, x, y, s) \
-               ((np)->offset + (np)->scale * noise2d_perlin( \
-               (float)(x) / (np)->spread.X, \
-               (float)(y) / (np)->spread.Y, \
-               (s) + (np)->seed, (np)->octaves, (np)->persist))
-
-#define NoisePerlin2DNoTxfm(np, x, y, s) \
-               (noise2d_perlin( \
-               (float)(x) / (np)->spread.X, \
-               (float)(y) / (np)->spread.Y, \
-               (s) + (np)->seed, (np)->octaves, (np)->persist))
-
-#define NoisePerlin2DPosOffset(np, x, xoff, y, yoff, s) \
-               ((np)->offset + (np)->scale * noise2d_perlin( \
-               (float)(xoff) + (float)(x) / (np)->spread.X, \
-               (float)(yoff) + (float)(y) / (np)->spread.Y, \
-               (s) + (np)->seed, (np)->octaves, (np)->persist))
-
-#define NoisePerlin2DNoTxfmPosOffset(np, x, xoff, y, yoff, s) \
-               (noise2d_perlin( \
-               (float)(xoff) + (float)(x) / (np)->spread.X, \
-               (float)(yoff) + (float)(y) / (np)->spread.Y, \
-               (s) + (np)->seed, (np)->octaves, (np)->persist))
-
-#define NoisePerlin3D(np, x, y, z, s) ((np)->offset + (np)->scale * \
-               noise3d_perlin((float)(x) / (np)->spread.X, (float)(y) / (np)->spread.Y, \
-               (float)(z) / (np)->spread.Z, (s) + (np)->seed, (np)->octaves, (np)->persist))
-
-#define NoisePerlin3DEased(np, x, y, z, s) ((np)->offset + (np)->scale * \
-               noise3d_perlin((float)(x) / (np)->spread.X, (float)(y) / (np)->spread.Y, \
-               (float)(z) / (np)->spread.Z, (s) + (np)->seed, (np)->octaves, \
-               (np)->persist, true))
-
 #endif