cesium 0.13.2 → 0.14.0

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

@@ -3,20 +3,30 @@
 define(function() {
     "use strict";
     return "uniform sampler2D u_texture;\n\
+\n\
 uniform float u_northLatitude;\n\
 uniform float u_southLatitude;\n\
 uniform float u_southMercatorYHigh;\n\
 uniform float u_southMercatorYLow;\n\
 uniform float u_oneOverMercatorHeight;\n\
+\n\
 varying vec2 v_textureCoordinates;\n\
+\n\
 void main()\n\
 {\n\
-vec2 geographicUV = clamp(v_textureCoordinates, 0.0, 1.0);\n\
-vec2 webMercatorUV = geographicUV;\n\
-float currentLatitude = mix(u_southLatitude, u_northLatitude, geographicUV.y);\n\
-float fraction = czm_latitudeToWebMercatorFraction(currentLatitude, u_southMercatorYLow, u_southMercatorYHigh, u_oneOverMercatorHeight);\n\
-webMercatorUV = vec2(geographicUV.x, fraction);\n\
-gl_FragColor = texture2D(u_texture, webMercatorUV);\n\
+    // The clamp below works around an apparent bug in Chrome Canary v23.0.1241.0\n\
+    // where the fragment shader sees textures coordinates < 0.0 and > 1.0 for the\n\
+    // fragments on the edges of tiles even though the vertex shader is outputting\n\
+    // coordinates strictly in the 0-1 range.\n\
+    vec2 geographicUV = clamp(v_textureCoordinates, 0.0, 1.0);\n\
+    vec2 webMercatorUV = geographicUV;\n\
+    \n\
+    float currentLatitude = mix(u_southLatitude, u_northLatitude, geographicUV.y);\n\
+    float fraction = czm_latitudeToWebMercatorFraction(currentLatitude, u_southMercatorYLow, u_southMercatorYHigh, u_oneOverMercatorHeight);\n\
+    \n\
+    webMercatorUV = vec2(geographicUV.x, fraction);\n\
+    \n\
+    gl_FragColor = texture2D(u_texture, webMercatorUV);\n\
 }\n\
 ";
 });

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

@@ -3,12 +3,15 @@
 define(function() {
     "use strict";
     return "attribute vec4 position;\n\
+\n\
 uniform vec2 u_textureDimensions;\n\
+\n\
 varying vec2 v_textureCoordinates;\n\
+\n\
 void main()\n\
 {\n\
-v_textureCoordinates = position.xy;\n\
-gl_Position = czm_viewportOrthographic * (position * vec4(u_textureDimensions, 1.0, 1.0));\n\
+    v_textureCoordinates = position.xy;\n\
+    gl_Position = czm_viewportOrthographic * (position * vec4(u_textureDimensions, 1.0, 1.0));\n\
 }\n\
 ";
 });

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

