Remove trailing whitespace

Author: zbenjamin

_noise.h

@@ -11,8 +11,8 @@
 #endif
 
 const float GRAD3[][3] = {
-    {1,1,0},{-1,1,0},{1,-1,0},{-1,-1,0}, 
-    {1,0,1},{-1,0,1},{1,0,-1},{-1,0,-1}, 
+    {1,1,0},{-1,1,0},{1,-1,0},{-1,-1,0},
+    {1,0,1},{-1,0,1},{1,0,-1},{-1,0,-1},
     {0,1,1},{0,-1,1},{0,1,-1},{0,-1,-1},
     {1,0,-1},{-1,0,-1},{0,-1,1},{0,1,1}};
 
@@ -70,7 +70,7 @@ const unsigned char SIMPLEX[][4] = {
     {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}, 
+    {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}};
 
@@ -106,4 +106,3 @@ inline float fast_cos(float x)
 {
     return fast_sin(x + 0.5f);
 }
-

_perlin.c

@@ -53,7 +53,7 @@ py_noise1(PyObject *self, PyObject *args, PyObject *kwargs)
     if (!PyArg_ParseTupleAndKeywords(args, kwargs, "f|iffii:noise1", kwlist,
         &x, &octaves, &persistence, &lacunarity, &repeat, &base))
         return NULL;
