cesium 0.13.2 → 0.14.0

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

@@ -5,23 +5,30 @@ define(function() {
     return "uniform sampler2D image;\n\
 uniform float strength;\n\
 uniform vec2 repeat;\n\
+\n\
 czm_material czm_getMaterial(czm_materialInput materialInput)\n\
 {\n\
-czm_material material = czm_getDefaultMaterial(materialInput);\n\
-vec2 st = materialInput.st;\n\
-vec2 centerPixel = fract(repeat * st);\n\
-float centerBump = texture2D(image, centerPixel).channel;\n\
-float imageWidth = float(imageDimensions.x);\n\
-vec2 rightPixel = fract(repeat * (st + vec2(1.0 / imageWidth, 0.0)));\n\
-float rightBump = texture2D(image, rightPixel).channel;\n\
-float imageHeight = float(imageDimensions.y);\n\
-vec2 leftPixel = fract(repeat * (st + vec2(0.0, 1.0 / imageHeight)));\n\
-float topBump = texture2D(image, leftPixel).channel;\n\
-vec3 normalTangentSpace = normalize(vec3(centerBump - rightBump, centerBump - topBump, clamp(1.0 - strength, 0.1, 1.0)));\n\
-vec3 normalEC = materialInput.tangentToEyeMatrix * normalTangentSpace;\n\
-material.normal = normalEC;\n\
-material.diffuse = vec3(0.01);\n\
-return material;\n\
-}\n\
-";
+    czm_material material = czm_getDefaultMaterial(materialInput);\n\
+\n\
+    vec2 st = materialInput.st;\n\
+    \n\
+    vec2 centerPixel = fract(repeat * st);\n\
+    float centerBump = texture2D(image, centerPixel).channel;\n\
+    \n\
+    float imageWidth = float(imageDimensions.x);\n\
+    vec2 rightPixel = fract(repeat * (st + vec2(1.0 / imageWidth, 0.0)));\n\
+    float rightBump = texture2D(image, rightPixel).channel;\n\
+    \n\
+    float imageHeight = float(imageDimensions.y);\n\
+    vec2 leftPixel = fract(repeat * (st + vec2(0.0, 1.0 / imageHeight)));\n\
+    float topBump = texture2D(image, leftPixel).channel;\n\
+    \n\
+    vec3 normalTangentSpace = normalize(vec3(centerBump - rightBump, centerBump - topBump, clamp(1.0 - strength, 0.1, 1.0)));\n\
+    vec3 normalEC = materialInput.tangentToEyeMatrix * normalTangentSpace;\n\
+ \n\
+    material.normal = normalEC;\n\
+    material.diffuse = vec3(0.01);\n\
+    \n\
+    return material;\n\
+}";
 });

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

@@ -5,16 +5,20 @@ define(function() {
     return "uniform vec4 cementColor;\n\
 uniform float grainScale;\n\
 uniform float roughness;\n\
+\n\
 czm_material czm_getMaterial(czm_materialInput materialInput)\n\
 {\n\
-czm_material material = czm_getDefaultMaterial(materialInput);\n\
-float noise = czm_snoise(materialInput.st / grainScale);\n\
-noise = pow(noise, 5.0) * roughness;\n\
-vec4 color = cementColor;\n\
-color.rgb += noise;\n\
-material.diffuse = color.rgb;\n\
-material.alpha = color.a;\n\
-return material;\n\
-}\n\
-";
+    czm_material material = czm_getDefaultMaterial(materialInput);\n\
+\n\
+    float noise = czm_snoise(materialInput.st / grainScale);\n\
+    noise = pow(noise, 5.0) * roughness;\n\
+   \n\
+    vec4 color = cementColor;\n\
+    color.rgb += noise;\n\
+    \n\
+    material.diffuse = color.rgb;\n\
+    material.alpha = color.a;\n\
+    \n\
+    return material;\n\
+}";
 });

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