@@ -3,29 +3,46 @@
 define(function() {
     "use strict";
     return "uniform vec4 u_intersectionColor;\n\
+\n\
 bool inSensorShadow(vec3 coneVertexWC, czm_ellipsoid ellipsoidEC, vec3 pointEC)\n\
 {\n\
-vec3 D = ellipsoidEC.inverseRadii;\n\
-vec3 q = D * coneVertexWC;\n\
-float qMagnitudeSquared = dot(q, q);\n\
-float test = qMagnitudeSquared - 1.0;\n\
-vec3 t = (czm_inverseView * vec4(pointEC, 1.0)).xyz;\n\
-vec3 temp = D * t - q;\n\
-float d = dot(temp, q);\n\
-return (d < -test) && (d / length(temp) < -sqrt(test));\n\
+    // Diagonal matrix from the unscaled ellipsoid space to the scaled space.    \n\
+    vec3 D = ellipsoidEC.inverseRadii;\n\
+\n\
+    // Sensor vertex in the scaled ellipsoid space\n\
+    vec3 q = D * coneVertexWC;\n\
+    float qMagnitudeSquared = dot(q, q);\n\
+    float test = qMagnitudeSquared - 1.0;\n\
+    \n\
+    // Fragment in the ellipsoid frame\n\
+    vec3 t = (czm_inverseView * vec4(pointEC, 1.0)).xyz;\n\
+\n\
+    // Sensor vertex to fragment vector in the ellipsoid's scaled space\n\
+    vec3 temp = D * t - q;\n\
+    float d = dot(temp, q);\n\
+    \n\
+    // Behind silhouette plane and inside silhouette cone\n\
+    return (d < -test) && (d / length(temp) < -sqrt(test));\n\
 }\n\
+\n\
+///////////////////////////////////////////////////////////////////////////////\n\
+\n\
 #ifndef RENDER_FOR_PICK\n\
+\n\
 vec4 getIntersectionColor(float sensorRadius, vec3 pointEC)\n\
 {\n\
-return u_intersectionColor;\n\
+    return u_intersectionColor;\n\
 }\n\
+\n\
 vec2 sensor2dTextureCoordinates(float sensorRadius, vec3 pointMC)\n\
 {\n\
-float t = pointMC.z / sensorRadius;\n\
-float s = 1.0 + (atan(pointMC.y, pointMC.x) / czm_twoPi);\n\
-s = s - floor(s);\n\
-return vec2(s, t);\n\
+    // (s, t) both in the range [0, 1]\n\
+    float t = pointMC.z / sensorRadius;\n\
+    float s = 1.0 + (atan(pointMC.y, pointMC.x) / czm_twoPi);\n\
+    s = s - floor(s);\n\
+    \n\
+    return vec2(s, t);\n\
 }\n\
-#endif\n\
-";
+\n\
+#endif";
 });

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

