X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fnoise.h;h=05c877b3237c6b0f66a90d0a0465792250094737;hb=63867b1a372a4d1a4a4ffdec9d0862b094211a89;hp=2cdf4203d2fcae4bf84a70e75742e40b2a7f76d3;hpb=16baed04677a975c990c56df85a431e2c6468ec8;p=minetest.git

diff --git a/src/noise.h b/src/noise.h
index 2cdf4203d..05c877b32 100644
--- 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);
@@ -151,6 +153,25 @@ 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);
@@ -158,6 +179,28 @@ class Noise {
 
 };
 
+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);
@@ -184,38 +227,5 @@ inline float easeCurve(float t)
 
 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