@@ -5,28 +5,40 @@ define(function() {
     return "uniform vec4 lightColor;\n\
 uniform vec4 darkColor;\n\
 uniform vec2 repeat;\n\
+\n\
 czm_material czm_getMaterial(czm_materialInput materialInput)\n\
 {\n\
-czm_material material = czm_getDefaultMaterial(materialInput);\n\
-vec2 st = materialInput.st;\n\
-const float fuzz = 0.03;\n\
-float b = mod(floor(repeat.s * st.s) + floor(repeat.t * st.t), 2.0);\n\
-float scaledWidth = fract(repeat.s * st.s);\n\
-scaledWidth = abs(scaledWidth - floor(scaledWidth + 0.5));\n\
-float scaledHeight = fract(repeat.t * st.t);\n\
-scaledHeight = abs(scaledHeight - floor(scaledHeight + 0.5));\n\
-float value = min(scaledWidth, scaledHeight);\n\
-float val1 = clamp(value / fuzz, 0.0, 1.0);\n\
-float val2 = clamp((value - 0.5) / fuzz, 0.0, 1.0);\n\
-val1 = val1 * (1.0 - val2);\n\
-val1 = val1 * val1 * (3.0 - (2.0 * val1));\n\
-val1 = pow(val1, 0.5);\n\
-vec4 midColor = (lightColor + darkColor) / 2.0;\n\
-vec4 currentColor = mix(lightColor, darkColor, b);\n\
-vec4 color = mix(midColor, currentColor, val1);\n\
-material.diffuse = color.rgb;\n\
-material.alpha = color.a;\n\
-return material;\n\
+    czm_material material = czm_getDefaultMaterial(materialInput);\n\
+\n\
+    // Fuzz Factor - Controls blurriness between light and dark colors\n\
+    vec2 st = materialInput.st;\n\
+    const float fuzz = 0.03;\n\
+    \n\
+    // From Stefan Gustavson's Procedural Textures in GLSL in OpenGL Insights\n\
+    float b = mod(floor(repeat.s * st.s) + floor(repeat.t * st.t), 2.0);  // 0.0 or 1.0\n\
+    \n\
+    // Find the distance from the closest separator (region between two colors)\n\
+    float scaledWidth = fract(repeat.s * st.s);\n\
+    scaledWidth = abs(scaledWidth - floor(scaledWidth + 0.5));\n\
+    float scaledHeight = fract(repeat.t * st.t);\n\
+    scaledHeight = abs(scaledHeight - floor(scaledHeight + 0.5));\n\
+    float value = min(scaledWidth, scaledHeight);\n\
+    \n\
+    //anti-aliasing\n\
+    float val1 = clamp(value / fuzz, 0.0, 1.0);\n\
+    float val2 = clamp((value - 0.5) / fuzz, 0.0, 1.0);\n\
+    val1 = val1 * (1.0 - val2);\n\
+    val1 = val1 * val1 * (3.0 - (2.0 * val1));\n\
+    val1 = pow(val1, 0.5); //makes the transition nicer\n\
+    \n\
+    vec4 midColor = (lightColor + darkColor) / 2.0;\n\
+    vec4 currentColor = mix(lightColor, darkColor, b);\n\
+    \n\
+    vec4 color = mix(midColor, currentColor, val1);\n\
+    material.diffuse = color.rgb;\n\
+    material.alpha = color.a;\n\
+    \n\
+    return material;\n\
 }\n\
 ";
 });

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

@@ -5,14 +5,19 @@ define(function() {
     return "uniform vec4 lightColor;\n\
 uniform vec4 darkColor;\n\
 uniform vec2 repeat;\n\
+\n\
 czm_material czm_getMaterial(czm_materialInput materialInput)\n\
 {\n\
-czm_material material = czm_getDefaultMaterial(materialInput);\n\
-float b = smoothstep(0.3, 0.32, length(fract(repeat * materialInput.st) - 0.5));\n\
-vec4 color = mix(lightColor, darkColor, b);\n\
-material.diffuse = color.rgb;\n\
-material.alpha = color.a;\n\
-return material;\n\
+    czm_material material = czm_getDefaultMaterial(materialInput);\n\
+    \n\
+    // From Stefan Gustavson's Procedural Textures in GLSL in OpenGL Insights\n\
+    float b = smoothstep(0.3, 0.32, length(fract(repeat * materialInput.st) - 0.5));  // 0.0 or 1.0\n\
+\n\
+    vec4 color = mix(lightColor, darkColor, b);\n\
+    material.diffuse = color.rgb;\n\
+    material.alpha = color.a;\n\
+    \n\
+    return material;\n\
 }\n\
 ";
 });

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

