From 5e7b0cadc71dcf2ba26f957c9597b6d4cd840425 Mon Sep 17 00:00:00 2001
From: ijm <ijm@ashimaarts.com>
Date: Tue, 15 Mar 2011 18:48:11 -0700
Subject: [PATCH] Added additional mods in permute().

---
 noise.glsl | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/noise.glsl b/noise.glsl
index fd21975..47a2dff 100644
--- a/noise.glsl
+++ b/noise.glsl
@@ -8,14 +8,26 @@
 //              Distributed under the Artistic License 2.0; See LICENCE file.
 //
 
-#undef  NORMALIZE_GRADIENTS
+#define  NORMALIZE_GRADIENTS
 #undef  USE_CIRCLE
 #define COLLAPSE_SORTNET
 
-vec2 permute(vec2 x,vec3 p) { return floor(mod( (p.y*x + p.z) * x , p.x )); } 
-vec3 permute(vec3 x,vec3 p) { return floor(mod( (p.y*x + p.z) * x , p.x )); } 
-vec4 permute(vec4 x,vec3 p) { return floor(mod( (p.y*x + p.z) * x , p.x )); } 
-float permute(float x,vec3 p) { return floor(mod( (p.y*x + p.z) * x , p.x )); } 
+float permute(float x0,vec3 p) { 
+  float x1 = mod(x0 * p.y, p.x);
+  return floor(  mod( (x1 + p.z) *x0, p.x ));
+  }
+vec2 permute(vec2 x0,vec3 p) { 
+  vec2 x1 = mod(x0 * p.y, p.x);
+  return floor(  mod( (x1 + p.z) *x0, p.x ));
+  }
+vec3 permute(vec3 x0,vec3 p) { 
+  vec3 x1 = mod(x0 * p.y, p.x);
+  return floor(  mod( (x1 + p.z) *x0, p.x ));
+  }
+vec4 permute(vec4 x0,vec3 p) { 
+  vec4 x1 = mod(x0 * p.y, p.x);
+  return floor(  mod( (x1 + p.z) *x0, p.x ));
+  }
 
 uniform vec4 pParam; 
 // Example