cesium 0.13.2 → 0.14.0

data/app/assets/javascripts/Shaders/Materials/TieDyeMaterial.js

@@ -5,15 +5,19 @@ define(function() {
     return "uniform vec4 lightColor;\n\
 uniform vec4 darkColor;\n\
 uniform float frequency;\n\
+\n\
 czm_material czm_getMaterial(czm_materialInput materialInput)\n\
 {\n\
-czm_material material = czm_getDefaultMaterial(materialInput);\n\
-vec3 scaled = materialInput.str * frequency;\n\
-float t = abs(czm_snoise(scaled));\n\
-vec4 color = mix(lightColor, darkColor, t);\n\
-material.diffuse = color.rgb;\n\
-material.alpha = color.a;\n\
-return material;\n\
+    czm_material material = czm_getDefaultMaterial(materialInput);\n\
+    \n\
+    vec3 scaled = materialInput.str * frequency;\n\
+    float t = abs(czm_snoise(scaled));\n\
+    \n\
+    vec4 color = mix(lightColor, darkColor, t);\n\
+    material.diffuse = color.rgb;\n\
+    material.alpha = color.a;\n\
+    \n\
+    return material;\n\
 }\n\
 ";
 });

data/app/assets/javascripts/Shaders/Materials/Water.js

@@ -2,7 +2,10 @@
 /*global define*/
 define(function() {
     "use strict";
-    return "uniform sampler2D specularMap;\n\
+    return "// Thanks for the contribution Jonas\n\
+// http://29a.ch/2012/7/19/webgl-terrain-rendering-water-fog\n\
+\n\
+uniform sampler2D specularMap;\n\
 uniform sampler2D normalMap;\n\
 uniform vec4 baseWaterColor;\n\
 uniform vec4 blendColor;\n\
@@ -11,50 +14,48 @@ uniform float animationSpeed;\n\
 uniform float amplitude;\n\
 uniform float specularIntensity;\n\
 uniform float fadeFactor;\n\
-vec4 getNoise(vec2 uv, float time, float angleInRadians) {\n\
-float cosAngle = cos(angleInRadians);\n\
-float sinAngle = sin(angleInRadians);\n\
-vec2 s0 = vec2(1.0/17.0, 0.0);\n\
-vec2 s1 = vec2(-1.0/29.0, 0.0);\n\
-vec2 s2 = vec2(1.0/101.0, 1.0/59.0);\n\
-vec2 s3 = vec2(-1.0/109.0, -1.0/57.0);\n\
-s0 = vec2((cosAngle * s0.x) - (sinAngle * s0.y), (sinAngle * s0.x) + (cosAngle * s0.y));\n\
-s1 = vec2((cosAngle * s1.x) - (sinAngle * s1.y), (sinAngle * s1.x) + (cosAngle * s1.y));\n\
-s2 = vec2((cosAngle * s2.x) - (sinAngle * s2.y), (sinAngle * s2.x) + (cosAngle * s2.y));\n\
-s3 = vec2((cosAngle * s3.x) - (sinAngle * s3.y), (sinAngle * s3.x) + (cosAngle * s3.y));\n\
-vec2 uv0 = (uv/103.0) + (time * s0);\n\
-vec2 uv1 = uv/107.0 + (time * s1) + vec2(0.23);\n\
-vec2 uv2 = uv/vec2(897.0, 983.0) + (time * s2) + vec2(0.51);\n\
-vec2 uv3 = uv/vec2(991.0, 877.0) + (time * s3) + vec2(0.71);\n\
-uv0 = fract(uv0);\n\
-uv1 = fract(uv1);\n\
-uv2 = fract(uv2);\n\
-uv3 = fract(uv3);\n\
-vec4 noise = (texture2D(normalMap, uv0)) +\n\
-(texture2D(normalMap, uv1)) +\n\
-(texture2D(normalMap, uv2)) +\n\
-(texture2D(normalMap, uv3));\n\
-return ((noise / 4.0) - 0.5) * 2.0;\n\
-}\n\
+\n\
 czm_material czm_getMaterial(czm_materialInput materialInput)\n\
 {\n\
-czm_material material = czm_getDefaultMaterial(materialInput);\n\
-float time = czm_frameNumber * animationSpeed;\n\
-float fade = max(1.0, (length(materialInput.positionToEyeEC) / 10000000000.0) * frequency * fadeFactor);\n\
-float specularMapValue = texture2D(specularMap, materialInput.st).r;\n\
-vec4 noise = getNoise(materialInput.st * frequency, time, 0.0);\n\
-vec3 normalTangentSpace = noise.xyz * vec3(1.0, 1.0, (1.0 / amplitude));\n\
-normalTangentSpace.xy /= fade;\n\
-normalTangentSpace = mix(vec3(0.0, 0.0, 50.0), normalTangentSpace, specularMapValue);\n\
-normalTangentSpace = normalize(normalTangentSpace);\n\
-float tsPerturbationRatio = clamp(dot(normalTangentSpace, vec3(0.0, 0.0, 1.0)), 0.0, 1.0);\n\
-material.alpha = specularMapValue;\n\
-material.diffuse = mix(blendColor.rgb, baseWaterColor.rgb, specularMapValue);\n\
-material.diffuse += (0.1 * tsPerturbationRatio);\n\
-material.normal = normalize(materialInput.tangentToEyeMatrix * normalTangentSpace);\n\
-material.specular = specularIntensity;\n\
-material.shininess = 10.0;\n\
-return material;\n\
-}\n\
-";
+    czm_material material = czm_getDefaultMaterial(materialInput);\n\
+\n\
+    float time = czm_frameNumber * animationSpeed;\n\
+    \n\
+    // fade is a function of the distance from the fragment and the frequency of the waves\n\
+    float fade = max(1.0, (length(materialInput.positionToEyeEC) / 10000000000.0) * frequency * fadeFactor);\n\
+            \n\
+    float specularMapValue = texture2D(specularMap, materialInput.st).r;\n\
+    \n\
+    // note: not using directional motion at this time, just set the angle to 0.0;\n\
+    vec4 noise = czm_getWaterNoise(normalMap, materialInput.st * frequency, time, 0.0);\n\
+    vec3 normalTangentSpace = noise.xyz * vec3(1.0, 1.0, (1.0 / amplitude));\n\
+    \n\
+    // fade out the normal perturbation as we move further from the water surface\n\
+    normalTangentSpace.xy /= fade;\n\
+        \n\
+    // attempt to fade out the normal perturbation as we approach non water areas (low specular map value)\n\
+    normalTangentSpace = mix(vec3(0.0, 0.0, 50.0), normalTangentSpace, specularMapValue);\n\
+    \n\
+    normalTangentSpace = normalize(normalTangentSpace);\n\
+    \n\
+    // get ratios for alignment of the new normal vector with a vector perpendicular to the tangent plane\n\
+    float tsPerturbationRatio = clamp(dot(normalTangentSpace, vec3(0.0, 0.0, 1.0)), 0.0, 1.0);\n\
+    \n\
+    // fade out water effect as specular map value decreases\n\
+    material.alpha = specularMapValue;\n\
+    \n\
+    // base color is a blend of the water and non-water color based on the value from the specular map\n\
+    // may need a uniform blend factor to better control this\n\
+    material.diffuse = mix(blendColor.rgb, baseWaterColor.rgb, specularMapValue);\n\
+    \n\
+    // diffuse highlights are based on how perturbed the normal is\n\
+    material.diffuse += (0.1 * tsPerturbationRatio);\n\
+    \n\
+    material.normal = normalize(materialInput.tangentToEyeMatrix * normalTangentSpace);\n\
+    \n\
+    material.specular = specularIntensity;\n\
+    material.shininess = 10.0;\n\
+    \n\
+    return material;\n\
+}";
 });