@@ -4,21 +4,26 @@ define(function() {
     "use strict";
     return "uniform vec4 color;\n\
 uniform float time;\n\
+\n\
 czm_material czm_getMaterial(czm_materialInput materialInput)\n\
 {\n\
-czm_material material = czm_getDefaultMaterial(materialInput);\n\
-float alpha = 1.0;\n\
-if (time != 1.0)\n\
-{\n\
-float t = 0.5 + (0.5 * czm_snoise(materialInput.str / (1.0 / 10.0)));\n\
-if (t > time)\n\
-{\n\
-alpha = 0.0;\n\
-}\n\
-}\n\
-material.diffuse = color.rgb;\n\
-material.alpha = color.a * alpha;\n\
-return material;\n\
+    czm_material material = czm_getDefaultMaterial(materialInput);\n\
+\n\
+    float alpha = 1.0;\n\
+    if (time != 1.0)\n\
+    {\n\
+        float t = 0.5 + (0.5 * czm_snoise(materialInput.str / (1.0 / 10.0)));   // Scale [-1, 1] to [0, 1]\n\
+    \n\
+        if (t > time)\n\
+        {\n\
+            alpha = 0.0;\n\
+        }\n\
+    }\n\
+    \n\
+    material.diffuse = color.rgb;\n\
+    material.alpha = color.a * alpha;\n\
+\n\
+    return material;\n\
 }\n\
 ";
 });

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

@@ -5,15 +5,20 @@ 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\
-vec2 F = czm_cellular(materialInput.st * frequency);\n\
-float t = 0.1 + (F.y - F.x);\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\
+    // From Stefan Gustavson's Procedural Textures in GLSL in OpenGL Insights\n\
+    vec2 F = czm_cellular(materialInput.st * frequency);\n\
+    float t = 0.1 + (F.y - F.x);\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/FresnelMaterial.js

@@ -4,12 +4,15 @@ define(function() {
     "use strict";
     return "czm_material czm_getMaterial(czm_materialInput materialInput)\n\
 {\n\
-czm_material material = czm_getDefaultMaterial(materialInput);\n\
-vec3 normalWC = normalize(czm_inverseViewRotation * material.normal);\n\
-vec3 positionWC = normalize(czm_inverseViewRotation * materialInput.positionToEyeEC);\n\
-float cosAngIncidence = max(dot(normalWC, positionWC), 0.0);\n\
-material.diffuse = mix(reflection.diffuse, refraction.diffuse, cosAngIncidence);\n\
-return material;\n\
+    czm_material material = czm_getDefaultMaterial(materialInput);\n\
+    \n\
+    vec3 normalWC = normalize(czm_inverseViewRotation * material.normal);\n\
+    vec3 positionWC = normalize(czm_inverseViewRotation * materialInput.positionToEyeEC);\n\
+    float cosAngIncidence = max(dot(normalWC, positionWC), 0.0);\n\
+    \n\
+    material.diffuse = mix(reflection.diffuse, refraction.diffuse, cosAngIncidence);\n\
+    \n\
+    return material;\n\
 }\n\
 ";
 });

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

@@ -5,22 +5,29 @@ define(function() {
     return "uniform vec4 grassColor;\n\
 uniform vec4 dirtColor;\n\
 uniform float patchiness;\n\
+\n\
 czm_material czm_getMaterial(czm_materialInput materialInput)\n\
 {\n\
-czm_material material = czm_getDefaultMaterial(materialInput);\n\
-vec2 st = materialInput.st;\n\
-float noise1 = (czm_snoise(st * patchiness * 1.0)) * 1.0;\n\
-float noise2 = (czm_snoise(st * patchiness * 2.0)) * 0.5;\n\
-float noise3 = (czm_snoise(st * patchiness * 4.0)) * 0.25;\n\
-float noise = sin(noise1 + noise2 + noise3) * 0.1;\n\
-vec4 color = mix(grassColor, dirtColor, noise);\n\
-float verticalNoise = czm_snoise(vec2(st.x * 100.0, st.y * 20.0)) * 0.02;\n\
-float horizontalNoise = czm_snoise(vec2(st.x * 20.0, st.y * 100.0)) * 0.02;\n\
-float stripeNoise = min(verticalNoise, horizontalNoise);\n\
-color.rgb += stripeNoise;\n\
-material.diffuse = color.rgb;\n\
-material.alpha = color.a;\n\
-return material;\n\
-}\n\
-";
+    czm_material material = czm_getDefaultMaterial(materialInput);\n\
+    \n\
+    vec2 st = materialInput.st;\n\
+    float noise1 = (czm_snoise(st * patchiness * 1.0)) * 1.0;\n\
+    float noise2 = (czm_snoise(st * patchiness * 2.0)) * 0.5;\n\
+    float noise3 = (czm_snoise(st * patchiness * 4.0)) * 0.25;\n\
+    float noise = sin(noise1 + noise2 + noise3) * 0.1;\n\
+    \n\
+    vec4 color = mix(grassColor, dirtColor, noise);\n\
+    \n\
+    //Make thatch patterns\n\
+    float verticalNoise = czm_snoise(vec2(st.x * 100.0, st.y * 20.0)) * 0.02;\n\
+    float horizontalNoise = czm_snoise(vec2(st.x * 20.0, st.y * 100.0)) * 0.02;\n\
+    float stripeNoise = min(verticalNoise, horizontalNoise);\n\
+ \n\
+    color.rgb += stripeNoise;\n\
+    \n\
+    material.diffuse = color.rgb;\n\
+    material.alpha = color.a;\n\
+    \n\
+    return material;\n\
+}";
 });

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