@@ -33,30 +33,75 @@
 /*global define*/
 define(function() {
     "use strict";
-    return "uniform float u_morphTime;\n\
+    return "/**\n\
+ * @license\n\
+ * Copyright (c) 2000-2005, Sean O'Neil (s_p_oneil@hotmail.com)\n\
+ * All rights reserved.\n\
+ * \n\
+ * Redistribution and use in source and binary forms, with or without\n\
+ * modification, are permitted provided that the following conditions\n\
+ * are met:\n\
+ * \n\
+ * * Redistributions of source code must retain the above copyright notice,\n\
+ *   this list of conditions and the following disclaimer.\n\
+ * * Redistributions in binary form must reproduce the above copyright notice,\n\
+ *   this list of conditions and the following disclaimer in the documentation\n\
+ *   and/or other materials provided with the distribution.\n\
+ * * Neither the name of the project nor the names of its contributors may be\n\
+ *   used to endorse or promote products derived from this software without\n\
+ *   specific prior written permission.\n\
+ * \n\
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\n\
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n\
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\n\
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE\n\
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n\
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\n\
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\n\
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\n\
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n\
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n\
+ *\n\
+ * Modifications made by Analytical Graphics, Inc.\n\
+ */\n\
+ \n\
+ // Code:  http://sponeil.net/\n\
+ // GPU Gems 2 Article:  http://http.developer.nvidia.com/GPUGems2/gpugems2_chapter16.html\n\
+ \n\
+uniform float u_morphTime;\n\
+ \n\
 const float g = -0.95;\n\
 const float g2 = g * g;\n\
+\n\
 varying vec3 v_rayleighColor;\n\
 varying vec3 v_mieColor;\n\
 varying vec3 v_toCamera;\n\
 varying vec3 v_positionEC;\n\
+\n\
 void main (void)\n\
 {\n\
-czm_ellipsoid ellipsoid = czm_getWgs84EllipsoidEC();\n\
-vec3 direction = normalize(v_positionEC);\n\
-czm_ray ray = czm_ray(vec3(0.0), direction);\n\
-czm_raySegment intersection = czm_rayEllipsoidIntersectionInterval(ray, ellipsoid);\n\
-if (!czm_isEmpty(intersection)) {\n\
-discard;\n\
-}\n\
-float fCos = dot(czm_sunDirectionWC, normalize(v_toCamera)) / length(v_toCamera);\n\
-float fRayleighPhase = 0.75 * (1.0 + fCos*fCos);\n\
-float fMiePhase = 1.5 * ((1.0 - g2) / (2.0 + g2)) * (1.0 + fCos*fCos) / pow(1.0 + g2 - 2.0*g*fCos, 1.5);\n\
-const float fExposure = 2.0;\n\
-vec3 rgb = fRayleighPhase * v_rayleighColor + fMiePhase * v_mieColor;\n\
-rgb = vec3(1.0) - exp(-fExposure * rgb);\n\
-float l = czm_luminance(rgb);\n\
-gl_FragColor = vec4(rgb, min(smoothstep(0.0, 0.1, l), 1.0) * smoothstep(0.0, 1.0, u_morphTime));\n\
+    // TODO: make arbitrary ellipsoid\n\
+    czm_ellipsoid ellipsoid = czm_getWgs84EllipsoidEC();\n\
+    \n\
+    vec3 direction = normalize(v_positionEC);\n\
+    czm_ray ray = czm_ray(vec3(0.0), direction);\n\
+    \n\
+    czm_raySegment intersection = czm_rayEllipsoidIntersectionInterval(ray, ellipsoid);\n\
+    if (!czm_isEmpty(intersection)) {\n\
+        discard;\n\
+    }\n\
+    \n\
+    // Extra normalize added for Android\n\
+    float fCos = dot(czm_sunDirectionWC, normalize(v_toCamera)) / length(v_toCamera);\n\
+    float fRayleighPhase = 0.75 * (1.0 + fCos*fCos);\n\
+    float fMiePhase = 1.5 * ((1.0 - g2) / (2.0 + g2)) * (1.0 + fCos*fCos) / pow(1.0 + g2 - 2.0*g*fCos, 1.5);\n\
+    \n\
+    const float fExposure = 2.0;\n\
+    \n\
+    vec3 rgb = fRayleighPhase * v_rayleighColor + fMiePhase * v_mieColor;\n\
+    rgb = vec3(1.0) - exp(-fExposure * rgb);\n\
+    float l = czm_luminance(rgb);\n\
+    gl_FragColor = vec4(rgb, min(smoothstep(0.0, 0.1, l), 1.0) * smoothstep(0.0, 1.0, u_morphTime));\n\
 }\n\
 ";
 });

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