data/app/assets/javascripts/Shaders/Materials/WoodMaterial.js

@@ -7,25 +7,35 @@ uniform vec4 darkWoodColor;\n\
 uniform float ringFrequency;\n\
 uniform vec2 noiseScale;\n\
 uniform float grainFrequency;\n\
+\n\
 czm_material czm_getMaterial(czm_materialInput materialInput)\n\
 {\n\
-czm_material material = czm_getDefaultMaterial(materialInput);\n\
-vec2 st = materialInput.st;\n\
-vec2 noisevec;\n\
-noisevec.x = czm_snoise(st * noiseScale.x);\n\
-noisevec.y = czm_snoise(st * noiseScale.y);\n\
-vec2 location = st + noisevec;\n\
-float dist = sqrt(location.x * location.x + location.y * location.y);\n\
-dist *= ringFrequency;\n\
-float r = fract(dist + noisevec[0] + noisevec[1]) * 2.0;\n\
-if(r > 1.0)\n\
-r = 2.0 - r;\n\
-vec4 color = mix(lightWoodColor, darkWoodColor, r);\n\
-r = abs(czm_snoise(vec2(st.x * grainFrequency, st.y * grainFrequency * 0.02))) * 0.2;\n\
-color.rgb += lightWoodColor.rgb * r;\n\
-material.diffuse = color.rgb;\n\
-material.alpha = color.a;\n\
-return material;\n\
-}\n\
-";
+    czm_material material = czm_getDefaultMaterial(materialInput);\n\
+    \n\
+    //Based on wood shader from OpenGL Shading Language (3rd edition) pg. 455\n\
+    vec2 st = materialInput.st;\n\
+    \n\
+    vec2 noisevec;\n\
+    noisevec.x = czm_snoise(st * noiseScale.x);\n\
+    noisevec.y = czm_snoise(st * noiseScale.y);\n\
+    \n\
+    vec2 location = st + noisevec;\n\
+    float dist = sqrt(location.x * location.x + location.y * location.y);\n\
+    dist *= ringFrequency;\n\
+    \n\
+    float r = fract(dist + noisevec[0] + noisevec[1]) * 2.0;\n\
+    if(r > 1.0)\n\
+        r = 2.0 - r;\n\
+        \n\
+    vec4 color = mix(lightWoodColor, darkWoodColor, r);\n\
+    \n\
+    //streaks\n\
+    r = abs(czm_snoise(vec2(st.x * grainFrequency, st.y * grainFrequency * 0.02))) * 0.2;\n\
+    color.rgb += lightWoodColor.rgb * r;\n\
+    \n\
+    material.diffuse = color.rgb;\n\
+    material.alpha = color.a;\n\
+    \n\
+    return material;\n\
+}";
 });

data/app/assets/javascripts/Shaders/Noise.js