@@ -5,17 +5,20 @@ define(function() {
     return "uniform sampler2D image;\n\
 uniform float strength;\n\
 uniform vec2 repeat;\n\
+\n\
 czm_material czm_getMaterial(czm_materialInput materialInput)\n\
 {\n\
-czm_material material = czm_getDefaultMaterial(materialInput);\n\
-vec4 textureValue = texture2D(image, fract(repeat * materialInput.st));\n\
-vec3 normalTangentSpace = textureValue.channels;\n\
-normalTangentSpace.xy = normalTangentSpace.xy * 2.0 - 1.0;\n\
-normalTangentSpace.z = clamp(1.0 - strength, 0.1, 1.0);\n\
-normalTangentSpace = normalize(normalTangentSpace);\n\
-vec3 normalEC = materialInput.tangentToEyeMatrix * normalTangentSpace;\n\
-material.normal = normalEC;\n\
-return material;\n\
-}\n\
-";
+    czm_material material = czm_getDefaultMaterial(materialInput);\n\
+    \n\
+    vec4 textureValue = texture2D(image, fract(repeat * materialInput.st));\n\
+    vec3 normalTangentSpace = textureValue.channels;\n\
+    normalTangentSpace.xy = normalTangentSpace.xy * 2.0 - 1.0;\n\
+    normalTangentSpace.z = clamp(1.0 - strength, 0.1, 1.0);\n\
+    normalTangentSpace = normalize(normalTangentSpace);\n\
+    vec3 normalEC = materialInput.tangentToEyeMatrix * normalTangentSpace;\n\
+    \n\
+    material.normal = normalEC;\n\
+    \n\
+    return material;\n\
+}";
 });

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

@@ -3,14 +3,16 @@
 define(function() {
     "use strict";
     return "uniform samplerCube cubeMap;\n\
+\n\
 czm_material czm_getMaterial(czm_materialInput materialInput)\n\
 {\n\
-czm_material material = czm_getDefaultMaterial(materialInput);\n\
-vec3 normalWC = normalize(czm_inverseViewRotation * material.normal);\n\
-vec3 positionWC = normalize(czm_inverseViewRotation * materialInput.positionToEyeEC);\n\
-vec3 reflectedWC = reflect(positionWC, normalWC);\n\
-material.diffuse = textureCube(cubeMap, reflectedWC).channels;\n\
-return material;\n\
-}\n\
-";
+    czm_material material = czm_getDefaultMaterial(materialInput);\n\
+    \n\
+    vec3 normalWC = normalize(czm_inverseViewRotation * material.normal);\n\
+    vec3 positionWC = normalize(czm_inverseViewRotation * materialInput.positionToEyeEC);\n\
+    vec3 reflectedWC = reflect(positionWC, normalWC);\n\
+    material.diffuse = textureCube(cubeMap, reflectedWC).channels;\n\
+\n\
+    return material;\n\
+}";
 });

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