-    
+
     if (octaves == 1) {
         // Single octave, return simple noise
         return (PyObject *) PyFloat_FromDouble((double) noise1(x, repeat, base));
@@ -108,7 +108,7 @@ noise2(float x, float y, const float repeatx, const float repeaty, const int bas
     B = PERM[ii];
     BA = PERM[B + j];
     BB = PERM[B + jj];
-        
+
     return lerp(fy, lerp(fx, grad2(PERM[AA], x, y),
                              grad2(PERM[BA], x - 1, y)),
                     lerp(fx, grad2(PERM[AB], x, y - 1),
@@ -131,7 +131,7 @@ py_noise2(PyObject *self, PyObject *args, PyObject *kwargs)
     if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ff|iffffi:noise2", kwlist,
         &x, &y, &octaves, &persistence, &lacunarity, &repeatx, &repeaty, &base))
         return NULL;
-    
+
     if (octaves == 1) {
         // Single octave, return simple noise
         return (PyObject *) PyFloat_FromDouble((double) noise2(x, y, repeatx, repeaty, base));
@@ -163,7 +163,7 @@ grad3(const int hash, const float x, const float y, const float z)
 }
 
 float
-noise3(float x, float y, float z, const int repeatx, const int repeaty, const int repeatz, 
+noise3(float x, float y, float z, const int repeatx, const int repeaty, const int repeatz,
     const int base)
 {
     float fx, fy, fz;
@@ -192,7 +192,7 @@ noise3(float x, float y, float z, const int repeatx, const int repeaty, const in
     B = PERM[ii];
     BA = PERM[B + j];
     BB = PERM[B + jj];
-        
+
     return lerp(fz, lerp(fy, lerp(fx, grad3(PERM[AA + k], x, y, z),
                                       grad3(PERM[BA + k], x - 1, y, z)),
                              lerp(fx, grad3(PERM[AB + k], x, y - 1, z),
@@ -221,10 +221,10 @@ py_noise3(PyObject *self, PyObject *args, PyObject *kwargs)
     if (!PyArg_ParseTupleAndKeywords(args, kwargs, "fff|iffiiii:noise3", kwlist,
         &x, &y, &z, &octaves, &persistence, &lacunarity, &repeatx, &repeaty, &repeatz, &base))
         return NULL;
-    
+
     if (octaves == 1) {
         // Single octave, return simple noise
-        return (PyObject *) PyFloat_FromDouble((double) noise3(x, y, z, 
+        return (PyObject *) PyFloat_FromDouble((double) noise3(x, y, z,
             repeatx, repeaty, repeatz, base));
     } else if (octaves > 1) {
         int i;
@@ -234,7 +234,7 @@ py_noise3(PyObject *self, PyObject *args, PyObject *kwargs)
         float total = 0.0f;
 
         for (i = 0; i < octaves; i++) {
-            total += noise3(x * freq, y * freq, z * freq, 
+            total += noise3(x * freq, y * freq, z * freq,
                 (const int)(repeatx*freq), (const int)(repeaty*freq), (const int)(repeatz*freq), base) * amp;
             max += amp;
             freq *= lacunarity;
@@ -248,13 +248,13 @@ py_noise3(PyObject *self, PyObject *args, PyObject *kwargs)
 }
 
 static PyMethodDef perlin_functions[] = {
-    {"noise1", (PyCFunction) py_noise1, METH_VARARGS | METH_KEYWORDS, 
+    {"noise1", (PyCFunction) py_noise1, METH_VARARGS | METH_KEYWORDS,
         "noise1(x, octaves=1, persistence=0.5, lacunarity=2.0, repeat=1024, base=0.0)\n\n"
         "1 dimensional perlin improved noise function (see noise3 for more info)"},
-    {"noise2", (PyCFunction) py_noise2, METH_VARARGS | METH_KEYWORDS, 
+    {"noise2", (PyCFunction) py_noise2, METH_VARARGS | METH_KEYWORDS,
         "noise2(x, y, octaves=1, persistence=0.5, lacunarity=2.0, repeatx=1024, repeaty=1024, base=0.0)\n\n"
         "2 dimensional perlin improved noise function (see noise3 for more info)"},
-    {"noise3", (PyCFunction) py_noise3, METH_VARARGS | METH_KEYWORDS, 
+    {"noise3", (PyCFunction) py_noise3, METH_VARARGS | METH_KEYWORDS,
         "noise3(x, y, z, octaves=1, persistence=0.5, lacunarity=2.0, "
             "repeatx=1024, repeaty=1024, repeatz=1024, base=0.0)\n\n"
         "return perlin \"improved\" noise value for specified coordinate\n\n"

_simplex.c

@@ -12,8 +12,8 @@
 #define F2 0.3660254037844386f  // 0.5 * (sqrt(3.0) - 1.0)
 #define G2 0.21132486540518713f // (3.0 - sqrt(3.0)) / 6.0
 
-float 
-noise2(float x, float y) 
+float
+noise2(float x, float y)
 {
     int i1, j1, I, J, c;
     float s = (x + y) * F2;
@@ -44,11 +44,11 @@ noise2(float x, float y)
 
     for (c = 0; c <= 2; c++)
         f[c] = 0.5f - xx[c]*xx[c] - yy[c]*yy[c];
-    
+
     for (c = 0; c <= 2; c++)
         if (f[c] > 0)
             noise[c] = f[c]*f[c]*f[c]*f[c] * (GRAD3[g[c]][0]*xx[c] + GRAD3[g[c]][1]*yy[c]);
-    
+
     return (noise[0] + noise[1] + noise[2]) * 70.0f;
 }
 
@@ -59,8 +59,8 @@ noise2(float x, float y)
 #define F3 (1.0f / 3.0f)
 #define G3 (1.0f / 6.0f)
 
-float 
-noise3(float x, float y, float z) 
+float
+noise3(float x, float y, float z)
 {
     int c, o1[3], o2[3], g[4], I, J, K;
     float f[4], noise[4] = {0.0f, 0.0f, 0.0f, 0.0f};
@@ -99,31 +99,31 @@ noise3(float x, float y, float z)
             ASSIGN(o2, 1, 1, 0);
         }
     }
-    
+
     for (c = 0; c <= 2; c++) {
         pos[3][c] = pos[0][c] - 1.0f + 3.0f * G3;
         pos[2][c] = pos[0][c] - o2[c] + 2.0f * G3;
         pos[1][c] = pos[0][c] - o1[c] + G3;
     }
 
-    I = (int) i & 255; 
-    J = (int) j & 255; 
+    I = (int) i & 255;
+    J = (int) j & 255;
     K = (int) k & 255;
     g[0] = PERM[I + PERM[J + PERM[K]]] % 12;
     g[1] = PERM[I + o1[0] + PERM[J + o1[1] + PERM[o1[2] + K]]] % 12;
     g[2] = PERM[I + o2[0] + PERM[J + o2[1] + PERM[o2[2] + K]]] % 12;
-    g[3] = PERM[I + 1 + PERM[J + 1 + PERM[K + 1]]] % 12; 
+    g[3] = PERM[I + 1 + PERM[J + 1 + PERM[K + 1]]] % 12;
 
     for (c = 0; c <= 3; c++) {
         f[c] = 0.6f - pos[c][0]*pos[c][0] - pos[c][1]*pos[c][1] - pos[c][2]*pos[c][2];
     }
-    
+
     for (c = 0; c <= 3; c++) {
         if (f[c] > 0) {
             noise[c] = f[c]*f[c]*f[c]*f[c] * dot3(pos[c], GRAD3[g[c]]);
         }
     }
-    
+
     return (noise[0] + noise[1] + noise[2] + noise[3]) * 32.0f;
 }
 
@@ -149,7 +149,7 @@ fbm_noise3(float x, float y, float z, int octaves, float persistence, float lacu
 #define F4 0.30901699437494745f /* (sqrt(5.0) - 1.0) / 4.0 */
 #define G4 0.1381966011250105f /* (5.0 - sqrt(5.0)) / 20.0 */
 
-float 
+float
 noise4(float x, float y, float z, float w) {
     float noise[5] = {0.0f, 0.0f, 0.0f, 0.0f, 0.0f};
 
@@ -201,9 +201,9 @@ noise4(float x, float y, float z, float w) {
     int K = (int)k & 255;
     int L = (int)l & 255;
     int gi0 = PERM[I + PERM[J + PERM[K + PERM[L]]]] & 0x1f;
-    int gi1 = PERM[I + i1 + PERM[J + j1 + PERM[K + k1 + PERM[L + l1]]]] & 0x1f; 
-    int gi2 = PERM[I + i2 + PERM[J + j2 + PERM[K + k2 + PERM[L + l2]]]] & 0x1f; 
-    int gi3 = PERM[I + i3 + PERM[J + j3 + PERM[K + k3 + PERM[L + l3]]]] & 0x1f; 
+    int gi1 = PERM[I + i1 + PERM[J + j1 + PERM[K + k1 + PERM[L + l1]]]] & 0x1f;
+    int gi2 = PERM[I + i2 + PERM[J + j2 + PERM[K + k2 + PERM[L + l2]]]] & 0x1f;
+    int gi3 = PERM[I + i3 + PERM[J + j3 + PERM[K + k3 + PERM[L + l3]]]] & 0x1f;
     int gi4 = PERM[I + 1 + PERM[J + 1 + PERM[K + 1 + PERM[L + 1]]]] & 0x1f;
     float t0, t1, t2, t3, t4;
 
@@ -264,7 +264,7 @@ py_noise2(PyObject *self, PyObject *args, PyObject *kwargs)
     float repeatx = FLT_MAX;
     float repeaty = FLT_MAX;
     float z = 0.0f;
-    static char *kwlist[] = {"x", "y", "octaves", "persistence", "lacunarity", 
+    static char *kwlist[] = {"x", "y", "octaves", "persistence", "lacunarity",
         "repeatx", "repeaty", "base", NULL};
 
     if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ff|ifffff:snoise2", kwlist,
@@ -275,7 +275,7 @@ py_noise2(PyObject *self, PyObject *args, PyObject *kwargs)
         PyErr_SetString(PyExc_ValueError, "Expected octaves value > 0");
         return NULL;
     }
-    
+
     if (repeatx == FLT_MAX && repeaty == FLT_MAX) {
         // Flat noise, no tiling
         float freq = 1.0f;
@@ -335,7 +335,7 @@ py_noise3(PyObject *self, PyObject *args, PyObject *kwargs)
     if (!PyArg_ParseTupleAndKeywords(args, kwargs, "fff|iff:snoise3", kwlist,
         &x, &y, &z, &octaves, &persistence, &lacunarity))
         return NULL;
-    
+
     if (octaves == 1) {
         // Single octave, return simple noise
         return (PyObject *) PyFloat_FromDouble((double) noise3(x, y, z));
@@ -361,7 +361,7 @@ py_noise4(PyObject *self, PyObject *args, PyObject *kwargs)
     if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ffff|iff:snoise4", kwlist,
         &x, &y, &z, &w, &octaves, &persistence))
         return NULL;
-    
+
     if (octaves == 1) {
         // Single octave, return simple noise
         return (PyObject *) PyFloat_FromDouble((double) noise4(x, y, z, w));
@@ -375,7 +375,7 @@ py_noise4(PyObject *self, PyObject *args, PyObject *kwargs)
 }
 
 static PyMethodDef simplex_functions[] = {
-    {"noise2", (PyCFunction)py_noise2, METH_VARARGS | METH_KEYWORDS, 
+    {"noise2", (PyCFunction)py_noise2, METH_VARARGS | METH_KEYWORDS,
         "noise2(x, y, octaves=1, persistence=0.5, lacunarity=2.0, repeatx=None, repeaty=None, base=0.0) "
         "return simplex noise value for specified 2D coordinate.\n\n"
         "octaves -- specifies the number of passes, defaults to 1 (simple noise).\n\n"
@@ -389,7 +389,7 @@ static PyMethodDef simplex_functions[] = {
         "tileable textures\n\n"
         "base -- specifies a fixed offset for the noise coordinates. Useful for\n"
         "generating different noise textures with the same repeat interval"},
-    {"noise3", (PyCFunction)py_noise3, METH_VARARGS | METH_KEYWORDS, 
+    {"noise3", (PyCFunction)py_noise3, METH_VARARGS | METH_KEYWORDS,
         "noise3(x, y, z, octaves=1, persistence=0.5, lacunarity=2.0) return simplex noise value for "
         "specified 3D coordinate\n\n"
         "octaves -- specifies the number of passes, defaults to 1 (simple noise).\n\n"
@@ -398,7 +398,7 @@ static PyMethodDef simplex_functions[] = {
         "is halved). Note the amplitude of the first pass is always 1.0.\n\n"
         "lacunarity -- specifies the frequency of each successive octave relative\n"
         "to the one below it, similar to persistence. Defaults to 2.0."},
-    {"noise4", (PyCFunction)py_noise4, METH_VARARGS | METH_KEYWORDS, 
+    {"noise4", (PyCFunction)py_noise4, METH_VARARGS | METH_KEYWORDS,
         "noise4(x, y, z, w, octaves=1, persistence=0.5, lacunarity=2.0) return simplex noise value for "
         "specified 4D coordinate\n\n"
         "octaves -- specifies the number of passes, defaults to 1 (simple noise).\n\n"