@@ -33,15 +33,52 @@
 /*global define*/
 define(function() {
     "use strict";
-    return "attribute vec4 position;\n\
+    return "/**\n\
+ * @license\n\
+ * Copyright (c) 2000-2005, Sean O'Neil (s_p_oneil@hotmail.com)\n\
+ * All rights reserved.\n\
+ * \n\
+ * Redistribution and use in source and binary forms, with or without\n\
+ * modification, are permitted provided that the following conditions\n\
+ * are met:\n\
+ * \n\
+ * * Redistributions of source code must retain the above copyright notice,\n\
+ *   this list of conditions and the following disclaimer.\n\
+ * * Redistributions in binary form must reproduce the above copyright notice,\n\
+ *   this list of conditions and the following disclaimer in the documentation\n\
+ *   and/or other materials provided with the distribution.\n\
+ * * Neither the name of the project nor the names of its contributors may be\n\
+ *   used to endorse or promote products derived from this software without\n\
+ *   specific prior written permission.\n\
+ * \n\
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\n\
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n\
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\n\
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE\n\
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n\
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\n\
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\n\
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\n\
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n\
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n\
+ *\n\
+ * Modifications made by Analytical Graphics, Inc.\n\
+ */\n\
+ \n\
+ // Code:  http://sponeil.net/\n\
+ // GPU Gems 2 Article:  http://http.developer.nvidia.com/GPUGems2/gpugems2_chapter16.html\n\
+  \n\
+attribute vec4 position;\n\
+\n\
 uniform float fCameraHeight;\n\
 uniform float fCameraHeight2;\n\
-uniform float fOuterRadius;\n\
-uniform float fOuterRadius2;\n\
-uniform float fInnerRadius;\n\
-uniform float fScale;\n\
-uniform float fScaleDepth;\n\
-uniform float fScaleOverScaleDepth;\n\
+uniform float fOuterRadius;     // The outer (atmosphere) radius\n\
+uniform float fOuterRadius2;    // fOuterRadius^2\n\
+uniform float fInnerRadius;     // The inner (planetary) radius\n\
+uniform float fScale;           // 1 / (fOuterRadius - fInnerRadius)\n\
+uniform float fScaleDepth;      // The scale depth (i.e. the altitude at which the atmosphere's average density is found)\n\
+uniform float fScaleOverScaleDepth; // fScale / fScaleDepth\n\
+\n\
 const float Kr = 0.0025;\n\
 const float fKr4PI = Kr * 4.0 * czm_pi;\n\
 const float Km = 0.0015;\n\
@@ -50,66 +87,82 @@ const float ESun = 15.0;\n\
 const float fKmESun = Km * ESun;\n\
 const float fKrESun = Kr * ESun;\n\
 const vec3 v3InvWavelength = vec3(\n\
-5.60204474633241,\n\
-9.473284437923038,\n\
-19.643802610477206);\n\
+    5.60204474633241,  // Red = 1.0 / Math.pow(0.650, 4.0)\n\
+    9.473284437923038, // Green = 1.0 / Math.pow(0.570, 4.0)\n\
+    19.643802610477206); // Blue = 1.0 / Math.pow(0.475, 4.0)\n\
 const float rayleighScaleDepth = 0.25;\n\
+          \n\
 const int nSamples = 2;\n\
 const float fSamples = 2.0;\n\
+\n\
 varying vec3 v_rayleighColor;\n\
 varying vec3 v_mieColor;\n\
 varying vec3 v_toCamera;\n\
 varying vec3 v_positionEC;\n\
+\n\
 float scale(float fCos)\n\
 {\n\
-float x = 1.0 - fCos;\n\
-return fScaleDepth * exp(-0.00287 + x*(0.459 + x*(3.83 + x*(-6.80 + x*5.25))));\n\
+    float x = 1.0 - fCos;\n\
+    return fScaleDepth * exp(-0.00287 + x*(0.459 + x*(3.83 + x*(-6.80 + x*5.25))));\n\
 }\n\
+\n\
 void main(void)\n\
 {\n\
-vec3 v3Pos = position.xyz;\n\
-vec3 v3Ray = v3Pos - czm_viewerPositionWC;\n\
-float fFar = length(v3Ray);\n\
-v3Ray /= fFar;\n\
+    // Get the ray from the camera to the vertex and its length (which is the far point of the ray passing through the atmosphere)\n\
+    vec3 v3Pos = position.xyz;\n\
+    vec3 v3Ray = v3Pos - czm_viewerPositionWC;\n\
+    float fFar = length(v3Ray);\n\
+    v3Ray /= fFar;\n\
+\n\
 #ifdef SKY_FROM_SPACE\n\
-float B = 2.0 * dot(czm_viewerPositionWC, v3Ray);\n\
-float C = fCameraHeight2 - fOuterRadius2;\n\
-float fDet = max(0.0, B*B - 4.0 * C);\n\
-float fNear = 0.5 * (-B - sqrt(fDet));\n\
-vec3 v3Start = czm_viewerPositionWC + v3Ray * fNear;\n\
-fFar -= fNear;\n\
-float fStartAngle = dot(v3Ray, v3Start) / fOuterRadius;\n\
-float fStartDepth = exp(-1.0 / fScaleDepth);\n\
-float fStartOffset = fStartDepth*scale(fStartAngle);\n\
-#else\n\
-vec3 v3Start = czm_viewerPositionWC;\n\
-float fHeight = length(v3Start);\n\
-float fDepth = exp(fScaleOverScaleDepth * (fInnerRadius - fCameraHeight));\n\
-float fStartAngle = dot(v3Ray, v3Start) / fHeight;\n\
-float fStartOffset = fDepth*scale(fStartAngle);\n\
+    // Calculate the closest intersection of the ray with the outer atmosphere (which is the near point of the ray passing through the atmosphere)\n\
+    float B = 2.0 * dot(czm_viewerPositionWC, v3Ray);\n\
+    float C = fCameraHeight2 - fOuterRadius2;\n\
+    float fDet = max(0.0, B*B - 4.0 * C);\n\
+    float fNear = 0.5 * (-B - sqrt(fDet));\n\
+\n\
+    // Calculate the ray's starting position, then calculate its scattering offset\n\
+    vec3 v3Start = czm_viewerPositionWC + v3Ray * fNear;\n\
+    fFar -= fNear;\n\
+    float fStartAngle = dot(v3Ray, v3Start) / fOuterRadius;\n\
+    float fStartDepth = exp(-1.0 / fScaleDepth);\n\
+    float fStartOffset = fStartDepth*scale(fStartAngle);\n\
+#else // SKY_FROM_ATMOSPHERE\n\
+    // Calculate the ray's starting position, then calculate its scattering offset\n\
+    vec3 v3Start = czm_viewerPositionWC;\n\
+    float fHeight = length(v3Start);\n\
+    float fDepth = exp(fScaleOverScaleDepth * (fInnerRadius - fCameraHeight));\n\
+    float fStartAngle = dot(v3Ray, v3Start) / fHeight;\n\
+    float fStartOffset = fDepth*scale(fStartAngle);\n\
 #endif\n\
-float fSampleLength = fFar / fSamples;\n\
-float fScaledLength = fSampleLength * fScale;\n\
-vec3 v3SampleRay = v3Ray * fSampleLength;\n\
-vec3 v3SamplePoint = v3Start + v3SampleRay * 0.5;\n\
-vec3 v3FrontColor = vec3(0.0, 0.0, 0.0);\n\
-for(int i=0; i<nSamples; i++)\n\
-{\n\
-float fHeight = length(v3SamplePoint);\n\
-float fDepth = exp(fScaleOverScaleDepth * (fInnerRadius - fHeight));\n\
-vec3 lightPosition = normalize(czm_viewerPositionWC);\n\
-float fLightAngle = dot(lightPosition, v3SamplePoint) / fHeight;\n\
-float fCameraAngle = dot(v3Ray, v3SamplePoint) / fHeight;\n\
-float fScatter = (fStartOffset + fDepth*(scale(fLightAngle) - scale(fCameraAngle)));\n\
-vec3 v3Attenuate = exp(-fScatter * (v3InvWavelength * fKr4PI + fKm4PI));\n\
-v3FrontColor += v3Attenuate * (fDepth * fScaledLength);\n\
-v3SamplePoint += v3SampleRay;\n\
-}\n\
-v_mieColor = v3FrontColor * fKmESun;\n\
-v_rayleighColor = v3FrontColor * (v3InvWavelength * fKrESun);\n\
-v_toCamera = czm_viewerPositionWC - v3Pos;\n\
-v_positionEC = (czm_modelView * position).xyz;\n\
-gl_Position = czm_modelViewProjection * position;\n\
+\n\
+    // Initialize the scattering loop variables\n\
+    float fSampleLength = fFar / fSamples;\n\
+    float fScaledLength = fSampleLength * fScale;\n\
+    vec3 v3SampleRay = v3Ray * fSampleLength;\n\
+    vec3 v3SamplePoint = v3Start + v3SampleRay * 0.5;\n\
+\n\
+    // Now loop through the sample rays\n\
+    vec3 v3FrontColor = vec3(0.0, 0.0, 0.0);\n\
+    for(int i=0; i<nSamples; i++)\n\
+    {\n\
+        float fHeight = length(v3SamplePoint);\n\
+        float fDepth = exp(fScaleOverScaleDepth * (fInnerRadius - fHeight));\n\
+        vec3 lightPosition = normalize(czm_viewerPositionWC); // czm_sunDirectionWC\n\
+        float fLightAngle = dot(lightPosition, v3SamplePoint) / fHeight;\n\
+        float fCameraAngle = dot(v3Ray, v3SamplePoint) / fHeight;\n\
+        float fScatter = (fStartOffset + fDepth*(scale(fLightAngle) - scale(fCameraAngle)));\n\
+        vec3 v3Attenuate = exp(-fScatter * (v3InvWavelength * fKr4PI + fKm4PI));\n\
+        v3FrontColor += v3Attenuate * (fDepth * fScaledLength);\n\
+        v3SamplePoint += v3SampleRay;\n\
+    }\n\
+\n\
+    // Finally, scale the Mie and Rayleigh colors and set up the varying variables for the pixel shader\n\
+    v_mieColor = v3FrontColor * fKmESun;\n\
+    v_rayleighColor = v3FrontColor * (v3InvWavelength * fKrESun);\n\
+    v_toCamera = czm_viewerPositionWC - v3Pos;\n\
+    v_positionEC = (czm_modelView * position).xyz;\n\
+    gl_Position = czm_modelViewProjection * position;\n\
 }\n\
 ";
 });

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