@@ -4,14 +4,16 @@ define(function() {
     "use strict";
     return "uniform samplerCube cubeMap;\n\
 uniform float indexOfRefractionRatio;\n\
+\n\
 czm_material czm_getMaterial(czm_materialInput materialInput)\n\
 {\n\
-czm_material material = czm_getDefaultMaterial(materialInput);\n\
-vec3 normalWC = normalize(czm_inverseViewRotation * material.normal);\n\
-vec3 positionWC = normalize(czm_inverseViewRotation * materialInput.positionToEyeEC);\n\
-vec3 refractedWC = refract(positionWC, -normalWC, indexOfRefractionRatio);\n\
-material.diffuse = textureCube(cubeMap, refractedWC).channels;\n\
-return material;\n\
-}\n\
-";
+    czm_material material = czm_getDefaultMaterial(materialInput);\n\
+    \n\
+    vec3 normalWC = normalize(czm_inverseViewRotation * material.normal);\n\
+    vec3 positionWC = normalize(czm_inverseViewRotation * materialInput.positionToEyeEC);\n\
+    vec3 refractedWC = refract(positionWC, -normalWC, indexOfRefractionRatio);\n\
+    material.diffuse = textureCube(cubeMap, refractedWC).channels;\n\
+\n\
+    return material;\n\
+}";
 });

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

@@ -5,15 +5,20 @@ define(function() {
     return "uniform vec4 color;\n\
 uniform vec4 rimColor;\n\
 uniform float width;\n\
+\n\
 czm_material czm_getMaterial(czm_materialInput materialInput)\n\
 {\n\
-czm_material material = czm_getDefaultMaterial(materialInput);\n\
-float d = 1.0 - dot(materialInput.normalEC, normalize(materialInput.positionToEyeEC));\n\
-float s = smoothstep(1.0 - width, 1.0, d);\n\
-material.diffuse = color.rgb;\n\
-material.emission = rimColor.rgb * s;\n\
-material.alpha = mix(color.a, rimColor.a, s);\n\
-return material;\n\
+    czm_material material = czm_getDefaultMaterial(materialInput);\n\
+\n\
+    // See http://www.fundza.com/rman_shaders/surface/fake_rim/fake_rim1.html\n\
+    float d = 1.0 - dot(materialInput.normalEC, normalize(materialInput.positionToEyeEC));\n\
+    float s = smoothstep(1.0 - width, 1.0, d);\n\
+\n\
+    material.diffuse = color.rgb;\n\
+    material.emission = rimColor.rgb * s; \n\
+    material.alpha = mix(color.a, rimColor.a, s);\n\
+\n\
+    return material;\n\
 }\n\
 ";
 });

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

@@ -7,20 +7,29 @@ uniform vec4 darkColor;\n\
 uniform float offset;\n\
 uniform float repeat;\n\
 uniform bool horizontal;\n\
+\n\
 czm_material czm_getMaterial(czm_materialInput materialInput)\n\
 {\n\
-czm_material material = czm_getDefaultMaterial(materialInput);\n\
-const float fuzz = 0.1;\n\
-float coord = mix(materialInput.st.s, materialInput.st.t, float(horizontal));\n\
-float value = fract((coord - offset) * (repeat * 0.5));\n\
-float val1 = clamp(value / fuzz, 0.0, 1.0);\n\
-float val2 = clamp((value - 0.5) / fuzz, 0.0, 1.0);\n\
-val1 = val1 * (1.0 - val2);\n\
-val1 = val1 * val1 * (3.0 - (2.0 * val1));\n\
-vec4 color = mix(lightColor, darkColor, val1);\n\
-material.diffuse = color.rgb;\n\
-material.alpha = color.a;\n\
-return material;\n\
+    czm_material material = czm_getDefaultMaterial(materialInput);\n\
+\n\
+    // Based on the Stripes Fragment Shader in the Orange Book (11.1.2)\n\
+    // Fuzz Factor - Controls blurriness between light and dark colors\n\
+    const float fuzz = 0.1;\n\
+\n\
+    float coord = mix(materialInput.st.s, materialInput.st.t, float(horizontal));\n\
+    float value = fract((coord - offset) * (repeat * 0.5));\n\
+    \n\
+    //anti-aliasing\n\
+    float val1 = clamp(value / fuzz, 0.0, 1.0);\n\
+    float val2 = clamp((value - 0.5) / fuzz, 0.0, 1.0);\n\
+    val1 = val1 * (1.0 - val2);\n\
+    val1 = val1 * val1 * (3.0 - (2.0 * val1));\n\
+\n\
+    vec4 color = mix(lightColor, darkColor, val1);\n\
+    material.diffuse = color.rgb;\n\
+    material.alpha = color.a;\n\
+    \n\
+    return material;\n\
 }\n\
 ";
 });