From f347ac98d95ab63d17d578e46d2224595543a022 Mon Sep 17 00:00:00 2001 From: bjorn Date: Sat, 26 Mar 2022 15:25:40 -0700 Subject: [PATCH] Switch to simplex noise; Pending test --- CMakeLists.txt | 2 +- Tupfile.lua | 2 +- src/lib/noise/simplexnoise1234.c | 466 +++++++++++++++++++++++++++++++ src/lib/noise/simplexnoise1234.h | 31 ++ src/lib/noise1234/noise1234.c | 330 ---------------------- src/lib/noise1234/noise1234.h | 33 --- src/modules/math/math.c | 10 +- 7 files changed, 504 insertions(+), 370 deletions(-) create mode 100644 src/lib/noise/simplexnoise1234.c create mode 100644 src/lib/noise/simplexnoise1234.h delete mode 100644 src/lib/noise1234/noise1234.c delete mode 100644 src/lib/noise1234/noise1234.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 191721a0..a5f38ea9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -469,7 +469,7 @@ if(LOVR_ENABLE_MATH) src/api/l_math_curve.c src/api/l_math_randomGenerator.c src/api/l_math_vectors.c - src/lib/noise1234/noise1234.c + src/lib/noise/simplexnoise1234.c ) else() target_compile_definitions(lovr PRIVATE LOVR_DISABLE_MATH) diff --git a/Tupfile.lua b/Tupfile.lua index 507f974a..46b2a219 100644 --- a/Tupfile.lua +++ b/Tupfile.lua @@ -400,7 +400,7 @@ src += config.modules.data and 'src/lib/jsmn/*.c' or nil src += config.modules.data and 'src/lib/minimp3/*.c' or nil src += config.modules.graphics and 'src/lib/glad/*.c' or nil src += config.modules.graphics and 'src/resources/shaders.c' or nil -src += config.modules.math and 'src/lib/noise1234/*.c' or nil +src += config.modules.math and 'src/lib/noise/*.c' or nil src += config.modules.thread and 'src/lib/tinycthread/*.c' or nil res += 'src/resources/*.lua' diff --git a/src/lib/noise/simplexnoise1234.c b/src/lib/noise/simplexnoise1234.c new file mode 100644 index 00000000..19be3062 --- /dev/null +++ b/src/lib/noise/simplexnoise1234.c @@ -0,0 +1,466 @@ +/* SimplexNoise1234, Simplex noise with true analytic + * derivative in 1D to 4D. + * + * Author: Stefan Gustavson, 2003-2005 + * Contact: stefan.gustavson@liu.se + * + * This code was GPL licensed until February 2011. + * As the original author of this code, I hereby + * release it into the public domain. + * Please feel free to use it for whatever you want. + * Credit is appreciated where appropriate, and I also + * appreciate being told where this code finds any use, + * but you may do as you like. + */ + +/* + * This implementation is "Simplex Noise" as presented by + * Ken Perlin at a relatively obscure and not often cited course + * session "Real-Time Shading" at Siggraph 2001 (before real + * time shading actually took off), under the title "hardware noise". + * The 3D function is numerically equivalent to his Java reference + * code available in the PDF course notes, although I re-implemented + * it from scratch to get more readable code. The 1D, 2D and 4D cases + * were implemented from scratch by me from Ken Perlin's text. + * + * This file has no dependencies on any other file, not even its own + * header file. The header file is made for use by external code only. + */ + +// We don't really need to include this, but play nice and do it anyway. +#include "simplexnoise1234.h" + +#define FASTFLOOR(x) ( ((int)(x)<=(x)) ? ((int)x) : (((int)x)-1) ) + +//--------------------------------------------------------------------- +// Static data + +/* + * Permutation table. This is just a random jumble of all numbers 0-255, + * repeated twice to avoid wrapping the index at 255 for each lookup. + * This needs to be exactly the same for all instances on all platforms, + * so it's easiest to just keep it as static explicit data. + * This also removes the need for any initialisation of this class. + * + * Note that making this an int[] instead of a char[] might make the + * code run faster on platforms with a high penalty for unaligned single + * byte addressing. Intel x86 is generally single-byte-friendly, but + * some other CPUs are faster with 4-aligned reads. + * However, a char[] is smaller, which avoids cache trashing, and that + * is probably the most important aspect on most architectures. + * This array is accessed a *lot* by the noise functions. + * A vector-valued noise over 3D accesses it 96 times, and a + * float-valued 4D noise 64 times. We want this to fit in the cache! + */ +unsigned char perm[512] = {151,160,137,91,90,15, + 131,13,201,95,96,53,194,233,7,225,140,36,103,30,69,142,8,99,37,240,21,10,23, + 190, 6,148,247,120,234,75,0,26,197,62,94,252,219,203,117,35,11,32,57,177,33, + 88,237,149,56,87,174,20,125,136,171,168, 68,175,74,165,71,134,139,48,27,166, + 77,146,158,231,83,111,229,122,60,211,133,230,220,105,92,41,55,46,245,40,244, + 102,143,54, 65,25,63,161, 1,216,80,73,209,76,132,187,208, 89,18,169,200,196, + 135,130,116,188,159,86,164,100,109,198,173,186, 3,64,52,217,226,250,124,123, + 5,202,38,147,118,126,255,82,85,212,207,206,59,227,47,16,58,17,182,189,28,42, + 223,183,170,213,119,248,152, 2,44,154,163, 70,221,153,101,155,167, 43,172,9, + 129,22,39,253, 19,98,108,110,79,113,224,232,178,185, 112,104,218,246,97,228, + 251,34,242,193,238,210,144,12,191,179,162,241, 81,51,145,235,249,14,239,107, + 49,192,214, 31,181,199,106,157,184, 84,204,176,115,121,50,45,127, 4,150,254, + 138,236,205,93,222,114,67,29,24,72,243,141,128,195,78,66,215,61,156,180, + 151,160,137,91,90,15, + 131,13,201,95,96,53,194,233,7,225,140,36,103,30,69,142,8,99,37,240,21,10,23, + 190, 6,148,247,120,234,75,0,26,197,62,94,252,219,203,117,35,11,32,57,177,33, + 88,237,149,56,87,174,20,125,136,171,168, 68,175,74,165,71,134,139,48,27,166, + 77,146,158,231,83,111,229,122,60,211,133,230,220,105,92,41,55,46,245,40,244, + 102,143,54, 65,25,63,161, 1,216,80,73,209,76,132,187,208, 89,18,169,200,196, + 135,130,116,188,159,86,164,100,109,198,173,186, 3,64,52,217,226,250,124,123, + 5,202,38,147,118,126,255,82,85,212,207,206,59,227,47,16,58,17,182,189,28,42, + 223,183,170,213,119,248,152, 2,44,154,163, 70,221,153,101,155,167, 43,172,9, + 129,22,39,253, 19,98,108,110,79,113,224,232,178,185, 112,104,218,246,97,228, + 251,34,242,193,238,210,144,12,191,179,162,241, 81,51,145,235,249,14,239,107, + 49,192,214, 31,181,199,106,157,184, 84,204,176,115,121,50,45,127, 4,150,254, + 138,236,205,93,222,114,67,29,24,72,243,141,128,195,78,66,215,61,156,180 +}; + +//--------------------------------------------------------------------- + +/* + * Helper functions to compute gradients-dot-residualvectors (1D to 4D) + * Note that these generate gradients of more than unit length. To make + * a close match with the value range of classic Perlin noise, the final + * noise values need to be rescaled to fit nicely within [-1,1]. + * (The simplex noise functions as such also have different scaling.) + * Note also that these noise functions are the most practical and useful + * signed version of Perlin noise. To return values according to the + * RenderMan specification from the SL noise() and pnoise() functions, + * the noise values need to be scaled and offset to [0,1], like this: + * float SLnoise = (noise(x,y,z) + 1.0) * 0.5; + */ + +float grad1( int hash, float x ) { + int h = hash & 15; + float grad = 1.0f + (h & 7); // Gradient value 1.0, 2.0, ..., 8.0 + if (h&8) grad = -grad; // Set a random sign for the gradient + return ( grad * x ); // Multiply the gradient with the distance +} + +float grad2( int hash, float x, float y ) { + int h = hash & 7; // Convert low 3 bits of hash code + float u = h<4 ? x : y; // into 8 simple gradient directions, + float v = h<4 ? y : x; // and compute the dot product with (x,y). + return ((h&1)? -u : u) + ((h&2)? -2.0f*v : 2.0f*v); +} + +float grad3( int hash, float x, float y , float z ) { + int h = hash & 15; // Convert low 4 bits of hash code into 12 simple + float u = h<8 ? x : y; // gradient directions, and compute dot product. + float v = h<4 ? y : h==12||h==14 ? x : z; // Fix repeats at h = 12 to 15 + return ((h&1)? -u : u) + ((h&2)? -v : v); +} + +float grad4( int hash, float x, float y, float z, float t ) { + int h = hash & 31; // Convert low 5 bits of hash code into 32 simple + float u = h<24 ? x : y; // gradient directions, and compute dot product. + float v = h<16 ? y : z; + float w = h<8 ? z : t; + return ((h&1)? -u : u) + ((h&2)? -v : v) + ((h&4)? -w : w); +} + + // A lookup table to traverse the simplex around a given point in 4D. + // Details can be found where this table is used, in the 4D noise method. + /* TODO: This should not be required, backport it from Bill's GLSL code! */ + static unsigned char simplex[64][4] = { + {0,1,2,3},{0,1,3,2},{0,0,0,0},{0,2,3,1},{0,0,0,0},{0,0,0,0},{0,0,0,0},{1,2,3,0}, + {0,2,1,3},{0,0,0,0},{0,3,1,2},{0,3,2,1},{0,0,0,0},{0,0,0,0},{0,0,0,0},{1,3,2,0}, + {0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}, + {1,2,0,3},{0,0,0,0},{1,3,0,2},{0,0,0,0},{0,0,0,0},{0,0,0,0},{2,3,0,1},{2,3,1,0}, + {1,0,2,3},{1,0,3,2},{0,0,0,0},{0,0,0,0},{0,0,0,0},{2,0,3,1},{0,0,0,0},{2,1,3,0}, + {0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}, + {2,0,1,3},{0,0,0,0},{0,0,0,0},{0,0,0,0},{3,0,1,2},{3,0,2,1},{0,0,0,0},{3,1,2,0}, + {2,1,0,3},{0,0,0,0},{0,0,0,0},{0,0,0,0},{3,1,0,2},{0,0,0,0},{3,2,0,1},{3,2,1,0}}; + +// 1D simplex noise +float snoise1(float x) { + + int i0 = FASTFLOOR(x); + int i1 = i0 + 1; + float x0 = x - i0; + float x1 = x0 - 1.0f; + + float n0, n1; + + float t0 = 1.0f - x0*x0; +// if(t0 < 0.0f) t0 = 0.0f; // this never happens for the 1D case + t0 *= t0; + n0 = t0 * t0 * grad1(perm[i0 & 0xff], x0); + + float t1 = 1.0f - x1*x1; +// if(t1 < 0.0f) t1 = 0.0f; // this never happens for the 1D case + t1 *= t1; + n1 = t1 * t1 * grad1(perm[i1 & 0xff], x1); + // The maximum value of this noise is 8*(3/4)^4 = 2.53125 + // A factor of 0.395 would scale to fit exactly within [-1,1], but + // we want to match PRMan's 1D noise, so we scale it down some more. + return 0.25f * (n0 + n1); + +} + +// 2D simplex noise +float snoise2(float x, float y) { + +#define F2 0.366025403 // F2 = 0.5*(sqrt(3.0)-1.0) +#define G2 0.211324865 // G2 = (3.0-Math.sqrt(3.0))/6.0 + + float n0, n1, n2; // Noise contributions from the three corners + + // Skew the input space to determine which simplex cell we're in + float s = (x+y)*F2; // Hairy factor for 2D + float xs = x + s; + float ys = y + s; + int i = FASTFLOOR(xs); + int j = FASTFLOOR(ys); + + float t = (float)(i+j)*G2; + float X0 = i-t; // Unskew the cell origin back to (x,y) space + float Y0 = j-t; + float x0 = x-X0; // The x,y distances from the cell origin + float y0 = y-Y0; + + // For the 2D case, the simplex shape is an equilateral triangle. + // Determine which simplex we are in. + int i1, j1; // Offsets for second (middle) corner of simplex in (i,j) coords + if(x0>y0) {i1=1; j1=0;} // lower triangle, XY order: (0,0)->(1,0)->(1,1) + else {i1=0; j1=1;} // upper triangle, YX order: (0,0)->(0,1)->(1,1) + + // A step of (1,0) in (i,j) means a step of (1-c,-c) in (x,y), and + // a step of (0,1) in (i,j) means a step of (-c,1-c) in (x,y), where + // c = (3-sqrt(3))/6 + + float x1 = x0 - i1 + G2; // Offsets for middle corner in (x,y) unskewed coords + float y1 = y0 - j1 + G2; + float x2 = x0 - 1.0f + 2.0f * G2; // Offsets for last corner in (x,y) unskewed coords + float y2 = y0 - 1.0f + 2.0f * G2; + + // Wrap the integer indices at 256, to avoid indexing perm[] out of bounds + int ii = i & 0xff; + int jj = j & 0xff; + + // Calculate the contribution from the three corners + float t0 = 0.5f - x0*x0-y0*y0; + if(t0 < 0.0f) n0 = 0.0f; + else { + t0 *= t0; + n0 = t0 * t0 * grad2(perm[ii+perm[jj]], x0, y0); + } + + float t1 = 0.5f - x1*x1-y1*y1; + if(t1 < 0.0f) n1 = 0.0f; + else { + t1 *= t1; + n1 = t1 * t1 * grad2(perm[ii+i1+perm[jj+j1]], x1, y1); + } + + float t2 = 0.5f - x2*x2-y2*y2; + if(t2 < 0.0f) n2 = 0.0f; + else { + t2 *= t2; + n2 = t2 * t2 * grad2(perm[ii+1+perm[jj+1]], x2, y2); + } + + // Add contributions from each corner to get the final noise value. + // The result is scaled to return values in the interval [-1,1]. + return 40.0f * (n0 + n1 + n2); // TODO: The scale factor is preliminary! + } + +// 3D simplex noise +float snoise3(float x, float y, float z) { + +// Simple skewing factors for the 3D case +#define F3 0.333333333 +#define G3 0.166666667 + + float n0, n1, n2, n3; // Noise contributions from the four corners + + // Skew the input space to determine which simplex cell we're in + float s = (x+y+z)*F3; // Very nice and simple skew factor for 3D + float xs = x+s; + float ys = y+s; + float zs = z+s; + int i = FASTFLOOR(xs); + int j = FASTFLOOR(ys); + int k = FASTFLOOR(zs); + + float t = (float)(i+j+k)*G3; + float X0 = i-t; // Unskew the cell origin back to (x,y,z) space + float Y0 = j-t; + float Z0 = k-t; + float x0 = x-X0; // The x,y,z distances from the cell origin + float y0 = y-Y0; + float z0 = z-Z0; + + // For the 3D case, the simplex shape is a slightly irregular tetrahedron. + // Determine which simplex we are in. + int i1, j1, k1; // Offsets for second corner of simplex in (i,j,k) coords + int i2, j2, k2; // Offsets for third corner of simplex in (i,j,k) coords + +/* This code would benefit from a backport from the GLSL version! */ + if(x0>=y0) { + if(y0>=z0) + { i1=1; j1=0; k1=0; i2=1; j2=1; k2=0; } // X Y Z order + else if(x0>=z0) { i1=1; j1=0; k1=0; i2=1; j2=0; k2=1; } // X Z Y order + else { i1=0; j1=0; k1=1; i2=1; j2=0; k2=1; } // Z X Y order + } + else { // x0 y0) ? 32 : 0; + int c2 = (x0 > z0) ? 16 : 0; + int c3 = (y0 > z0) ? 8 : 0; + int c4 = (x0 > w0) ? 4 : 0; + int c5 = (y0 > w0) ? 2 : 0; + int c6 = (z0 > w0) ? 1 : 0; + int c = c1 + c2 + c3 + c4 + c5 + c6; + + int i1, j1, k1, l1; // The integer offsets for the second simplex corner + int i2, j2, k2, l2; // The integer offsets for the third simplex corner + int i3, j3, k3, l3; // The integer offsets for the fourth simplex corner + + // simplex[c] is a 4-vector with the numbers 0, 1, 2 and 3 in some order. + // Many values of c will never occur, since e.g. x>y>z>w makes x=3 ? 1 : 0; + j1 = simplex[c][1]>=3 ? 1 : 0; + k1 = simplex[c][2]>=3 ? 1 : 0; + l1 = simplex[c][3]>=3 ? 1 : 0; + // The number 2 in the "simplex" array is at the second largest coordinate. + i2 = simplex[c][0]>=2 ? 1 : 0; + j2 = simplex[c][1]>=2 ? 1 : 0; + k2 = simplex[c][2]>=2 ? 1 : 0; + l2 = simplex[c][3]>=2 ? 1 : 0; + // The number 1 in the "simplex" array is at the second smallest coordinate. + i3 = simplex[c][0]>=1 ? 1 : 0; + j3 = simplex[c][1]>=1 ? 1 : 0; + k3 = simplex[c][2]>=1 ? 1 : 0; + l3 = simplex[c][3]>=1 ? 1 : 0; + // The fifth corner has all coordinate offsets = 1, so no need to look that up. + + float x1 = x0 - i1 + G4; // Offsets for second corner in (x,y,z,w) coords + float y1 = y0 - j1 + G4; + float z1 = z0 - k1 + G4; + float w1 = w0 - l1 + G4; + float x2 = x0 - i2 + 2.0f*G4; // Offsets for third corner in (x,y,z,w) coords + float y2 = y0 - j2 + 2.0f*G4; + float z2 = z0 - k2 + 2.0f*G4; + float w2 = w0 - l2 + 2.0f*G4; + float x3 = x0 - i3 + 3.0f*G4; // Offsets for fourth corner in (x,y,z,w) coords + float y3 = y0 - j3 + 3.0f*G4; + float z3 = z0 - k3 + 3.0f*G4; + float w3 = w0 - l3 + 3.0f*G4; + float x4 = x0 - 1.0f + 4.0f*G4; // Offsets for last corner in (x,y,z,w) coords + float y4 = y0 - 1.0f + 4.0f*G4; + float z4 = z0 - 1.0f + 4.0f*G4; + float w4 = w0 - 1.0f + 4.0f*G4; + + // Wrap the integer indices at 256, to avoid indexing perm[] out of bounds + int ii = i & 0xff; + int jj = j & 0xff; + int kk = k & 0xff; + int ll = l & 0xff; + + // Calculate the contribution from the five corners + float t0 = 0.5f - x0*x0 - y0*y0 - z0*z0 - w0*w0; + if(t0 < 0.0f) n0 = 0.0f; + else { + t0 *= t0; + n0 = t0 * t0 * grad4(perm[ii+perm[jj+perm[kk+perm[ll]]]], x0, y0, z0, w0); + } + + float t1 = 0.5f - x1*x1 - y1*y1 - z1*z1 - w1*w1; + if(t1 < 0.0f) n1 = 0.0f; + else { + t1 *= t1; + n1 = t1 * t1 * grad4(perm[ii+i1+perm[jj+j1+perm[kk+k1+perm[ll+l1]]]], x1, y1, z1, w1); + } + + float t2 = 0.5f - x2*x2 - y2*y2 - z2*z2 - w2*w2; + if(t2 < 0.0f) n2 = 0.0f; + else { + t2 *= t2; + n2 = t2 * t2 * grad4(perm[ii+i2+perm[jj+j2+perm[kk+k2+perm[ll+l2]]]], x2, y2, z2, w2); + } + + float t3 = 0.5f - x3*x3 - y3*y3 - z3*z3 - w3*w3; + if(t3 < 0.0f) n3 = 0.0f; + else { + t3 *= t3; + n3 = t3 * t3 * grad4(perm[ii+i3+perm[jj+j3+perm[kk+k3+perm[ll+l3]]]], x3, y3, z3, w3); + } + + float t4 = 0.5f - x4*x4 - y4*y4 - z4*z4 - w4*w4; + if(t4 < 0.0f) n4 = 0.0f; + else { + t4 *= t4; + n4 = t4 * t4 * grad4(perm[ii+1+perm[jj+1+perm[kk+1+perm[ll+1]]]], x4, y4, z4, w4); + } + + // Sum up and scale the result to cover the range [-1,1] + return 62.0f * (n0 + n1 + n2 + n3 + n4); + } +//--------------------------------------------------------------------- diff --git a/src/lib/noise/simplexnoise1234.h b/src/lib/noise/simplexnoise1234.h new file mode 100644 index 00000000..c9502581 --- /dev/null +++ b/src/lib/noise/simplexnoise1234.h @@ -0,0 +1,31 @@ +/* SimplexNoise1234, Simplex noise with true analytic + * derivative in 1D to 4D. + * + * Author: Stefan Gustavson, 2003-2005 + * Contact: stegu@itn.liu.se + * + * This code was GPL licensed until February 2011. + * As the original author of this code, I hereby + * release it into the public domain. + * Please feel free to use it for whatever you want. + * Credit is appreciated where appropriate, and I also + * appreciate being told where this code finds any use, + * but you may do as you like. + */ + +/* + * This is a clean, fast, modern and free Perlin Simplex noise function. + * It is a stand-alone compilation unit with no external dependencies, + * highly reusable without source code modifications. + * + * Note: + * Replacing the "float" type with "double" can actually make this run faster + * on some platforms. Having both versions could be useful. + */ + +/** 1D, 2D, 3D and 4D float Perlin simplex noise + */ + float snoise1( float x ); + float snoise2( float x, float y ); + float snoise3( float x, float y, float z ); + float snoise4( float x, float y, float z, float w ); diff --git a/src/lib/noise1234/noise1234.c b/src/lib/noise1234/noise1234.c deleted file mode 100644 index 9382c583..00000000 --- a/src/lib/noise1234/noise1234.c +++ /dev/null @@ -1,330 +0,0 @@ -// noise1234 -// -// Author: Stefan Gustavson, 2003-2005 -// Contact: stefan.gustavson@liu.se -// -// This code was GPL licensed until February 2011. -// As the original author of this code, I hereby -// release it into the public domain. -// Please feel free to use it for whatever you want. -// Credit is appreciated where appropriate, and I also -// appreciate being told where this code finds any use, -// but you may do as you like. - -/* - * This implementation is "Improved Noise" as presented by - * Ken Perlin at Siggraph 2002. The 3D function is a direct port - * of his Java reference code which was once publicly available - * on www.noisemachine.com (although I cleaned it up, made it - * faster and made the code more readable), but the 1D, 2D and - * 4D functions were implemented from scratch by me. - * - * This is a backport to C of my improved noise class in C++ - * which was included in the Aqsis renderer project. - * It is highly reusable without source code modifications. - * - */ - -#include "noise1234.h" - -// This is the new and improved, C(2) continuous interpolant -#define FADE(t) ( t * t * t * ( t * ( t * 6 - 15 ) + 10 ) ) - -#define FASTFLOOR(x) ( ((int)(x)<(x)) ? ((int)x) : ((int)x-1 ) ) -#define LERP(t, a, b) ((a) + (t)*((b)-(a))) - - -//--------------------------------------------------------------------- -// Static data - -/* - * Permutation table. This is just a random jumble of all numbers 0-255, - * repeated twice to avoid wrapping the index at 255 for each lookup. - * This needs to be exactly the same for all instances on all platforms, - * so it's easiest to just keep it as static explicit data. - * This also removes the need for any initialisation of this class. - * - * Note that making this an int[] instead of a char[] might make the - * code run faster on platforms with a high penalty for unaligned single - * byte addressing. Intel x86 is generally single-byte-friendly, but - * some other CPUs are faster with 4-aligned reads. - * However, a char[] is smaller, which avoids cache trashing, and that - * is probably the most important aspect on most architectures. - * This array is accessed a *lot* by the noise functions. - * A vector-valued noise over 3D accesses it 96 times, and a - * float-valued 4D noise 64 times. We want this to fit in the cache! - */ -unsigned char perm[] = {151,160,137,91,90,15, - 131,13,201,95,96,53,194,233,7,225,140,36,103,30,69,142,8,99,37,240,21,10,23, - 190, 6,148,247,120,234,75,0,26,197,62,94,252,219,203,117,35,11,32,57,177,33, - 88,237,149,56,87,174,20,125,136,171,168, 68,175,74,165,71,134,139,48,27,166, - 77,146,158,231,83,111,229,122,60,211,133,230,220,105,92,41,55,46,245,40,244, - 102,143,54, 65,25,63,161, 1,216,80,73,209,76,132,187,208, 89,18,169,200,196, - 135,130,116,188,159,86,164,100,109,198,173,186, 3,64,52,217,226,250,124,123, - 5,202,38,147,118,126,255,82,85,212,207,206,59,227,47,16,58,17,182,189,28,42, - 223,183,170,213,119,248,152, 2,44,154,163, 70,221,153,101,155,167, 43,172,9, - 129,22,39,253, 19,98,108,110,79,113,224,232,178,185, 112,104,218,246,97,228, - 251,34,242,193,238,210,144,12,191,179,162,241, 81,51,145,235,249,14,239,107, - 49,192,214, 31,181,199,106,157,184, 84,204,176,115,121,50,45,127, 4,150,254, - 138,236,205,93,222,114,67,29,24,72,243,141,128,195,78,66,215,61,156,180, - 151,160,137,91,90,15, - 131,13,201,95,96,53,194,233,7,225,140,36,103,30,69,142,8,99,37,240,21,10,23, - 190, 6,148,247,120,234,75,0,26,197,62,94,252,219,203,117,35,11,32,57,177,33, - 88,237,149,56,87,174,20,125,136,171,168, 68,175,74,165,71,134,139,48,27,166, - 77,146,158,231,83,111,229,122,60,211,133,230,220,105,92,41,55,46,245,40,244, - 102,143,54, 65,25,63,161, 1,216,80,73,209,76,132,187,208, 89,18,169,200,196, - 135,130,116,188,159,86,164,100,109,198,173,186, 3,64,52,217,226,250,124,123, - 5,202,38,147,118,126,255,82,85,212,207,206,59,227,47,16,58,17,182,189,28,42, - 223,183,170,213,119,248,152, 2,44,154,163, 70,221,153,101,155,167, 43,172,9, - 129,22,39,253, 19,98,108,110,79,113,224,232,178,185, 112,104,218,246,97,228, - 251,34,242,193,238,210,144,12,191,179,162,241, 81,51,145,235,249,14,239,107, - 49,192,214, 31,181,199,106,157,184, 84,204,176,115,121,50,45,127, 4,150,254, - 138,236,205,93,222,114,67,29,24,72,243,141,128,195,78,66,215,61,156,180 -}; - -//--------------------------------------------------------------------- - -/* - * Helper functions to compute gradients-dot-residualvectors (1D to 4D) - * Note that these generate gradients of more than unit length. To make - * a close match with the value range of classic Perlin noise, the final - * noise values need to be rescaled. To match the RenderMan noise in a - * statistical sense, the approximate scaling values (empirically - * determined from test renderings) are: - * 1D noise needs rescaling with 0.188 - * 2D noise needs rescaling with 0.507 - * 3D noise needs rescaling with 0.936 - * 4D noise needs rescaling with 0.87 - * Note that these noise functions are the most practical and useful - * signed version of Perlin noise. To return values according to the - * RenderMan specification from the SL noise() and pnoise() functions, - * the noise values need to be scaled and offset to [0,1], like this: - * float SLnoise = (noise3(x,y,z) + 1.0) * 0.5; - */ - -static float grad1( int hash, float x ) { - int h = hash & 15; - float grad = 1.0 + (h & 7); // Gradient value 1.0, 2.0, ..., 8.0 - if (h&8) grad = -grad; // and a random sign for the gradient - return ( grad * x ); // Multiply the gradient with the distance -} - -static float grad2( int hash, float x, float y ) { - int h = hash & 7; // Convert low 3 bits of hash code - float u = h<4 ? x : y; // into 8 simple gradient directions, - float v = h<4 ? y : x; // and compute the dot product with (x,y). - return ((h&1)? -u : u) + ((h&2)? -2.0*v : 2.0*v); -} - -static float grad3( int hash, float x, float y , float z ) { - int h = hash & 15; // Convert low 4 bits of hash code into 12 simple - float u = h<8 ? x : y; // gradient directions, and compute dot product. - float v = h<4 ? y : h==12||h==14 ? x : z; // Fix repeats at h = 12 to 15 - return ((h&1)? -u : u) + ((h&2)? -v : v); -} - -static float grad4( int hash, float x, float y, float z, float t ) { - int h = hash & 31; // Convert low 5 bits of hash code into 32 simple - float u = h<24 ? x : y; // gradient directions, and compute dot product. - float v = h<16 ? y : z; - float w = h<8 ? z : t; - return ((h&1)? -u : u) + ((h&2)? -v : v) + ((h&4)? -w : w); -} - -//--------------------------------------------------------------------- -/** 1D float Perlin noise, SL "noise()" - */ -float noise1( float x ) -{ - int ix0, ix1; - float fx0, fx1; - float s, n0, n1; - - ix0 = FASTFLOOR( x ); // Integer part of x - fx0 = x - ix0; // Fractional part of x - fx1 = fx0 - 1.0f; - ix1 = ( ix0+1 ) & 0xff; - ix0 = ix0 & 0xff; // Wrap to 0..255 - - s = FADE( fx0 ); - - n0 = grad1( perm[ ix0 ], fx0 ); - n1 = grad1( perm[ ix1 ], fx1 ); - return 0.188f * ( LERP( s, n0, n1 ) ); -} - - -//--------------------------------------------------------------------- -/** 2D float Perlin noise. - */ -float noise2( float x, float y ) -{ - int ix0, iy0, ix1, iy1; - float fx0, fy0, fx1, fy1; - float s, t, nx0, nx1, n0, n1; - - ix0 = FASTFLOOR( x ); // Integer part of x - iy0 = FASTFLOOR( y ); // Integer part of y - fx0 = x - ix0; // Fractional part of x - fy0 = y - iy0; // Fractional part of y - fx1 = fx0 - 1.0f; - fy1 = fy0 - 1.0f; - ix1 = (ix0 + 1) & 0xff; // Wrap to 0..255 - iy1 = (iy0 + 1) & 0xff; - ix0 = ix0 & 0xff; - iy0 = iy0 & 0xff; - - t = FADE( fy0 ); - s = FADE( fx0 ); - - nx0 = grad2(perm[ix0 + perm[iy0]], fx0, fy0); - nx1 = grad2(perm[ix0 + perm[iy1]], fx0, fy1); - n0 = LERP( t, nx0, nx1 ); - - nx0 = grad2(perm[ix1 + perm[iy0]], fx1, fy0); - nx1 = grad2(perm[ix1 + perm[iy1]], fx1, fy1); - n1 = LERP(t, nx0, nx1); - - return 0.507f * ( LERP( s, n0, n1 ) ); -} - - -//--------------------------------------------------------------------- -/** 3D float Perlin noise. - */ -float noise3( float x, float y, float z ) -{ - int ix0, iy0, ix1, iy1, iz0, iz1; - float fx0, fy0, fz0, fx1, fy1, fz1; - float s, t, r; - float nxy0, nxy1, nx0, nx1, n0, n1; - - ix0 = FASTFLOOR( x ); // Integer part of x - iy0 = FASTFLOOR( y ); // Integer part of y - iz0 = FASTFLOOR( z ); // Integer part of z - fx0 = x - ix0; // Fractional part of x - fy0 = y - iy0; // Fractional part of y - fz0 = z - iz0; // Fractional part of z - fx1 = fx0 - 1.0f; - fy1 = fy0 - 1.0f; - fz1 = fz0 - 1.0f; - ix1 = ( ix0 + 1 ) & 0xff; // Wrap to 0..255 - iy1 = ( iy0 + 1 ) & 0xff; - iz1 = ( iz0 + 1 ) & 0xff; - ix0 = ix0 & 0xff; - iy0 = iy0 & 0xff; - iz0 = iz0 & 0xff; - - r = FADE( fz0 ); - t = FADE( fy0 ); - s = FADE( fx0 ); - - nxy0 = grad3(perm[ix0 + perm[iy0 + perm[iz0]]], fx0, fy0, fz0); - nxy1 = grad3(perm[ix0 + perm[iy0 + perm[iz1]]], fx0, fy0, fz1); - nx0 = LERP( r, nxy0, nxy1 ); - - nxy0 = grad3(perm[ix0 + perm[iy1 + perm[iz0]]], fx0, fy1, fz0); - nxy1 = grad3(perm[ix0 + perm[iy1 + perm[iz1]]], fx0, fy1, fz1); - nx1 = LERP( r, nxy0, nxy1 ); - - n0 = LERP( t, nx0, nx1 ); - - nxy0 = grad3(perm[ix1 + perm[iy0 + perm[iz0]]], fx1, fy0, fz0); - nxy1 = grad3(perm[ix1 + perm[iy0 + perm[iz1]]], fx1, fy0, fz1); - nx0 = LERP( r, nxy0, nxy1 ); - - nxy0 = grad3(perm[ix1 + perm[iy1 + perm[iz0]]], fx1, fy1, fz0); - nxy1 = grad3(perm[ix1 + perm[iy1 + perm[iz1]]], fx1, fy1, fz1); - nx1 = LERP( r, nxy0, nxy1 ); - - n1 = LERP( t, nx0, nx1 ); - - return 0.936f * ( LERP( s, n0, n1 ) ); -} - - -//--------------------------------------------------------------------- -/** 4D float Perlin noise. - */ - -float noise4( float x, float y, float z, float w ) -{ - int ix0, iy0, iz0, iw0, ix1, iy1, iz1, iw1; - float fx0, fy0, fz0, fw0, fx1, fy1, fz1, fw1; - float s, t, r, q; - float nxyz0, nxyz1, nxy0, nxy1, nx0, nx1, n0, n1; - - ix0 = FASTFLOOR( x ); // Integer part of x - iy0 = FASTFLOOR( y ); // Integer part of y - iz0 = FASTFLOOR( z ); // Integer part of y - iw0 = FASTFLOOR( w ); // Integer part of w - fx0 = x - ix0; // Fractional part of x - fy0 = y - iy0; // Fractional part of y - fz0 = z - iz0; // Fractional part of z - fw0 = w - iw0; // Fractional part of w - fx1 = fx0 - 1.0f; - fy1 = fy0 - 1.0f; - fz1 = fz0 - 1.0f; - fw1 = fw0 - 1.0f; - ix1 = ( ix0 + 1 ) & 0xff; // Wrap to 0..255 - iy1 = ( iy0 + 1 ) & 0xff; - iz1 = ( iz0 + 1 ) & 0xff; - iw1 = ( iw0 + 1 ) & 0xff; - ix0 = ix0 & 0xff; - iy0 = iy0 & 0xff; - iz0 = iz0 & 0xff; - iw0 = iw0 & 0xff; - - q = FADE( fw0 ); - r = FADE( fz0 ); - t = FADE( fy0 ); - s = FADE( fx0 ); - - nxyz0 = grad4(perm[ix0 + perm[iy0 + perm[iz0 + perm[iw0]]]], fx0, fy0, fz0, fw0); - nxyz1 = grad4(perm[ix0 + perm[iy0 + perm[iz0 + perm[iw1]]]], fx0, fy0, fz0, fw1); - nxy0 = LERP( q, nxyz0, nxyz1 ); - - nxyz0 = grad4(perm[ix0 + perm[iy0 + perm[iz1 + perm[iw0]]]], fx0, fy0, fz1, fw0); - nxyz1 = grad4(perm[ix0 + perm[iy0 + perm[iz1 + perm[iw1]]]], fx0, fy0, fz1, fw1); - nxy1 = LERP( q, nxyz0, nxyz1 ); - - nx0 = LERP ( r, nxy0, nxy1 ); - - nxyz0 = grad4(perm[ix0 + perm[iy1 + perm[iz0 + perm[iw0]]]], fx0, fy1, fz0, fw0); - nxyz1 = grad4(perm[ix0 + perm[iy1 + perm[iz0 + perm[iw1]]]], fx0, fy1, fz0, fw1); - nxy0 = LERP( q, nxyz0, nxyz1 ); - - nxyz0 = grad4(perm[ix0 + perm[iy1 + perm[iz1 + perm[iw0]]]], fx0, fy1, fz1, fw0); - nxyz1 = grad4(perm[ix0 + perm[iy1 + perm[iz1 + perm[iw1]]]], fx0, fy1, fz1, fw1); - nxy1 = LERP( q, nxyz0, nxyz1 ); - - nx1 = LERP ( r, nxy0, nxy1 ); - - n0 = LERP( t, nx0, nx1 ); - - nxyz0 = grad4(perm[ix1 + perm[iy0 + perm[iz0 + perm[iw0]]]], fx1, fy0, fz0, fw0); - nxyz1 = grad4(perm[ix1 + perm[iy0 + perm[iz0 + perm[iw1]]]], fx1, fy0, fz0, fw1); - nxy0 = LERP( q, nxyz0, nxyz1 ); - - nxyz0 = grad4(perm[ix1 + perm[iy0 + perm[iz1 + perm[iw0]]]], fx1, fy0, fz1, fw0); - nxyz1 = grad4(perm[ix1 + perm[iy0 + perm[iz1 + perm[iw1]]]], fx1, fy0, fz1, fw1); - nxy1 = LERP( q, nxyz0, nxyz1 ); - - nx0 = LERP ( r, nxy0, nxy1 ); - - nxyz0 = grad4(perm[ix1 + perm[iy1 + perm[iz0 + perm[iw0]]]], fx1, fy1, fz0, fw0); - nxyz1 = grad4(perm[ix1 + perm[iy1 + perm[iz0 + perm[iw1]]]], fx1, fy1, fz0, fw1); - nxy0 = LERP( q, nxyz0, nxyz1 ); - - nxyz0 = grad4(perm[ix1 + perm[iy1 + perm[iz1 + perm[iw0]]]], fx1, fy1, fz1, fw0); - nxyz1 = grad4(perm[ix1 + perm[iy1 + perm[iz1 + perm[iw1]]]], fx1, fy1, fz1, fw1); - nxy1 = LERP( q, nxyz0, nxyz1 ); - - nx1 = LERP ( r, nxy0, nxy1 ); - - n1 = LERP( t, nx0, nx1 ); - - return 0.87f * ( LERP( s, n0, n1 ) ); -} - -//--------------------------------------------------------------------- diff --git a/src/lib/noise1234/noise1234.h b/src/lib/noise1234/noise1234.h deleted file mode 100644 index d4618287..00000000 --- a/src/lib/noise1234/noise1234.h +++ /dev/null @@ -1,33 +0,0 @@ -// noise1234 -// -// Author: Stefan Gustavson, 2003-2005 -// Contact: stefan.gustavson@liu.se -// -// This code was GPL licensed until February 2011. -// As the original author of this code, I hereby -// release it into the public domain. -// Please feel free to use it for whatever you want. -// Credit is appreciated where appropriate, and I also -// appreciate being told where this code finds any use, -// but you may do as you like. - -/* - * This implementation is "Improved Noise" as presented by - * Ken Perlin at Siggraph 2002. The 3D function is a direct port - * of his Java reference code which was once publicly available - * on www.noisemachine.com (although I cleaned it up, made it - * faster and made the code more readable), but the 1D, 2D and - * 4D functions were implemented from scratch by me. - * - * This is a backport to C of my improved noise class in C++ - * which was included in the Aqsis renderer project. - * It is highly reusable without source code modifications. - * - */ - -/** 1D, 2D, 3D and 4D float Perlin noise - */ -extern float noise1( float x ); -extern float noise2( float x, float y ); -extern float noise3( float x, float y, float z ); -extern float noise4( float x, float y, float z, float w ); diff --git a/src/modules/math/math.c b/src/modules/math/math.c index e5e3ac15..b4f9676f 100644 --- a/src/modules/math/math.c +++ b/src/modules/math/math.c @@ -1,7 +1,7 @@ #include "math.h" #include "math/randomGenerator.h" #include "util.h" -#include "lib/noise1234/noise1234.h" +#include "lib/noise/simplexnoise1234.h" #include #include #include @@ -46,17 +46,17 @@ float lovrMathLinearToGamma(float x) { } float lovrMathNoise1(float x) { - return noise1(x) * .5f + .5f; + return snoise1(x) * .5f + .5f; } float lovrMathNoise2(float x, float y) { - return noise2(x, y) * .5f + .5f; + return snoise2(x, y) * .5f + .5f; } float lovrMathNoise3(float x, float y, float z) { - return noise3(x, y, z) * .5f + .5f; + return snoise3(x, y, z) * .5f + .5f; } float lovrMathNoise4(float x, float y, float z, float w) { - return noise4(x, y, z, w) * .5f + .5f; + return snoise4(x, y, z, w) * .5f + .5f; }