@@ -4,11 +4,13 @@ define(function() {
     "use strict";
     return "uniform samplerCube u_cubeMap;\n\
 uniform float u_morphTime;\n\
+\n\
 varying vec3 v_texCoord;\n\
+\n\
 void main()\n\
 {\n\
-vec3 rgb = textureCube(u_cubeMap, normalize(v_texCoord)).rgb;\n\
-gl_FragColor = vec4(rgb, u_morphTime);\n\
+    vec3 rgb = textureCube(u_cubeMap, normalize(v_texCoord)).rgb;\n\
+    gl_FragColor = vec4(rgb, u_morphTime);\n\
 }\n\
 ";
 });

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

@@ -3,12 +3,14 @@
 define(function() {
     "use strict";
     return "attribute vec3 position;\n\
+\n\
 varying vec3 v_texCoord;\n\
+\n\
 void main()\n\
 {\n\
-vec3 p = czm_viewRotation * (czm_temeToPseudoFixed * (czm_entireFrustum.y * position));\n\
-gl_Position = czm_projection * vec4(p, 1.0);\n\
-v_texCoord = position.xyz;\n\
+    vec3 p = czm_viewRotation * (czm_temeToPseudoFixed * (czm_entireFrustum.y * position));\n\
+    gl_Position = czm_projection * vec4(p, 1.0);\n\
+    v_texCoord = position.xyz;\n\
 }\n\
 ";
 });

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