@@ -22,221 +22,456 @@ define(function() {
     "use strict";
     return "#ifndef czm_NOISE\n\
 #define czm_NOISE 1\n\
+\n\
+/**\n\
+ * @license\n\
+ * Description : Array and textureless GLSL 2D/3D/4D simplex \n\
+ *               noise functions.\n\
+ *      Author : Ian McEwan, Ashima Arts.\n\
+ *  Maintainer : ijm\n\
+ *     Lastmod : 20110822 (ijm)\n\
+ *     License : Copyright (C) 2011 Ashima Arts. All rights reserved.\n\
+ *               Distributed under the MIT License. See LICENSE file.\n\
+ *               https://github.com/ashima/webgl-noise\n\
+ */ \n\
+\n\
 vec4 _czm_mod289(vec4 x)\n\
 {\n\
-return x - floor(x * (1.0 / 289.0)) * 289.0;\n\
+  return x - floor(x * (1.0 / 289.0)) * 289.0;\n\
 }\n\
+\n\
 vec3 _czm_mod289(vec3 x)\n\
 {\n\
-return x - floor(x * (1.0 / 289.0)) * 289.0;\n\
+    return x - floor(x * (1.0 / 289.0)) * 289.0;\n\
 }\n\
-vec2 _czm_mod289(vec2 x)\n\
+\n\
+vec2 _czm_mod289(vec2 x) \n\
 {\n\
-return x - floor(x * (1.0 / 289.0)) * 289.0;\n\
+    return x - floor(x * (1.0 / 289.0)) * 289.0;\n\
 }\n\
+\n\
 float _czm_mod289(float x)\n\
 {\n\
-return x - floor(x * (1.0 / 289.0)) * 289.0;\n\
+    return x - floor(x * (1.0 / 289.0)) * 289.0;\n\
 }\n\
+  \n\
 vec4 _czm_permute(vec4 x)\n\
 {\n\
-return _czm_mod289(((x*34.0)+1.0)*x);\n\
+    return _czm_mod289(((x*34.0)+1.0)*x);\n\
 }\n\
+\n\
 vec3 _czm_permute(vec3 x)\n\
 {\n\
-return _czm_mod289(((x*34.0)+1.0)*x);\n\
+    return _czm_mod289(((x*34.0)+1.0)*x);\n\
 }\n\
-float _czm_permute(float x)\n\
+\n\
+float _czm_permute(float x) \n\
 {\n\
-return _czm_mod289(((x*34.0)+1.0)*x);\n\
+    return _czm_mod289(((x*34.0)+1.0)*x);\n\
 }\n\
+\n\
 vec4 _czm_taylorInvSqrt(vec4 r)\n\
 {\n\
-return 1.79284291400159 - 0.85373472095314 * r;\n\
+    return 1.79284291400159 - 0.85373472095314 * r;\n\
 }\n\
+\n\
 float _czm_taylorInvSqrt(float r)\n\
 {\n\
-return 1.79284291400159 - 0.85373472095314 * r;\n\
+    return 1.79284291400159 - 0.85373472095314 * r;\n\
 }\n\
+\n\
 vec4 _czm_grad4(float j, vec4 ip)\n\
 {\n\
-const vec4 ones = vec4(1.0, 1.0, 1.0, -1.0);\n\
-vec4 p,s;\n\
-p.xyz = floor( fract (vec3(j) * ip.xyz) * 7.0) * ip.z - 1.0;\n\
-p.w = 1.5 - dot(abs(p.xyz), ones.xyz);\n\
-s = vec4(lessThan(p, vec4(0.0)));\n\
-p.xyz = p.xyz + (s.xyz*2.0 - 1.0) * s.www;\n\
-return p;\n\
+    const vec4 ones = vec4(1.0, 1.0, 1.0, -1.0);\n\
+    vec4 p,s;\n\
+\n\
+    p.xyz = floor( fract (vec3(j) * ip.xyz) * 7.0) * ip.z - 1.0;\n\
+    p.w = 1.5 - dot(abs(p.xyz), ones.xyz);\n\
+    s = vec4(lessThan(p, vec4(0.0)));\n\
+    p.xyz = p.xyz + (s.xyz*2.0 - 1.0) * s.www; \n\
+\n\
+    return p;\n\
 }\n\
+  \n\
+/**\n\
+ * DOC_TBA\n\
+ *\n\
+ * Implemented by Ian McEwan, Ashima Arts, and distributed under the MIT License.  {@link https://github.com/ashima/webgl-noise}\n\
+ *\n\
+ * @name czm_snoise\n\
+ * @glslFunction\n\
+ *\n\
+ * @see <a href=\"https://github.com/ashima/webgl-noise\">https://github.com/ashima/webgl-noise</a>\n\
+ * @see Stefan Gustavson's paper <a href=\"http://www.itn.liu.se/~stegu/simplexnoise/simplexnoise.pdf\">Simplex noise demystified</a>\n\
+ */  \n\
 float czm_snoise(vec2 v)\n\
 {\n\
-const vec4 C = vec4(0.211324865405187,\n\
-0.366025403784439,\n\
--0.577350269189626,\n\
-0.024390243902439);\n\
-vec2 i  = floor(v + dot(v, C.yy) );\n\
-vec2 x0 = v -   i + dot(i, C.xx);\n\
-vec2 i1;\n\
-i1 = (x0.x > x0.y) ? vec2(1.0, 0.0) : vec2(0.0, 1.0);\n\
-vec4 x12 = x0.xyxy + C.xxzz;\n\
-x12.xy -= i1;\n\
-i = _czm_mod289(i);\n\
-vec3 p = _czm_permute( _czm_permute( i.y + vec3(0.0, i1.y, 1.0 )) + i.x + vec3(0.0, i1.x, 1.0 ));\n\
-vec3 m = max(0.5 - vec3(dot(x0,x0), dot(x12.xy,x12.xy), dot(x12.zw,x12.zw)), 0.0);\n\
-m = m*m ;\n\
-m = m*m ;\n\
-vec3 x = 2.0 * fract(p * C.www) - 1.0;\n\
-vec3 h = abs(x) - 0.5;\n\
-vec3 ox = floor(x + 0.5);\n\
-vec3 a0 = x - ox;\n\
-m *= 1.79284291400159 - 0.85373472095314 * ( a0*a0 + h*h );\n\
-vec3 g;\n\
-g.x  = a0.x  * x0.x  + h.x  * x0.y;\n\
-g.yz = a0.yz * x12.xz + h.yz * x12.yw;\n\
-return 130.0 * dot(m, g);\n\
+    const vec4 C = vec4(0.211324865405187,  // (3.0-sqrt(3.0))/6.0\n\
+                        0.366025403784439,  // 0.5*(sqrt(3.0)-1.0)\n\
+                       -0.577350269189626,  // -1.0 + 2.0 * C.x\n\
+                        0.024390243902439); // 1.0 / 41.0\n\
+    // First corner\n\
+    vec2 i  = floor(v + dot(v, C.yy) );\n\
+    vec2 x0 = v -   i + dot(i, C.xx);\n\
+\n\
+    // Other corners\n\
+    vec2 i1;\n\
+    //i1.x = step( x0.y, x0.x ); // x0.x > x0.y ? 1.0 : 0.0\n\
+    //i1.y = 1.0 - i1.x;\n\
+    i1 = (x0.x > x0.y) ? vec2(1.0, 0.0) : vec2(0.0, 1.0);\n\
+    // x0 = x0 - 0.0 + 0.0 * C.xx ;\n\
+    // x1 = x0 - i1 + 1.0 * C.xx ;\n\
+    // x2 = x0 - 1.0 + 2.0 * C.xx ;\n\
+    vec4 x12 = x0.xyxy + C.xxzz;\n\
+    x12.xy -= i1;\n\
+\n\
+    // Permutations\n\
+    i = _czm_mod289(i); // Avoid truncation effects in permutation\n\
+    vec3 p = _czm_permute( _czm_permute( i.y + vec3(0.0, i1.y, 1.0 )) + i.x + vec3(0.0, i1.x, 1.0 ));\n\
+\n\
+    vec3 m = max(0.5 - vec3(dot(x0,x0), dot(x12.xy,x12.xy), dot(x12.zw,x12.zw)), 0.0);\n\
+    m = m*m ;\n\
+    m = m*m ;\n\
+\n\
+    // Gradients: 41 points uniformly over a line, mapped onto a diamond.\n\
+    // The ring size 17*17 = 289 is close to a multiple of 41 (41*7 = 287)\n\
+    vec3 x = 2.0 * fract(p * C.www) - 1.0;\n\
+    vec3 h = abs(x) - 0.5;\n\
+    vec3 ox = floor(x + 0.5);\n\
+    vec3 a0 = x - ox;\n\
+\n\
+    // Normalise gradients implicitly by scaling m\n\
+    // Approximation of: m *= inversesqrt( a0*a0 + h*h );\n\
+    m *= 1.79284291400159 - 0.85373472095314 * ( a0*a0 + h*h );\n\
+\n\
+    // Compute final noise value at P\n\
+    vec3 g;\n\
+    g.x  = a0.x  * x0.x  + h.x  * x0.y;\n\
+    g.yz = a0.yz * x12.xz + h.yz * x12.yw;\n\
+    return 130.0 * dot(m, g);\n\
 }\n\
+\n\
 float czm_snoise(vec3 v)\n\
-{\n\
-const vec2  C = vec2(1.0/6.0, 1.0/3.0) ;\n\
-const vec4  D = vec4(0.0, 0.5, 1.0, 2.0);\n\
-vec3 i  = floor(v + dot(v, C.yyy) );\n\
-vec3 x0 =   v - i + dot(i, C.xxx) ;\n\
-vec3 g = step(x0.yzx, x0.xyz);\n\
-vec3 l = 1.0 - g;\n\
-vec3 i1 = min( g.xyz, l.zxy );\n\
-vec3 i2 = max( g.xyz, l.zxy );\n\
-vec3 x1 = x0 - i1 + C.xxx;\n\
-vec3 x2 = x0 - i2 + C.yyy;\n\
-vec3 x3 = x0 - D.yyy;\n\
-i = _czm_mod289(i);\n\
-vec4 p = _czm_permute( _czm_permute( _czm_permute(\n\
-i.z + vec4(0.0, i1.z, i2.z, 1.0 ))\n\
-+ i.y + vec4(0.0, i1.y, i2.y, 1.0 ))\n\
-+ i.x + vec4(0.0, i1.x, i2.x, 1.0 ));\n\
-float n_ = 0.142857142857;\n\
-vec3  ns = n_ * D.wyz - D.xzx;\n\
-vec4 j = p - 49.0 * floor(p * ns.z * ns.z);\n\
-vec4 x_ = floor(j * ns.z);\n\
-vec4 y_ = floor(j - 7.0 * x_ );\n\
-vec4 x = x_ *ns.x + ns.yyyy;\n\
-vec4 y = y_ *ns.x + ns.yyyy;\n\
-vec4 h = 1.0 - abs(x) - abs(y);\n\
-vec4 b0 = vec4( x.xy, y.xy );\n\
-vec4 b1 = vec4( x.zw, y.zw );\n\
-vec4 s0 = floor(b0)*2.0 + 1.0;\n\
-vec4 s1 = floor(b1)*2.0 + 1.0;\n\
-vec4 sh = -step(h, vec4(0.0));\n\
-vec4 a0 = b0.xzyw + s0.xzyw*sh.xxyy ;\n\
-vec4 a1 = b1.xzyw + s1.xzyw*sh.zzww ;\n\
-vec3 p0 = vec3(a0.xy,h.x);\n\
-vec3 p1 = vec3(a0.zw,h.y);\n\
-vec3 p2 = vec3(a1.xy,h.z);\n\
-vec3 p3 = vec3(a1.zw,h.w);\n\
-vec4 norm = _czm_taylorInvSqrt(vec4(dot(p0,p0), dot(p1,p1), dot(p2, p2), dot(p3,p3)));\n\
-p0 *= norm.x;\n\
-p1 *= norm.y;\n\
-p2 *= norm.z;\n\
-p3 *= norm.w;\n\
-vec4 m = max(0.6 - vec4(dot(x0,x0), dot(x1,x1), dot(x2,x2), dot(x3,x3)), 0.0);\n\
-m = m * m;\n\
-return 42.0 * dot( m*m, vec4( dot(p0,x0), dot(p1,x1),\n\
-dot(p2,x2), dot(p3,x3) ) );\n\
+{ \n\
+    const vec2  C = vec2(1.0/6.0, 1.0/3.0) ;\n\
+    const vec4  D = vec4(0.0, 0.5, 1.0, 2.0);\n\
+\n\
+    // First corner\n\
+    vec3 i  = floor(v + dot(v, C.yyy) );\n\
+    vec3 x0 =   v - i + dot(i, C.xxx) ;\n\
+\n\
+    // Other corners\n\
+    vec3 g = step(x0.yzx, x0.xyz);\n\
+    vec3 l = 1.0 - g;\n\
+    vec3 i1 = min( g.xyz, l.zxy );\n\
+    vec3 i2 = max( g.xyz, l.zxy );\n\
+\n\
+    //   x0 = x0 - 0.0 + 0.0 * C.xxx;\n\
+    //   x1 = x0 - i1  + 1.0 * C.xxx;\n\
+    //   x2 = x0 - i2  + 2.0 * C.xxx;\n\
+    //   x3 = x0 - 1.0 + 3.0 * C.xxx;\n\
+    vec3 x1 = x0 - i1 + C.xxx;\n\
+    vec3 x2 = x0 - i2 + C.yyy; // 2.0*C.x = 1/3 = C.y\n\
+    vec3 x3 = x0 - D.yyy;      // -1.0+3.0*C.x = -0.5 = -D.y\n\
+\n\
+    // Permutations\n\
+    i = _czm_mod289(i); \n\
+    vec4 p = _czm_permute( _czm_permute( _czm_permute( \n\
+                i.z + vec4(0.0, i1.z, i2.z, 1.0 ))\n\
+              + i.y + vec4(0.0, i1.y, i2.y, 1.0 )) \n\
+              + i.x + vec4(0.0, i1.x, i2.x, 1.0 ));\n\
+\n\
+    // Gradients: 7x7 points over a square, mapped onto an octahedron.\n\
+    // The ring size 17*17 = 289 is close to a multiple of 49 (49*6 = 294)\n\
+    float n_ = 0.142857142857; // 1.0/7.0\n\
+    vec3  ns = n_ * D.wyz - D.xzx;\n\
+\n\
+    vec4 j = p - 49.0 * floor(p * ns.z * ns.z);  //  mod(p,7*7)\n\
+\n\
+    vec4 x_ = floor(j * ns.z);\n\
+    vec4 y_ = floor(j - 7.0 * x_ );    // mod(j,N)\n\
+\n\
+    vec4 x = x_ *ns.x + ns.yyyy;\n\
+    vec4 y = y_ *ns.x + ns.yyyy;\n\
+    vec4 h = 1.0 - abs(x) - abs(y);\n\
+\n\
+    vec4 b0 = vec4( x.xy, y.xy );\n\
+    vec4 b1 = vec4( x.zw, y.zw );\n\
+\n\
+    //vec4 s0 = vec4(lessThan(b0,0.0))*2.0 - 1.0;\n\
+    //vec4 s1 = vec4(lessThan(b1,0.0))*2.0 - 1.0;\n\
+    vec4 s0 = floor(b0)*2.0 + 1.0;\n\
+    vec4 s1 = floor(b1)*2.0 + 1.0;\n\
+    vec4 sh = -step(h, vec4(0.0));\n\
+\n\
+    vec4 a0 = b0.xzyw + s0.xzyw*sh.xxyy ;\n\
+    vec4 a1 = b1.xzyw + s1.xzyw*sh.zzww ;\n\
+\n\
+    vec3 p0 = vec3(a0.xy,h.x);\n\
+    vec3 p1 = vec3(a0.zw,h.y);\n\
+    vec3 p2 = vec3(a1.xy,h.z);\n\
+    vec3 p3 = vec3(a1.zw,h.w);\n\
+\n\
+    //Normalise gradients\n\
+    vec4 norm = _czm_taylorInvSqrt(vec4(dot(p0,p0), dot(p1,p1), dot(p2, p2), dot(p3,p3)));\n\
+    p0 *= norm.x;\n\
+    p1 *= norm.y;\n\
+    p2 *= norm.z;\n\
+    p3 *= norm.w;\n\
+\n\
+    // Mix final noise value\n\
+    vec4 m = max(0.6 - vec4(dot(x0,x0), dot(x1,x1), dot(x2,x2), dot(x3,x3)), 0.0);\n\
+    m = m * m;\n\
+    return 42.0 * dot( m*m, vec4( dot(p0,x0), dot(p1,x1), \n\
+                                dot(p2,x2), dot(p3,x3) ) );\n\
 }\n\
+\n\
 float czm_snoise(vec4 v)\n\
 {\n\
-const vec4  C = vec4( 0.138196601125011,\n\
-0.276393202250021,\n\
-0.414589803375032,\n\
--0.447213595499958);\n\
-#define F4 0.309016994374947451\n\
-vec4 i  = floor(v + dot(v, vec4(F4)) );\n\
-vec4 x0 = v -   i + dot(i, C.xxxx);\n\
-vec4 i0;\n\
-vec3 isX = step( x0.yzw, x0.xxx );\n\
-vec3 isYZ = step( x0.zww, x0.yyz );\n\
-i0.x = isX.x + isX.y + isX.z;\n\
-i0.yzw = 1.0 - isX;\n\
-i0.y += isYZ.x + isYZ.y;\n\
-i0.zw += 1.0 - isYZ.xy;\n\
-i0.z += isYZ.z;\n\
-i0.w += 1.0 - isYZ.z;\n\
-vec4 i3 = clamp( i0, 0.0, 1.0 );\n\
-vec4 i2 = clamp( i0-1.0, 0.0, 1.0 );\n\
-vec4 i1 = clamp( i0-2.0, 0.0, 1.0 );\n\
-vec4 x1 = x0 - i1 + C.xxxx;\n\
-vec4 x2 = x0 - i2 + C.yyyy;\n\
-vec4 x3 = x0 - i3 + C.zzzz;\n\
-vec4 x4 = x0 + C.wwww;\n\
-i = _czm_mod289(i);\n\
-float j0 = _czm_permute( _czm_permute( _czm_permute( _czm_permute(i.w) + i.z) + i.y) + i.x);\n\
-vec4 j1 = _czm_permute( _czm_permute( _czm_permute( _czm_permute (\n\
-i.w + vec4(i1.w, i2.w, i3.w, 1.0 ))\n\
-+ i.z + vec4(i1.z, i2.z, i3.z, 1.0 ))\n\
-+ i.y + vec4(i1.y, i2.y, i3.y, 1.0 ))\n\
-+ i.x + vec4(i1.x, i2.x, i3.x, 1.0 ));\n\
-vec4 ip = vec4(1.0/294.0, 1.0/49.0, 1.0/7.0, 0.0) ;\n\
-vec4 p0 = _czm_grad4(j0,   ip);\n\
-vec4 p1 = _czm_grad4(j1.x, ip);\n\
-vec4 p2 = _czm_grad4(j1.y, ip);\n\
-vec4 p3 = _czm_grad4(j1.z, ip);\n\
-vec4 p4 = _czm_grad4(j1.w, ip);\n\
-vec4 norm = _czm_taylorInvSqrt(vec4(dot(p0,p0), dot(p1,p1), dot(p2, p2), dot(p3,p3)));\n\
-p0 *= norm.x;\n\
-p1 *= norm.y;\n\
-p2 *= norm.z;\n\
-p3 *= norm.w;\n\
-p4 *= _czm_taylorInvSqrt(dot(p4,p4));\n\
-vec3 m0 = max(0.6 - vec3(dot(x0,x0), dot(x1,x1), dot(x2,x2)), 0.0);\n\
-vec2 m1 = max(0.6 - vec2(dot(x3,x3), dot(x4,x4)            ), 0.0);\n\
-m0 = m0 * m0;\n\
-m1 = m1 * m1;\n\
-return 49.0 * ( dot(m0*m0, vec3( dot( p0, x0 ), dot( p1, x1 ), dot( p2, x2 )))\n\
-+ dot(m1*m1, vec2( dot( p3, x3 ), dot( p4, x4 ) ) ) ) ;\n\
+    const vec4  C = vec4( 0.138196601125011,  // (5 - sqrt(5))/20  G4\n\
+                          0.276393202250021,  // 2 * G4\n\
+                          0.414589803375032,  // 3 * G4\n\
+                         -0.447213595499958); // -1 + 4 * G4\n\
+\n\
+    // (sqrt(5) - 1)/4 = F4, used once below\n\
+    #define F4 0.309016994374947451\n\
+\n\
+    // First corner\n\
+    vec4 i  = floor(v + dot(v, vec4(F4)) );\n\
+    vec4 x0 = v -   i + dot(i, C.xxxx);\n\
+\n\
+    // Other corners\n\
+\n\
+    // Rank sorting originally contributed by Bill Licea-Kane, AMD (formerly ATI)\n\
+    vec4 i0;\n\
+    vec3 isX = step( x0.yzw, x0.xxx );\n\
+    vec3 isYZ = step( x0.zww, x0.yyz );\n\
+    //  i0.x = dot( isX, vec3( 1.0 ) );\n\
+    i0.x = isX.x + isX.y + isX.z;\n\
+    i0.yzw = 1.0 - isX;\n\
+    //  i0.y += dot( isYZ.xy, vec2( 1.0 ) );\n\
+    i0.y += isYZ.x + isYZ.y;\n\
+    i0.zw += 1.0 - isYZ.xy;\n\
+    i0.z += isYZ.z;\n\
+    i0.w += 1.0 - isYZ.z;\n\
+\n\
+    // i0 now contains the unique values 0,1,2,3 in each channel\n\
+    vec4 i3 = clamp( i0, 0.0, 1.0 );\n\
+    vec4 i2 = clamp( i0-1.0, 0.0, 1.0 );\n\
+    vec4 i1 = clamp( i0-2.0, 0.0, 1.0 );\n\
+\n\
+    //  x0 = x0 - 0.0 + 0.0 * C.xxxx\n\
+    //  x1 = x0 - i1  + 1.0 * C.xxxx\n\
+    //  x2 = x0 - i2  + 2.0 * C.xxxx\n\
+    //  x3 = x0 - i3  + 3.0 * C.xxxx\n\
+    //  x4 = x0 - 1.0 + 4.0 * C.xxxx\n\
+    vec4 x1 = x0 - i1 + C.xxxx;\n\
+    vec4 x2 = x0 - i2 + C.yyyy;\n\
+    vec4 x3 = x0 - i3 + C.zzzz;\n\
+    vec4 x4 = x0 + C.wwww;\n\
+\n\
+    // Permutations\n\
+    i = _czm_mod289(i); \n\
+    float j0 = _czm_permute( _czm_permute( _czm_permute( _czm_permute(i.w) + i.z) + i.y) + i.x);\n\
+    vec4 j1 = _czm_permute( _czm_permute( _czm_permute( _czm_permute (\n\
+               i.w + vec4(i1.w, i2.w, i3.w, 1.0 ))\n\
+             + i.z + vec4(i1.z, i2.z, i3.z, 1.0 ))\n\
+             + i.y + vec4(i1.y, i2.y, i3.y, 1.0 ))\n\
+             + i.x + vec4(i1.x, i2.x, i3.x, 1.0 ));\n\
+\n\
+    // Gradients: 7x7x6 points over a cube, mapped onto a 4-cross polytope\n\
+    // 7*7*6 = 294, which is close to the ring size 17*17 = 289.\n\
+    vec4 ip = vec4(1.0/294.0, 1.0/49.0, 1.0/7.0, 0.0) ;\n\
+\n\
+    vec4 p0 = _czm_grad4(j0,   ip);\n\
+    vec4 p1 = _czm_grad4(j1.x, ip);\n\
+    vec4 p2 = _czm_grad4(j1.y, ip);\n\
+    vec4 p3 = _czm_grad4(j1.z, ip);\n\
+    vec4 p4 = _czm_grad4(j1.w, ip);\n\
+\n\
+    // Normalise gradients\n\
+    vec4 norm = _czm_taylorInvSqrt(vec4(dot(p0,p0), dot(p1,p1), dot(p2, p2), dot(p3,p3)));\n\
+    p0 *= norm.x;\n\
+    p1 *= norm.y;\n\
+    p2 *= norm.z;\n\
+    p3 *= norm.w;\n\
+    p4 *= _czm_taylorInvSqrt(dot(p4,p4));\n\
+\n\
+    // Mix contributions from the five corners\n\
+    vec3 m0 = max(0.6 - vec3(dot(x0,x0), dot(x1,x1), dot(x2,x2)), 0.0);\n\
+    vec2 m1 = max(0.6 - vec2(dot(x3,x3), dot(x4,x4)            ), 0.0);\n\
+    m0 = m0 * m0;\n\
+    m1 = m1 * m1;\n\
+    return 49.0 * ( dot(m0*m0, vec3( dot( p0, x0 ), dot( p1, x1 ), dot( p2, x2 )))\n\
+                  + dot(m1*m1, vec2( dot( p3, x3 ), dot( p4, x4 ) ) ) ) ;\n\
 }\n\
+\n\
+///////////////////////////////////////////////////////////////////////////////\n\
+\n\
+/**\n\
+ * @license\n\
+ * Cellular noise (\"Worley noise\") in 2D in GLSL.\n\
+ * Copyright (c) Stefan Gustavson 2011-04-19. All rights reserved.\n\
+ * This code is released under the conditions of the MIT license.\n\
+ * See LICENSE file for details.\n\
+ */\n\
+ \n\
+//#ifdef GL_OES_standard_derivatives\n\
+//    #extension GL_OES_standard_derivatives : enable\n\
+//#endif  \n\
+//\n\
+//float aastep (float threshold , float value)\n\
+//{\n\
+//    float afwidth = 0.7 * length ( vec2 ( dFdx ( value ), dFdy ( value )));\n\
+//    return smoothstep ( threshold - afwidth , threshold + afwidth , value );\n\
+//}\n\
+\n\
+// Permutation polynomial: (34x^2 + x) mod 289\n\
 vec3 _czm_permute289(vec3 x)\n\
 {\n\
-return mod((34.0 * x + 1.0) * x, 289.0);\n\
+    return mod((34.0 * x + 1.0) * x, 289.0);\n\
 }\n\
+\n\
+/**\n\
+ * DOC_TBA\n\
+ *\n\
+ * Implemented by Stefan Gustavson, and distributed under the MIT License.  {@link http://openglinsights.git.sourceforge.net/git/gitweb.cgi?p=openglinsights/openglinsights;a=tree;f=proceduraltextures}\n\
+ *\n\
+ * @name czm_cellular\n\
+ * @glslFunction\n\
+ *\n\
+ * @see Stefan Gustavson's chapter, <i>Procedural Textures in GLSL</i>, in <a href=\"http://www.openglinsights.com/\">OpenGL Insights</a>.\n\
+ */  \n\
 vec2 czm_cellular(vec2 P)\n\
+// Cellular noise, returning F1 and F2 in a vec2.\n\
+// Standard 3x3 search window for good F1 and F2 values\n\
+{\n\
+#define K 0.142857142857 // 1/7\n\
+#define Ko 0.428571428571 // 3/7\n\
+#define jitter 1.0 // Less gives more regular pattern\n\
+    vec2 Pi = mod(floor(P), 289.0);\n\
+    vec2 Pf = fract(P);\n\
+    vec3 oi = vec3(-1.0, 0.0, 1.0);\n\
+    vec3 of = vec3(-0.5, 0.5, 1.5);\n\
+    vec3 px = _czm_permute289(Pi.x + oi);\n\
+    vec3 p = _czm_permute289(px.x + Pi.y + oi); // p11, p12, p13\n\
+    vec3 ox = fract(p*K) - Ko;\n\
+    vec3 oy = mod(floor(p*K),7.0)*K - Ko;\n\
+    vec3 dx = Pf.x + 0.5 + jitter*ox;\n\
+    vec3 dy = Pf.y - of + jitter*oy;\n\
+    vec3 d1 = dx * dx + dy * dy; // d11, d12 and d13, squared\n\
+    p = _czm_permute289(px.y + Pi.y + oi); // p21, p22, p23\n\
+    ox = fract(p*K) - Ko;\n\
+    oy = mod(floor(p*K),7.0)*K - Ko;\n\
+    dx = Pf.x - 0.5 + jitter*ox;\n\
+    dy = Pf.y - of + jitter*oy;\n\
+    vec3 d2 = dx * dx + dy * dy; // d21, d22 and d23, squared\n\
+    p = _czm_permute289(px.z + Pi.y + oi); // p31, p32, p33\n\
+    ox = fract(p*K) - Ko;\n\
+    oy = mod(floor(p*K),7.0)*K - Ko;\n\
+    dx = Pf.x - 1.5 + jitter*ox;\n\
+    dy = Pf.y - of + jitter*oy;\n\
+    vec3 d3 = dx * dx + dy * dy; // d31, d32 and d33, squared\n\
+    // Sort out the two smallest distances (F1, F2)\n\
+    vec3 d1a = min(d1, d2);\n\
+    d2 = max(d1, d2); // Swap to keep candidates for F2\n\
+    d2 = min(d2, d3); // neither F1 nor F2 are now in d3\n\
+    d1 = min(d1a, d2); // F1 is now in d1\n\
+    d2 = max(d1a, d2); // Swap to keep candidates for F2\n\
+    d1.xy = (d1.x < d1.y) ? d1.xy : d1.yx; // Swap if smaller\n\
+    d1.xz = (d1.x < d1.z) ? d1.xz : d1.zx; // F1 is in d1.x\n\
+    d1.yz = min(d1.yz, d2.yz); // F2 is now not in d2.yz\n\
+    d1.y = min(d1.y, d1.z); // nor in  d1.z\n\
+    d1.y = min(d1.y, d2.x); // F2 is in d1.y, we're done.\n\
+    return sqrt(d1.xy);\n\
+}\n\
+\n\
+/*\n\
+\n\
+// Cellular noise, returning F1 and F2 in a vec2 and the\n\
+// 2D vectors to each of the two closest points in a vec4.\n\
+// Standard 3x3 search window for good F1 and F2 values.\n\
+void czm_cellular(in vec2 P, out vec2 F, out vec4 d1d2)\n\
 {\n\
-#define K 0.142857142857\n\
-#define Ko 0.428571428571\n\
-#define jitter 1.0\n\
-vec2 Pi = mod(floor(P), 289.0);\n\
-vec2 Pf = fract(P);\n\
-vec3 oi = vec3(-1.0, 0.0, 1.0);\n\
-vec3 of = vec3(-0.5, 0.5, 1.5);\n\
-vec3 px = _czm_permute289(Pi.x + oi);\n\
-vec3 p = _czm_permute289(px.x + Pi.y + oi);\n\
-vec3 ox = fract(p*K) - Ko;\n\
-vec3 oy = mod(floor(p*K),7.0)*K - Ko;\n\
-vec3 dx = Pf.x + 0.5 + jitter*ox;\n\
-vec3 dy = Pf.y - of + jitter*oy;\n\
-vec3 d1 = dx * dx + dy * dy;\n\
-p = _czm_permute289(px.y + Pi.y + oi);\n\
-ox = fract(p*K) - Ko;\n\
-oy = mod(floor(p*K),7.0)*K - Ko;\n\
-dx = Pf.x - 0.5 + jitter*ox;\n\
-dy = Pf.y - of + jitter*oy;\n\
-vec3 d2 = dx * dx + dy * dy;\n\
-p = _czm_permute289(px.z + Pi.y + oi);\n\
-ox = fract(p*K) - Ko;\n\
-oy = mod(floor(p*K),7.0)*K - Ko;\n\
-dx = Pf.x - 1.5 + jitter*ox;\n\
-dy = Pf.y - of + jitter*oy;\n\
-vec3 d3 = dx * dx + dy * dy;\n\
-vec3 d1a = min(d1, d2);\n\
-d2 = max(d1, d2);\n\
-d2 = min(d2, d3);\n\
-d1 = min(d1a, d2);\n\
-d2 = max(d1a, d2);\n\
-d1.xy = (d1.x < d1.y) ? d1.xy : d1.yx;\n\
-d1.xz = (d1.x < d1.z) ? d1.xz : d1.zx;\n\
-d1.yz = min(d1.yz, d2.yz);\n\
-d1.y = min(d1.y, d1.z);\n\
-d1.y = min(d1.y, d2.x);\n\
-return sqrt(d1.xy);\n\
+#define K 0.142857142857 // 1/7\n\
+#define Ko 0.428571428571 // 3/7\n\
+#define jitter 1.0 // Less gives more regular pattern\n\
+    vec2 Pi = mod(floor(P), 289.0);\n\
+    vec2 Pf = fract(P);\n\
+    vec3 oi = vec3(-1.0, 0.0, 1.0);\n\
+    vec3 of = vec3(-0.5, 0.5, 1.5);\n\
+    vec3 px = _czm_permute289(Pi.x + oi);\n\
+    vec3 p = _czm_permute289(px.x + Pi.y + oi); // p11, p12, p13\n\
+    vec3 ox = fract(p*K) - Ko;\n\
+    vec3 oy = mod(floor(p*K),7.0)*K - Ko;\n\
+    vec3 d1x = Pf.x + 0.5 + jitter*ox;\n\
+    vec3 d1y = Pf.y - of + jitter*oy;\n\
+    vec3 d1 = d1x * d1x + d1y * d1y; // d11, d12 and d13, squared\n\
+    p = _czm_permute289(px.y + Pi.y + oi); // p21, p22, p23\n\
+    ox = fract(p*K) - Ko;\n\
+    oy = mod(floor(p*K),7.0)*K - Ko;\n\
+    vec3 d2x = Pf.x - 0.5 + jitter*ox;\n\
+    vec3 d2y = Pf.y - of + jitter*oy;\n\
+    vec3 d2 = d2x * d2x + d2y * d2y; // d21, d22 and d23, squared\n\
+    p = _czm_permute289(px.z + Pi.y + oi); // p31, p32, p33\n\
+    ox = fract(p*K) - Ko;\n\
+    oy = mod(floor(p*K),7.0)*K - Ko;\n\
+    vec3 d3x = Pf.x - 1.5 + jitter*ox;\n\
+    vec3 d3y = Pf.y - of + jitter*oy;\n\
+    vec3 d3 = d3x * d3x + d3y * d3y; // d31, d32 and d33, squared\n\
+    // Sort out the two smallest distances (F1, F2)\n\
+    // While also swapping dx and dy accordingly\n\
+    vec3 comp3 = step(d2, d1);\n\
+    vec3 d1a = mix(d1, d2, comp3);\n\
+    vec3 d1xa = mix(d1x, d2x, comp3);\n\
+    vec3 d1ya = mix(d1y, d2y, comp3);\n\
+    d2 = mix(d2, d1, comp3); // Swap to keep candidates for F2\n\
+    d2x = mix(d2x, d1x, comp3);\n\
+    d2y = mix(d2y, d1y, comp3);\n\
+  \n\
+    comp3 = step(d3, d2);\n\
+    d2 = mix(d2, d3, comp3); // neither F1 nor F2 are now in d3\n\
+    d2x = mix(d2x, d3x, comp3);\n\
+    d2y = mix(d2y, d3y, comp3);\n\
+  \n\
+    comp3 = step(d2, d1a);\n\
+    d1 = mix(d1a, d2, comp3); // F1 is now in d1\n\
+    d1x = mix(d1xa, d2x, comp3);\n\
+    d1y = mix(d1ya, d2y, comp3);\n\
+    d2 = mix(d2, d1a, comp3); // Swap to keep candidates for F2\n\
+    d2x = mix(d2x, d1xa, comp3);\n\
+    d2y = mix(d2y, d1ya, comp3);\n\
+  \n\
+    float comp1 = step(d1.y, d1.x);\n\
+    d1.xy = mix(d1.xy, d1.yx, comp1); // Swap if smaller\n\
+    d1x.xy = mix(d1x.xy, d1x.yx, comp1);\n\
+    d1y.xy = mix(d1y.xy, d1y.yx, comp1);\n\
+  \n\
+    comp1 = step(d1.z, d1.x);\n\
+    d1.xz = mix(d1.xz, d1.zx, comp1); // F1 is in d1.x\n\
+    d1x.xz = mix(d1x.xz, d1x.zx, comp1);\n\
+    d1y.xz = mix(d1y.xz, d1y.zx, comp1);\n\
+ \n\
+    vec2 comp2 = step(d2.yz, d1.yz);\n\
+    d1.yz = mix(d1.yz, d2.yz, comp2); // F2 is now not in d2.yz\n\
+    d1x.yz = mix(d1x.yz, d2x.yz, comp2);\n\
+    d1y.yz = mix(d1y.yz, d2y.yz, comp2);\n\
+  \n\
+    comp1 = step(d1.z, d1.y);\n\
+    d1.y = mix(d1.y, d1.z, comp1); // nor in  d1.z\n\
+    d1x.y = mix(d1x.y, d1x.z, comp1);\n\
+    d1y.y = mix(d1y.y, d1y.z, comp1);\n\
+ \n\
+    comp1 = step(d2.x, d1.y);\n\
+    d1.y = mix(d1.y, d2.x, comp1); // F2 is in d1.y, we're done.\n\
+    d1x.y = mix(d1x.y, d2x.x, comp1);\n\
+    d1y.y = mix(d1y.y, d2y.x, comp1);\n\
+    F = sqrt(d1.xy);\n\
+    d1d2 = vec4(d1x.x, d1y.x, d1x.y, d1y.y);\n\
 }\n\
+\n\
+*/\n\
+\n\
 #endif\n\
 ";
 });