@@ -2,16 +2,20 @@
 /*global define*/
 define(function() {
     "use strict";
-    return "varying vec2 v_textureCoordinates;\n\
+    return "\n\
+varying vec2 v_textureCoordinates;\n\
+\n\
 void main()\n\
 {\n\
-czm_materialInput materialInput;\n\
-materialInput.s = v_textureCoordinates.s;\n\
-materialInput.st = v_textureCoordinates;\n\
-materialInput.str = vec3(v_textureCoordinates, 0.0);\n\
-materialInput.normalEC = vec3(0.0, 0.0, -1.0);\n\
-czm_material material = czm_getMaterial(materialInput);\n\
-gl_FragColor = vec4(material.diffuse + material.emission, material.alpha);\n\
-}\n\
-";
+    czm_materialInput materialInput;\n\
+    \n\
+    materialInput.s = v_textureCoordinates.s;\n\
+    materialInput.st = v_textureCoordinates;\n\
+    materialInput.str = vec3(v_textureCoordinates, 0.0);\n\
+    materialInput.normalEC = vec3(0.0, 0.0, -1.0);\n\
+    \n\
+    czm_material material = czm_getMaterial(materialInput);\n\
+\n\
+    gl_FragColor = vec4(material.diffuse + material.emission, material.alpha);\n\
+}";
 });