From 24ff46babea55032ce44373b603c76e4bb122961 Mon Sep 17 00:00:00 2001 From: Jason Beverage Date: Fri, 20 Oct 2017 13:28:32 -0400 Subject: [PATCH 01/31] Added material support to the globe --- Apps/Sandcastle/gallery/Globe Materials.html | 220 ++++++++++++++++++ Apps/Sandcastle/gallery/Globe Materials.jpg | Bin 0 -> 20762 bytes Source/Scene/Globe.js | 59 ++++- Source/Scene/GlobeSurfaceShaderSet.js | 12 +- Source/Scene/GlobeSurfaceTileProvider.js | 6 + Source/Scene/Material.js | 86 +++++++ .../Builtin/Structs/materialInput.glsl | 4 + Source/Shaders/GlobeFS.glsl | 12 + Source/Shaders/GlobeVS.glsl | 7 + .../Materials/ElevationContourMaterial.glsl | 16 ++ .../Materials/ElevationRampMaterial.glsl | 13 ++ Source/Shaders/Materials/SlopeMaterial.glsl | 6 + .../Shaders/Materials/SlopeRampMaterial.glsl | 25 ++ 13 files changed, 455 insertions(+), 11 deletions(-) create mode 100644 Apps/Sandcastle/gallery/Globe Materials.html create mode 100644 Apps/Sandcastle/gallery/Globe Materials.jpg create mode 100644 Source/Shaders/Materials/ElevationContourMaterial.glsl create mode 100644 Source/Shaders/Materials/ElevationRampMaterial.glsl create mode 100644 Source/Shaders/Materials/SlopeMaterial.glsl create mode 100644 Source/Shaders/Materials/SlopeRampMaterial.glsl diff --git a/Apps/Sandcastle/gallery/Globe Materials.html b/Apps/Sandcastle/gallery/Globe Materials.html new file mode 100644 index 000000000000..2f4635ce76b4 --- /dev/null +++ b/Apps/Sandcastle/gallery/Globe Materials.html @@ -0,0 +1,220 @@ + + + + + + + + + Cesium Demo + + + + + + +
+

Loading...

+
+
+
+
+
+ + + + + + +
Contour Spacing + +
+
+ + + diff --git a/Apps/Sandcastle/gallery/Globe Materials.jpg b/Apps/Sandcastle/gallery/Globe Materials.jpg new file mode 100644 index 0000000000000000000000000000000000000000..8669e3b9739b9cfb4bde75e61394b336570b3752 GIT binary patch literal 20762 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 literal 0 HcmV?d00001 diff --git a/Source/Scene/Globe.js b/Source/Scene/Globe.js index 8a351098c7b9..bf1ec692eced 100644 --- a/Source/Scene/Globe.js +++ b/Source/Scene/Globe.js @@ -24,6 +24,7 @@ define([ './GlobeSurfaceShaderSet', './GlobeSurfaceTileProvider', './ImageryLayerCollection', + './Material', './QuadtreePrimitive', './SceneMode', './ShadowMode' @@ -53,6 +54,7 @@ define([ GlobeSurfaceShaderSet, GlobeSurfaceTileProvider, ImageryLayerCollection, + Material, QuadtreePrimitive, SceneMode, ShadowMode) { @@ -79,14 +81,9 @@ define([ this._imageryLayerCollection = imageryLayerCollection; this._surfaceShaderSet = new GlobeSurfaceShaderSet(); + this._material = undefined; - this._surfaceShaderSet.baseVertexShaderSource = new ShaderSource({ - sources : [GroundAtmosphere, GlobeVS] - }); - - this._surfaceShaderSet.baseFragmentShaderSource = new ShaderSource({ - sources : [GlobeFS] - }); + this.dirtyShaders(); this._surface = new QuadtreePrimitive({ tileProvider : new GlobeSurfaceTileProvider({ @@ -276,6 +273,24 @@ define([ get: function() { return this._surface.tileLoadProgressEvent; } + }, + + /** + * Gets or sets the material appearance of the Globe. This can be one of several built-in {@link Material} objects or a custom material, scripted with + * {@link https://github.com/AnalyticalGraphicsInc/cesium/wiki/Fabric|Fabric}. + * @memberof Globe.prototype + * @type {Material} + */ + material: { + get: function() { + return this._material; + }, + set: function(material) { + if (this._material !== material) { + this._material = material; + this.dirtyShaders(); + } + } } }); @@ -525,6 +540,10 @@ define([ return; } + if (this._material) { + this._material.update(frameState.context); + } + var surface = this._surface; var pass = frameState.passes; @@ -550,6 +569,32 @@ define([ } }; + /** + * @private + */ + Globe.prototype.dirtyShaders = function() { + this._surfaceShaderSet.baseVertexShaderSource = new ShaderSource({ + sources : [GroundAtmosphere, GlobeVS] + }); + + var fragmentSources = []; + var fragmentDefines = []; + if (this._material) { + fragmentSources.push(this._material.shaderSource); + fragmentDefines.push("APPLY_MATERIAL"); + + // Set the material uniform map to the materials + this._surface._tileProvider.uniformMap = this._material._uniforms; + } + fragmentSources.push(GlobeFS); + + this._surfaceShaderSet.baseFragmentShaderSource = new ShaderSource({ + sources : fragmentSources, + defines: fragmentDefines + }); + this._surfaceShaderSet.material = this._material; + }; + /** * Returns true if this object was destroyed; otherwise, false. *

diff --git a/Source/Scene/GlobeSurfaceShaderSet.js b/Source/Scene/GlobeSurfaceShaderSet.js index 2442df1a5efb..abcdc95ae404 100644 --- a/Source/Scene/GlobeSurfaceShaderSet.js +++ b/Source/Scene/GlobeSurfaceShaderSet.js @@ -12,10 +12,11 @@ define([ SceneMode) { 'use strict'; - function GlobeSurfaceShader(numberOfDayTextures, flags, shaderProgram) { + function GlobeSurfaceShader(numberOfDayTextures, flags, material, shaderProgram) { this.numberOfDayTextures = numberOfDayTextures; this.flags = flags; this.shaderProgram = shaderProgram; + this.material = material; } /** @@ -30,6 +31,8 @@ define([ this._shadersByTexturesFlags = []; this._pickShaderPrograms = []; + + this.material = undefined; } function getPositionMode(sceneMode) { @@ -92,7 +95,8 @@ define([ var surfaceShader = surfaceTile.surfaceShader; if (defined(surfaceShader) && surfaceShader.numberOfDayTextures === numberOfDayTextures && - surfaceShader.flags === flags) { + surfaceShader.flags === flags && + surfaceShader.material === this.material) { return surfaceShader.shaderProgram; } @@ -104,7 +108,7 @@ define([ } surfaceShader = shadersByFlags[flags]; - if (!defined(surfaceShader)) { + if (!defined(surfaceShader) || surfaceShader.material !== this.material) { // Cache miss - we've never seen this combination of numberOfDayTextures and flags before. var vs = this.baseVertexShaderSource.clone(); var fs = this.baseFragmentShaderSource.clone(); @@ -199,7 +203,7 @@ define([ attributeLocations : terrainEncoding.getAttributeLocations() }); - surfaceShader = shadersByFlags[flags] = new GlobeSurfaceShader(numberOfDayTextures, flags, shader); + surfaceShader = shadersByFlags[flags] = new GlobeSurfaceShader(numberOfDayTextures, flags, this.material, shader); } surfaceTile.surfaceShader = surfaceShader; diff --git a/Source/Scene/GlobeSurfaceTileProvider.js b/Source/Scene/GlobeSurfaceTileProvider.js index 00c047e2b83d..c7107ead82b6 100644 --- a/Source/Scene/GlobeSurfaceTileProvider.js +++ b/Source/Scene/GlobeSurfaceTileProvider.js @@ -6,6 +6,7 @@ define([ '../Core/Cartesian4', '../Core/Color', '../Core/ColorGeometryInstanceAttribute', + '../Core/combine', '../Core/defaultValue', '../Core/defined', '../Core/defineProperties', @@ -50,6 +51,7 @@ define([ Cartesian4, Color, ColorGeometryInstanceAttribute, + combine, defaultValue, defined, defineProperties, @@ -1259,6 +1261,10 @@ define([ uniformMapProperties.minMaxHeight.y = encoding.maximumHeight; Matrix4.clone(encoding.matrix, uniformMapProperties.scaleAndBias); + if (tileProvider.uniformMap) { + uniformMap = combine(uniformMap, tileProvider.uniformMap); + } + command.shaderProgram = tileProvider._surfaceShaderSet.getShaderProgram(frameState, surfaceTile, numberOfDayTextures, applyBrightness, applyContrast, applyHue, applySaturation, applyGamma, applyAlpha, applySplit, showReflectiveOcean, showOceanWaves, tileProvider.enableLighting, hasVertexNormals, useWebMercatorProjection, applyFog); command.castShadows = castShadows; command.receiveShadows = receiveShadows; diff --git a/Source/Scene/Material.js b/Source/Scene/Material.js index 5f5f53e2b430..ca593a63d09a 100644 --- a/Source/Scene/Material.js +++ b/Source/Scene/Material.js @@ -21,6 +21,8 @@ define([ '../Shaders/Materials/BumpMapMaterial', '../Shaders/Materials/CheckerboardMaterial', '../Shaders/Materials/DotMaterial', + '../Shaders/Materials/ElevationContourMaterial', + '../Shaders/Materials/ElevationRampMaterial', '../Shaders/Materials/FadeMaterial', '../Shaders/Materials/GridMaterial', '../Shaders/Materials/NormalMapMaterial', @@ -29,6 +31,8 @@ define([ '../Shaders/Materials/PolylineGlowMaterial', '../Shaders/Materials/PolylineOutlineMaterial', '../Shaders/Materials/RimLightingMaterial', + '../Shaders/Materials/SlopeMaterial', + '../Shaders/Materials/SlopeRampMaterial', '../Shaders/Materials/StripeMaterial', '../Shaders/Materials/Water', '../ThirdParty/when' @@ -55,6 +59,8 @@ define([ BumpMapMaterial, CheckerboardMaterial, DotMaterial, + ElevationContourMaterial, + ElevationRampMaterial, FadeMaterial, GridMaterial, NormalMapMaterial, @@ -63,6 +69,8 @@ define([ PolylineGlowMaterial, PolylineOutlineMaterial, RimLightingMaterial, + SlopeMaterial, + SlopeRampMaterial, StripeMaterial, WaterMaterial, when) { @@ -226,8 +234,21 @@ define([ *
  • outlineColor: diffuse color and alpha for the outline.
    • *
  • outlineWidth: width of the outline in pixels.
    • * + *
  • ElevationContour
    • + *
      + *
    • color: color and alpha for the contour line.
      • + *
    • spacing: spacing for contour lines in meters.
      • + *
    + *
  • ElevationRamp
    • + *
      + *
    • image: color ramp image to use for coloring the terrain.
      • + *
    • minHeight: minimum height for the ramp.
      • + *
    • maxHeight: maximum height for the ramp.
      • + *
    * * + + * * @alias Material * @@ -1470,5 +1491,70 @@ define([ } }); + /** + * Gets the name of the elevation contour material. + * @type {String} + * @readonly + */ + Material.ElevationContourType = 'ElevationContour'; + Material._materialCache.addMaterial(Material.ElevationContourType, { + fabric : { + type : Material.ElevationContourType, + uniforms : { + spacing: 100.0, + color: new Color(1.0, 0.0, 0.0, 1.0) + }, + source : ElevationContourMaterial + }, + translucent : false + }); + + /** + * Gets the name of the elevation contour material. + * @type {String} + * @readonly + */ + Material.ElevationRampType = 'ElevationRamp'; + Material._materialCache.addMaterial(Material.ElevationRampType, { + fabric : { + type : Material.ElevationRampType, + uniforms : { + image: Material.DefaultImageId, + minHeight: 0.0, + maxHeight: 10000.0 + }, + source : ElevationRampMaterial + }, + translucent : false + }); + + /** + * Gets the name of the slope material. + * @type {String} + * @readonly + */ + Material.SlopeMaterialType = 'Slope'; + Material._materialCache.addMaterial(Material.SlopeMaterialType, { + fabric : { + type : Material.SlopeMaterialType, + source : SlopeMaterial + }, + translucent : false + }); + + /** + * Gets the name of the slope ramp material. + * @type {String} + * @readonly + */ + Material.SlopeRampMaterialType = 'SlopeRamp'; + Material._materialCache.addMaterial(Material.SlopeRampMaterialType, { + fabric : { + type : Material.SlopeRampMaterialType, + source : SlopeRampMaterial + }, + translucent : false + }); + return Material; }); diff --git a/Source/Shaders/Builtin/Structs/materialInput.glsl b/Source/Shaders/Builtin/Structs/materialInput.glsl index 4329dda238c7..321a82b4959b 100644 --- a/Source/Shaders/Builtin/Structs/materialInput.glsl +++ b/Source/Shaders/Builtin/Structs/materialInput.glsl @@ -10,6 +10,8 @@ * @property {vec3} normalEC Unperturbed surface normal in eye coordinates. * @property {mat3} tangentToEyeMatrix Matrix for converting a tangent space normal to eye space. * @property {vec3} positionToEyeEC Vector from the fragment to the eye in eye coordinates. The magnitude is the distance in meters from the fragment to the eye. + * @property {float} height The height of the terrain. Only available for globe materials. + * @property {float} slope The slope of the terrain normalized from 0 to 1. Only available for globe materials. */ struct czm_materialInput { @@ -19,4 +21,6 @@ struct czm_materialInput vec3 normalEC; mat3 tangentToEyeMatrix; vec3 positionToEyeEC; + float height; + float slope; }; diff --git a/Source/Shaders/GlobeFS.glsl b/Source/Shaders/GlobeFS.glsl index 34f8bc02c4ca..daa73bfd16b3 100644 --- a/Source/Shaders/GlobeFS.glsl +++ b/Source/Shaders/GlobeFS.glsl @@ -57,6 +57,8 @@ varying vec3 v_positionEC; varying vec3 v_textureCoordinates; varying vec3 v_normalMC; varying vec3 v_normalEC; +varying float v_height; +varying float v_slope; #ifdef FOG varying float v_distance; @@ -180,6 +182,16 @@ void main() } #endif +#ifdef APPLY_MATERIAL + czm_materialInput materialInput; + materialInput.st = v_textureCoordinates.st; + materialInput.normalEC = normalize(v_normalEC); + materialInput.slope = v_slope; + materialInput.height = v_height; + czm_material material = czm_getMaterial(materialInput); + color.xyz = mix(color.xyz, material.diffuse, material.alpha); +#endif + #ifdef ENABLE_VERTEX_LIGHTING float diffuseIntensity = clamp(czm_getLambertDiffuse(czm_sunDirectionEC, normalize(v_normalEC)) * 0.9 + 0.3, 0.0, 1.0); vec4 finalColor = vec4(color.rgb * diffuseIntensity, color.a); diff --git a/Source/Shaders/GlobeVS.glsl b/Source/Shaders/GlobeVS.glsl index a9cbc9ed2382..cfff78756d7f 100644 --- a/Source/Shaders/GlobeVS.glsl +++ b/Source/Shaders/GlobeVS.glsl @@ -21,6 +21,8 @@ varying vec3 v_positionEC; varying vec3 v_textureCoordinates; varying vec3 v_normalMC; varying vec3 v_normalEC; +varying float v_slope; +varying float v_height; #ifdef FOG varying float v_distance; @@ -167,4 +169,9 @@ void main() v_rayleighColor = atmosColor.rayleigh; v_distance = length((czm_modelView3D * vec4(position3DWC, 1.0)).xyz); #endif + + vec3 finalNormal = normalize(v_normalMC); + vec3 worldNormal = normalize(v_positionMC.xyz); + v_slope = abs(dot(worldNormal, finalNormal)); + v_height = height; } diff --git a/Source/Shaders/Materials/ElevationContourMaterial.glsl b/Source/Shaders/Materials/ElevationContourMaterial.glsl new file mode 100644 index 000000000000..abdf962f288a --- /dev/null +++ b/Source/Shaders/Materials/ElevationContourMaterial.glsl @@ -0,0 +1,16 @@ +uniform vec4 color; + +czm_material czm_getMaterial(czm_materialInput materialInput) +{ + czm_material material = czm_getDefaultMaterial(materialInput); + + if (fract(materialInput.height / spacing) < 0.1 ) { + material.diffuse = color.rgb; + material.alpha = color.a; + } + else { + material.alpha = 0.0; + } + + return material; +} \ No newline at end of file diff --git a/Source/Shaders/Materials/ElevationRampMaterial.glsl b/Source/Shaders/Materials/ElevationRampMaterial.glsl new file mode 100644 index 000000000000..94db4faf683d --- /dev/null +++ b/Source/Shaders/Materials/ElevationRampMaterial.glsl @@ -0,0 +1,13 @@ +uniform sampler2D image; +uniform float minHeight; +uniform float maxHeight; + +czm_material czm_getMaterial(czm_materialInput materialInput) +{ + czm_material material = czm_getDefaultMaterial(materialInput); + float scaledHeight = clamp((materialInput.height - minHeight) / (maxHeight - minHeight), 0.0, 1.0); + vec4 rampColor = texture2D(image, vec2(scaledHeight, 0.5)); + material.diffuse = rampColor.rgb; + material.alpha = rampColor.a; + return material; +} \ No newline at end of file diff --git a/Source/Shaders/Materials/SlopeMaterial.glsl b/Source/Shaders/Materials/SlopeMaterial.glsl new file mode 100644 index 000000000000..3082ed0875bc --- /dev/null +++ b/Source/Shaders/Materials/SlopeMaterial.glsl @@ -0,0 +1,6 @@ +czm_material czm_getMaterial(czm_materialInput materialInput) +{ + czm_material material = czm_getDefaultMaterial(materialInput); + material.diffuse = mix(vec3(0.0, 0.0, 0.0), vec3(1.0, 1.0, 1.0), materialInput.slope); + return material; +} \ No newline at end of file diff --git a/Source/Shaders/Materials/SlopeRampMaterial.glsl b/Source/Shaders/Materials/SlopeRampMaterial.glsl new file mode 100644 index 000000000000..79c325f876c5 --- /dev/null +++ b/Source/Shaders/Materials/SlopeRampMaterial.glsl @@ -0,0 +1,25 @@ +czm_material czm_getMaterial(czm_materialInput materialInput) +{ + czm_material material = czm_getDefaultMaterial(materialInput); + + material.alpha = 0.0; + + if (materialInput.slope < 0.1) { + material.diffuse = vec3(1.0, 0.0, 0.0); + material.alpha = 1.0; + } + else if (materialInput.slope < 0.25) { + material.diffuse = vec3(0.0, 1.0, 0.0); + material.alpha = 1.0; + } + else if (materialInput.slope < 0.5) { + material.diffuse = vec3(0.0, 1.0, 1.0); + material.alpha = 1.0; + } + else if (materialInput.slope < 0.75) { + material.diffuse = vec3(0.0, 0.0, 1.0); + material.alpha = 1.0; + } + + return material; +} \ No newline at end of file From 4e3ae37656556759e43df9f29bc87bc7638d2005 Mon Sep 17 00:00:00 2001 From: Jason Beverage Date: Fri, 20 Oct 2017 13:59:44 -0400 Subject: [PATCH 02/31] Removed SlopeMaterial shader in favor of the SlopeRampMaterial which now uses a color ramp image --- Apps/Sandcastle/gallery/Globe Materials.html | 6 +--- Source/Scene/Material.js | 28 ++++++------------- Source/Shaders/Materials/SlopeMaterial.glsl | 6 ---- .../Shaders/Materials/SlopeRampMaterial.glsl | 25 ++++------------- 4 files changed, 15 insertions(+), 50 deletions(-) delete mode 100644 Source/Shaders/Materials/SlopeMaterial.glsl diff --git a/Apps/Sandcastle/gallery/Globe Materials.html b/Apps/Sandcastle/gallery/Globe Materials.html index 2f4635ce76b4..524d9854a9fe 100644 --- a/Apps/Sandcastle/gallery/Globe Materials.html +++ b/Apps/Sandcastle/gallery/Globe Materials.html @@ -191,11 +191,7 @@ text : 'Slope Color Ramp Material', onselect : function() { viewer.scene.globe.material = Cesium.Material.fromType('SlopeRamp'); - } -}, { - text : 'Slope Shading Material', - onselect : function() { - viewer.scene.globe.material = Cesium.Material.fromType('Slope'); + viewer.scene.globe.material.uniforms.image = getColorRamp(); } }], 'materialMenu'); diff --git a/Source/Scene/Material.js b/Source/Scene/Material.js index ca593a63d09a..18491460d254 100644 --- a/Source/Scene/Material.js +++ b/Source/Scene/Material.js @@ -31,7 +31,6 @@ define([ '../Shaders/Materials/PolylineGlowMaterial', '../Shaders/Materials/PolylineOutlineMaterial', '../Shaders/Materials/RimLightingMaterial', - '../Shaders/Materials/SlopeMaterial', '../Shaders/Materials/SlopeRampMaterial', '../Shaders/Materials/StripeMaterial', '../Shaders/Materials/Water', @@ -69,7 +68,6 @@ define([ PolylineGlowMaterial, PolylineOutlineMaterial, RimLightingMaterial, - SlopeMaterial, SlopeRampMaterial, StripeMaterial, WaterMaterial, @@ -245,10 +243,13 @@ define([ *
  • minHeight: minimum height for the ramp.
    • *
  • maxHeight: maximum height for the ramp.
    • * + *
  • SlopeRamp
    • + *
      + *
    • image: color ramp image to use for coloring the terrain.
      • + *
    + * * * - - * * @alias Material * @@ -1521,27 +1522,13 @@ define([ uniforms : { image: Material.DefaultImageId, minHeight: 0.0, - maxHeight: 10000.0 + maxHeight: 10000.0, }, source : ElevationRampMaterial }, translucent : false }); - /** - * Gets the name of the slope material. - * @type {String} - * @readonly - */ - Material.SlopeMaterialType = 'Slope'; - Material._materialCache.addMaterial(Material.SlopeMaterialType, { - fabric : { - type : Material.SlopeMaterialType, - source : SlopeMaterial - }, - translucent : false - }); - /** * Gets the name of the slope ramp material. * @type {String} @@ -1551,6 +1538,9 @@ define([ Material._materialCache.addMaterial(Material.SlopeRampMaterialType, { fabric : { type : Material.SlopeRampMaterialType, + uniforms : { + image: Material.DefaultImageId + }, source : SlopeRampMaterial }, translucent : false diff --git a/Source/Shaders/Materials/SlopeMaterial.glsl b/Source/Shaders/Materials/SlopeMaterial.glsl deleted file mode 100644 index 3082ed0875bc..000000000000 --- a/Source/Shaders/Materials/SlopeMaterial.glsl +++ /dev/null @@ -1,6 +0,0 @@ -czm_material czm_getMaterial(czm_materialInput materialInput) -{ - czm_material material = czm_getDefaultMaterial(materialInput); - material.diffuse = mix(vec3(0.0, 0.0, 0.0), vec3(1.0, 1.0, 1.0), materialInput.slope); - return material; -} \ No newline at end of file diff --git a/Source/Shaders/Materials/SlopeRampMaterial.glsl b/Source/Shaders/Materials/SlopeRampMaterial.glsl index 79c325f876c5..0f537273f21e 100644 --- a/Source/Shaders/Materials/SlopeRampMaterial.glsl +++ b/Source/Shaders/Materials/SlopeRampMaterial.glsl @@ -1,25 +1,10 @@ +uniform sampler2D image; + czm_material czm_getMaterial(czm_materialInput materialInput) { czm_material material = czm_getDefaultMaterial(materialInput); - - material.alpha = 0.0; - - if (materialInput.slope < 0.1) { - material.diffuse = vec3(1.0, 0.0, 0.0); - material.alpha = 1.0; - } - else if (materialInput.slope < 0.25) { - material.diffuse = vec3(0.0, 1.0, 0.0); - material.alpha = 1.0; - } - else if (materialInput.slope < 0.5) { - material.diffuse = vec3(0.0, 1.0, 1.0); - material.alpha = 1.0; - } - else if (materialInput.slope < 0.75) { - material.diffuse = vec3(0.0, 0.0, 1.0); - material.alpha = 1.0; - } - + vec4 rampColor = texture2D(image, vec2(materialInput.slope, 0.5)); + material.diffuse = rampColor.rgb; + material.alpha = rampColor.a; return material; } \ No newline at end of file From 6c2d17ceea989ce09abce1291677f0086a5dc238 Mon Sep 17 00:00:00 2001 From: Jason Beverage Date: Fri, 20 Oct 2017 14:53:41 -0400 Subject: [PATCH 03/31] Got rid of multiple enableLighting calls --- Apps/Sandcastle/gallery/Globe Materials.html | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Apps/Sandcastle/gallery/Globe Materials.html b/Apps/Sandcastle/gallery/Globe Materials.html index 524d9854a9fe..aa137a940a3e 100644 --- a/Apps/Sandcastle/gallery/Globe Materials.html +++ b/Apps/Sandcastle/gallery/Globe Materials.html @@ -42,17 +42,13 @@ 'use strict'; //Sandcastle_Begin var viewer = new Cesium.Viewer('cesiumContainer'); - -// set lighting to true -viewer.scene.globe.enableLighting = true; - var cesiumTerrainProviderMeshes = new Cesium.CesiumTerrainProvider({ url : 'https://assets.agi.com/stk-terrain/v1/tilesets/world/tiles', requestWaterMask : true, requestVertexNormals : true }); viewer.terrainProvider = cesiumTerrainProviderMeshes; -// Enable lighting so the normal flows through the shader + viewer.scene.globe.enableLighting = true; // The viewModel tracks the state of our mini application. @@ -102,7 +98,6 @@ text : 'CesiumTerrainProvider - STK World Terrain', onselect : function() { viewer.terrainProvider = cesiumTerrainProviderMeshes; - viewer.scene.globe.enableLighting = true; } }, { text : 'CesiumTerrainProvider - STK World Terrain - no effects', @@ -118,7 +113,6 @@ url : 'https://assets.agi.com/stk-terrain/v1/tilesets/world/tiles', requestVertexNormals : true }); - viewer.scene.globe.enableLighting = true; } }, { text : 'CesiumTerrainProvider - STK World Terrain w/ Water', From ce71917669c09fed907bc61d0ea4ccafa73121d3 Mon Sep 17 00:00:00 2001 From: Jason Beverage Date: Fri, 20 Oct 2017 14:54:14 -0400 Subject: [PATCH 04/31] Unsetting uniformMap if there is no material --- Source/Scene/Globe.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Source/Scene/Globe.js b/Source/Scene/Globe.js index bf1ec692eced..f3100d3e4896 100644 --- a/Source/Scene/Globe.js +++ b/Source/Scene/Globe.js @@ -83,8 +83,6 @@ define([ this._surfaceShaderSet = new GlobeSurfaceShaderSet(); this._material = undefined; - this.dirtyShaders(); - this._surface = new QuadtreePrimitive({ tileProvider : new GlobeSurfaceTileProvider({ terrainProvider : terrainProvider, @@ -96,6 +94,8 @@ define([ this._terrainProvider = terrainProvider; this._terrainProviderChanged = new Event(); + this.dirtyShaders(); + /** * Determines if the globe will be shown. * @@ -586,6 +586,9 @@ define([ // Set the material uniform map to the materials this._surface._tileProvider.uniformMap = this._material._uniforms; } + else { + this._surface._tileProvider.uniformMap = undefined; + } fragmentSources.push(GlobeFS); this._surfaceShaderSet.baseFragmentShaderSource = new ShaderSource({ From a2152cc1225b04d1fc100a98055b2aa2009e7c3f Mon Sep 17 00:00:00 2001 From: Jason Beverage Date: Fri, 20 Oct 2017 14:54:25 -0400 Subject: [PATCH 05/31] Updated CHANGES.md --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index bbe0639f423f..1df6016482e1 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,7 @@ Change Log * Added support for the layer.json `parentUrl` property in `CesiumTerrainProvider` to allow for compositing of tilesets. * Fixed a bug that caused KML ground overlays to appear distorted when rotation was applied. [#5914](https://github.com/AnalyticalGraphicsInc/cesium/issues/5914) * Adds `invertClassification` and `invertClassificationColor` to `Scene`. When `invertClassification` is `true`, any 3D Tiles geometry that is not classified by a `ClassificationPrimitive` or `GroundPrimitive` will have its color multiplied by `invertClassificationColor`. [#5836](https://github.com/AnalyticalGraphicsInc/cesium/pull/5836) +* Adds Material support to Globe. ### 1.38 - 2017-10-02 From 5139bad745cf40821ab758a47f5e5d724f4c02ae Mon Sep 17 00:00:00 2001 From: Jason Beverage Date: Fri, 20 Oct 2017 15:02:56 -0400 Subject: [PATCH 06/31] Updated CHANGES.md with PR reference --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 1df6016482e1..4fd83eca65de 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,7 +6,7 @@ Change Log * Added support for the layer.json `parentUrl` property in `CesiumTerrainProvider` to allow for compositing of tilesets. * Fixed a bug that caused KML ground overlays to appear distorted when rotation was applied. [#5914](https://github.com/AnalyticalGraphicsInc/cesium/issues/5914) * Adds `invertClassification` and `invertClassificationColor` to `Scene`. When `invertClassification` is `true`, any 3D Tiles geometry that is not classified by a `ClassificationPrimitive` or `GroundPrimitive` will have its color multiplied by `invertClassificationColor`. [#5836](https://github.com/AnalyticalGraphicsInc/cesium/pull/5836) -* Adds Material support to Globe. +* Adds Material support to Globe. [#5919](https://github.com/AnalyticalGraphicsInc/cesium/pull/5919) ### 1.38 - 2017-10-02 From 29d4ae26fd41642eee5345e7c41b456df1fda424 Mon Sep 17 00:00:00 2001 From: Jason Beverage Date: Fri, 20 Oct 2017 15:12:52 -0400 Subject: [PATCH 07/31] Fix eslint warning --- Source/Scene/Globe.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Scene/Globe.js b/Source/Scene/Globe.js index f3100d3e4896..d6a914fefa2e 100644 --- a/Source/Scene/Globe.js +++ b/Source/Scene/Globe.js @@ -581,7 +581,7 @@ define([ var fragmentDefines = []; if (this._material) { fragmentSources.push(this._material.shaderSource); - fragmentDefines.push("APPLY_MATERIAL"); + fragmentDefines.push('APPLY_MATERIAL'); // Set the material uniform map to the materials this._surface._tileProvider.uniformMap = this._material._uniforms; From 60c0121ed2b257e6bd5ff7dadffeb0ff4335ff7c Mon Sep 17 00:00:00 2001 From: Sean Lilley Date: Fri, 3 Nov 2017 16:36:30 -0400 Subject: [PATCH 08/31] Style tweaks --- Apps/Sandcastle/gallery/Globe Materials.html | 11 +++-------- CHANGES.md | 5 ++++- Source/Scene/Globe.js | 3 +-- Source/Scene/GlobeSurfaceShaderSet.js | 2 +- Source/Scene/GlobeSurfaceTileProvider.js | 2 +- .../Shaders/Materials/ElevationContourMaterial.glsl | 12 +++++++----- Source/Shaders/Materials/ElevationRampMaterial.glsl | 2 +- Source/Shaders/Materials/SlopeRampMaterial.glsl | 2 +- 8 files changed, 19 insertions(+), 20 deletions(-) diff --git a/Apps/Sandcastle/gallery/Globe Materials.html b/Apps/Sandcastle/gallery/Globe Materials.html index aa137a940a3e..68b860fe57eb 100644 --- a/Apps/Sandcastle/gallery/Globe Materials.html +++ b/Apps/Sandcastle/gallery/Globe Materials.html @@ -4,8 +4,8 @@ - - + + Cesium Demo @@ -31,7 +31,7 @@ Contour Spacing - + @@ -64,16 +64,11 @@ var grd = ctx.createLinearGradient(0, 0, 100, 0); grd.addColorStop(0, "black"); - grd.addColorStop(0.25, "red"); - grd.addColorStop(0.5, "blue"); - grd.addColorStop(0.75, "green"); - grd.addColorStop(1.0, "white"); - ctx.fillStyle = grd; ctx.fillRect(0, 0, 100, 1); return ramp; diff --git a/CHANGES.md b/CHANGES.md index a82d8cb704d3..410231383d4e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,10 @@ Change Log ========== +### 1.40 - 2017-12-01 + +* Adds Material support to Globe. [#5919](https://github.com/AnalyticalGraphicsInc/cesium/pull/5919) + ### 1.39 - 2017-11-01 * Added support for right-to-left language detection in labels, currently Hebrew and Arabic are supported. To enable it, set `Cesium.Label.enableRightToLeftDetection = true` at the beginning of your application. [#5771](https://github.com/AnalyticalGraphicsInc/cesium/pull/5771) @@ -15,7 +19,6 @@ Change Log * Added `eyeSeparation` and `focalLength` properties to `Scene` to configure VR settings. [#5917](https://github.com/AnalyticalGraphicsInc/cesium/pull/5917) * Added `customTags` property to the UrlTemplateImageryProvider to allow custom keywords in the template URL. [#5696](https://github.com/AnalyticalGraphicsInc/cesium/pull/5696) * Improved CZML Reference Properties example [#5754](https://github.com/AnalyticalGraphicsInc/cesium/pull/5754) -* Adds Material support to Globe. [#5919](https://github.com/AnalyticalGraphicsInc/cesium/pull/5919) * Fixed bug with placemarks in imported KML: placemarks with no specified icon would be displayed with default icon. [#5819](https://github.com/AnalyticalGraphicsInc/cesium/issues/5819) * Fixed flickering artifacts on tilesets with thin walls. [#5940](https://github.com/AnalyticalGraphicsInc/cesium/pull/5940) * Fixed bright fog when terrain lighting is enabled and added `Fog.minimumBrightness` to affect how bright the fog will be when in complete darkness. [#5934](https://github.com/AnalyticalGraphicsInc/cesium/pull/5934) diff --git a/Source/Scene/Globe.js b/Source/Scene/Globe.js index d6a914fefa2e..0620db6d063f 100644 --- a/Source/Scene/Globe.js +++ b/Source/Scene/Globe.js @@ -585,8 +585,7 @@ define([ // Set the material uniform map to the materials this._surface._tileProvider.uniformMap = this._material._uniforms; - } - else { + } else { this._surface._tileProvider.uniformMap = undefined; } fragmentSources.push(GlobeFS); diff --git a/Source/Scene/GlobeSurfaceShaderSet.js b/Source/Scene/GlobeSurfaceShaderSet.js index abcdc95ae404..56e4f586b452 100644 --- a/Source/Scene/GlobeSurfaceShaderSet.js +++ b/Source/Scene/GlobeSurfaceShaderSet.js @@ -15,8 +15,8 @@ define([ function GlobeSurfaceShader(numberOfDayTextures, flags, material, shaderProgram) { this.numberOfDayTextures = numberOfDayTextures; this.flags = flags; - this.shaderProgram = shaderProgram; this.material = material; + this.shaderProgram = shaderProgram; } /** diff --git a/Source/Scene/GlobeSurfaceTileProvider.js b/Source/Scene/GlobeSurfaceTileProvider.js index da6054fbe634..9af1dc43b76a 100644 --- a/Source/Scene/GlobeSurfaceTileProvider.js +++ b/Source/Scene/GlobeSurfaceTileProvider.js @@ -1265,7 +1265,7 @@ define([ Matrix4.clone(encoding.matrix, uniformMapProperties.scaleAndBias); if (tileProvider.uniformMap) { - uniformMap = combine(uniformMap, tileProvider.uniformMap); + uniformMap = combine(uniformMap, tileProvider.uniformMap); } command.shaderProgram = tileProvider._surfaceShaderSet.getShaderProgram(frameState, surfaceTile, numberOfDayTextures, applyBrightness, applyContrast, applyHue, applySaturation, applyGamma, applyAlpha, applySplit, showReflectiveOcean, showOceanWaves, tileProvider.enableLighting, hasVertexNormals, useWebMercatorProjection, applyFog); diff --git a/Source/Shaders/Materials/ElevationContourMaterial.glsl b/Source/Shaders/Materials/ElevationContourMaterial.glsl index abdf962f288a..d9ee1c27bff6 100644 --- a/Source/Shaders/Materials/ElevationContourMaterial.glsl +++ b/Source/Shaders/Materials/ElevationContourMaterial.glsl @@ -4,13 +4,15 @@ czm_material czm_getMaterial(czm_materialInput materialInput) { czm_material material = czm_getDefaultMaterial(materialInput); - if (fract(materialInput.height / spacing) < 0.1 ) { - material.diffuse = color.rgb; - material.alpha = color.a; + if (fract(materialInput.height / spacing) < 0.1) + { + material.diffuse = color.rgb; + material.alpha = color.a; } - else { + else + { material.alpha = 0.0; } return material; -} \ No newline at end of file +} diff --git a/Source/Shaders/Materials/ElevationRampMaterial.glsl b/Source/Shaders/Materials/ElevationRampMaterial.glsl index 94db4faf683d..6f3a674401c6 100644 --- a/Source/Shaders/Materials/ElevationRampMaterial.glsl +++ b/Source/Shaders/Materials/ElevationRampMaterial.glsl @@ -10,4 +10,4 @@ czm_material czm_getMaterial(czm_materialInput materialInput) material.diffuse = rampColor.rgb; material.alpha = rampColor.a; return material; -} \ No newline at end of file +} diff --git a/Source/Shaders/Materials/SlopeRampMaterial.glsl b/Source/Shaders/Materials/SlopeRampMaterial.glsl index 0f537273f21e..14e30a9086bb 100644 --- a/Source/Shaders/Materials/SlopeRampMaterial.glsl +++ b/Source/Shaders/Materials/SlopeRampMaterial.glsl @@ -7,4 +7,4 @@ czm_material czm_getMaterial(czm_materialInput materialInput) material.diffuse = rampColor.rgb; material.alpha = rampColor.a; return material; -} \ No newline at end of file +} From cbcaea100e4adb707016212ea863d4d90e230faf Mon Sep 17 00:00:00 2001 From: Jason Beverage Date: Mon, 13 Nov 2017 10:29:13 -0500 Subject: [PATCH 09/31] Setting initial time in Globe Materials demo to make lighting look decent on first view of Mt Everest --- Apps/Sandcastle/gallery/Globe Materials.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Apps/Sandcastle/gallery/Globe Materials.html b/Apps/Sandcastle/gallery/Globe Materials.html index 68b860fe57eb..fafae78e2bb1 100644 --- a/Apps/Sandcastle/gallery/Globe Materials.html +++ b/Apps/Sandcastle/gallery/Globe Materials.html @@ -51,6 +51,9 @@ viewer.scene.globe.enableLighting = true; +// Set the clock so the lighting looks good on the initial viewpoint. +viewer.clockViewModel.currentTime = Cesium.JulianDate.fromDate(new Date(2017, 8, 22, 0, 0, 0)); + // The viewModel tracks the state of our mini application. var viewModel = { spacing: 100.0 From cff763d7f634308da76859761ef24430f1b3caa6 Mon Sep 17 00:00:00 2001 From: Jason Beverage Date: Mon, 13 Nov 2017 10:30:45 -0500 Subject: [PATCH 10/31] Using defined to check for material in Globe --- Source/Scene/Globe.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Scene/Globe.js b/Source/Scene/Globe.js index 0620db6d063f..c9a407ca23f7 100644 --- a/Source/Scene/Globe.js +++ b/Source/Scene/Globe.js @@ -540,7 +540,7 @@ define([ return; } - if (this._material) { + if (defined(this._material)) { this._material.update(frameState.context); } @@ -579,7 +579,7 @@ define([ var fragmentSources = []; var fragmentDefines = []; - if (this._material) { + if (defined(this._material)) { fragmentSources.push(this._material.shaderSource); fragmentDefines.push('APPLY_MATERIAL'); From 5c619a9a345b9d854cf860c9e78fd703f4fcf264 Mon Sep 17 00:00:00 2001 From: Jason Beverage Date: Mon, 13 Nov 2017 10:32:49 -0500 Subject: [PATCH 11/31] Using defined to check for uniformMap --- Source/Scene/GlobeSurfaceTileProvider.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Scene/GlobeSurfaceTileProvider.js b/Source/Scene/GlobeSurfaceTileProvider.js index 9af1dc43b76a..83d188d4c5b5 100644 --- a/Source/Scene/GlobeSurfaceTileProvider.js +++ b/Source/Scene/GlobeSurfaceTileProvider.js @@ -1264,7 +1264,7 @@ define([ uniformMapProperties.minMaxHeight.y = encoding.maximumHeight; Matrix4.clone(encoding.matrix, uniformMapProperties.scaleAndBias); - if (tileProvider.uniformMap) { + if (defined(tileProvider.uniformMap)) { uniformMap = combine(uniformMap, tileProvider.uniformMap); } From 7493d7c5657ea4f1a86d554d930ebc83a396c4b9 Mon Sep 17 00:00:00 2001 From: Jason Beverage Date: Mon, 13 Nov 2017 11:04:36 -0500 Subject: [PATCH 12/31] Wrapping slope and height and globe shaders with APPLY_MATERIAL ifdef. --- Source/Scene/Globe.js | 14 ++++++++------ Source/Shaders/GlobeFS.glsl | 3 +++ Source/Shaders/GlobeVS.glsl | 5 +++++ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Source/Scene/Globe.js b/Source/Scene/Globe.js index c9a407ca23f7..3e18bfdbfa73 100644 --- a/Source/Scene/Globe.js +++ b/Source/Scene/Globe.js @@ -573,15 +573,12 @@ define([ * @private */ Globe.prototype.dirtyShaders = function() { - this._surfaceShaderSet.baseVertexShaderSource = new ShaderSource({ - sources : [GroundAtmosphere, GlobeVS] - }); + var defines = []; var fragmentSources = []; - var fragmentDefines = []; if (defined(this._material)) { fragmentSources.push(this._material.shaderSource); - fragmentDefines.push('APPLY_MATERIAL'); + defines.push('APPLY_MATERIAL'); // Set the material uniform map to the materials this._surface._tileProvider.uniformMap = this._material._uniforms; @@ -590,9 +587,14 @@ define([ } fragmentSources.push(GlobeFS); + this._surfaceShaderSet.baseVertexShaderSource = new ShaderSource({ + sources : [GroundAtmosphere, GlobeVS], + defines: defines + }); + this._surfaceShaderSet.baseFragmentShaderSource = new ShaderSource({ sources : fragmentSources, - defines: fragmentDefines + defines: defines }); this._surfaceShaderSet.material = this._material; }; diff --git a/Source/Shaders/GlobeFS.glsl b/Source/Shaders/GlobeFS.glsl index de834ea8ca47..fe4c9c82b6d4 100644 --- a/Source/Shaders/GlobeFS.glsl +++ b/Source/Shaders/GlobeFS.glsl @@ -61,8 +61,11 @@ varying vec3 v_positionEC; varying vec3 v_textureCoordinates; varying vec3 v_normalMC; varying vec3 v_normalEC; + +#ifdef APPLY_MATERIAL varying float v_height; varying float v_slope; +#endif #ifdef FOG varying float v_distance; diff --git a/Source/Shaders/GlobeVS.glsl b/Source/Shaders/GlobeVS.glsl index cfff78756d7f..73fdefc4b781 100644 --- a/Source/Shaders/GlobeVS.glsl +++ b/Source/Shaders/GlobeVS.glsl @@ -21,8 +21,11 @@ varying vec3 v_positionEC; varying vec3 v_textureCoordinates; varying vec3 v_normalMC; varying vec3 v_normalEC; + +#ifdef APPLY_MATERIAL varying float v_slope; varying float v_height; +#endif #ifdef FOG varying float v_distance; @@ -170,8 +173,10 @@ void main() v_distance = length((czm_modelView3D * vec4(position3DWC, 1.0)).xyz); #endif +#ifdef APPLY_MATERIAL vec3 finalNormal = normalize(v_normalMC); vec3 worldNormal = normalize(v_positionMC.xyz); v_slope = abs(dot(worldNormal, finalNormal)); v_height = height; +#endif } From 5e4aab68a79ac2e80b8dbec96a11a8484e0a8690 Mon Sep 17 00:00:00 2001 From: Jason Beverage Date: Mon, 13 Nov 2017 11:09:10 -0500 Subject: [PATCH 13/31] Renamed minHeight/maxHeight => minimumHeight/maximumHeight in ElevationRampMaterial --- Source/Scene/Material.js | 8 ++++---- Source/Shaders/Materials/ElevationRampMaterial.glsl | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Source/Scene/Material.js b/Source/Scene/Material.js index 18491460d254..67719c0e5992 100644 --- a/Source/Scene/Material.js +++ b/Source/Scene/Material.js @@ -240,8 +240,8 @@ define([ *
  • ElevationRamp
    • *
      *
    • image: color ramp image to use for coloring the terrain.
      • - *
    • minHeight: minimum height for the ramp.
      • - *
    • maxHeight: maximum height for the ramp.
      • + *
    • minimumHeight: minimum height for the ramp.
      • + *
    • maximumHeight: maximum height for the ramp.
      • *
    *
  • SlopeRamp
    • *
      @@ -1521,8 +1521,8 @@ define([ type : Material.ElevationRampType, uniforms : { image: Material.DefaultImageId, - minHeight: 0.0, - maxHeight: 10000.0, + minimumHeight: 0.0, + maximumHeight: 10000.0 }, source : ElevationRampMaterial }, diff --git a/Source/Shaders/Materials/ElevationRampMaterial.glsl b/Source/Shaders/Materials/ElevationRampMaterial.glsl index 6f3a674401c6..36c017422175 100644 --- a/Source/Shaders/Materials/ElevationRampMaterial.glsl +++ b/Source/Shaders/Materials/ElevationRampMaterial.glsl @@ -1,11 +1,11 @@ uniform sampler2D image; -uniform float minHeight; -uniform float maxHeight; +uniform float minimumHeight; +uniform float maximumHeight; czm_material czm_getMaterial(czm_materialInput materialInput) { czm_material material = czm_getDefaultMaterial(materialInput); - float scaledHeight = clamp((materialInput.height - minHeight) / (maxHeight - minHeight), 0.0, 1.0); + float scaledHeight = clamp((materialInput.height - minimumHeight) / (maximumHeight - minimumHeight), 0.0, 1.0); vec4 rampColor = texture2D(image, vec2(scaledHeight, 0.5)); material.diffuse = rampColor.rgb; material.alpha = rampColor.a; From c045a6cae5cb3f5b2b92d16a0b48ae53c8ff4406 Mon Sep 17 00:00:00 2001 From: Jason Beverage Date: Mon, 13 Nov 2017 14:40:49 -0500 Subject: [PATCH 14/31] Added lineThickness uniform to ElevationContourMaterial Added implementation of screen space partial derivatives for contour lines to make them look nicer. Source/Shaders/Materials/ElevationContourMaterial.glsl --- Source/Scene/Material.js | 4 ++- .../Materials/ElevationContourMaterial.glsl | 27 ++++++++++++------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/Source/Scene/Material.js b/Source/Scene/Material.js index 67719c0e5992..7e2e3ed21a7e 100644 --- a/Source/Scene/Material.js +++ b/Source/Scene/Material.js @@ -236,6 +236,7 @@ define([ *
        *
      • color: color and alpha for the contour line.
        • *
      • spacing: spacing for contour lines in meters.
        • + *
      • lineThickness: Number specifying the thickness of the grid lines in pixels.
        • *
      *
    • ElevationRamp
      • *
        @@ -1503,7 +1504,8 @@ define([ type : Material.ElevationContourType, uniforms : { spacing: 100.0, - color: new Color(1.0, 0.0, 0.0, 1.0) + color: new Color(1.0, 0.0, 0.0, 1.0), + lineThickness: 1.0 }, source : ElevationContourMaterial }, diff --git a/Source/Shaders/Materials/ElevationContourMaterial.glsl b/Source/Shaders/Materials/ElevationContourMaterial.glsl index d9ee1c27bff6..f37e37dba820 100644 --- a/Source/Shaders/Materials/ElevationContourMaterial.glsl +++ b/Source/Shaders/Materials/ElevationContourMaterial.glsl @@ -1,18 +1,27 @@ +#ifdef GL_OES_standard_derivatives + #extension GL_OES_standard_derivatives : enable +#endif + uniform vec4 color; +uniform float spacing; +uniform float lineThickness; czm_material czm_getMaterial(czm_materialInput materialInput) { czm_material material = czm_getDefaultMaterial(materialInput); - if (fract(materialInput.height / spacing) < 0.1) - { - material.diffuse = color.rgb; - material.alpha = color.a; - } - else - { - material.alpha = 0.0; - } + float distanceToContour = mod(materialInput.height, spacing); + +#ifdef GL_OES_standard_derivatives + float dxc = abs(dFdx(materialInput.height)); + float dyc = abs(dFdy(materialInput.height)); + float dF = max(dxc, dyc) * lineThickness; + material.alpha = (distanceToContour < dF) ? 1.0 : 0.0; +#else + material.alpha = (distanceToContour < (czm_resolutionScale * lineThickness)) ? 1.0 : 0.0; +#endif + + material.diffuse = color.rgb; return material; } From 8f4a8a1e0266db2b505e6697ebd89394678041e7 Mon Sep 17 00:00:00 2001 From: hpinkos Date: Fri, 17 Nov 2017 15:04:22 -0500 Subject: [PATCH 15/31] fancy sandcastle demo --- Apps/Sandcastle/gallery/Globe Materials.html | 321 ++++++++++++------- Apps/Sandcastle/gallery/Globe Materials.jpg | Bin 20762 -> 25677 bytes 2 files changed, 198 insertions(+), 123 deletions(-) diff --git a/Apps/Sandcastle/gallery/Globe Materials.html b/Apps/Sandcastle/gallery/Globe Materials.html index fafae78e2bb1..5e8b74782525 100644 --- a/Apps/Sandcastle/gallery/Globe Materials.html +++ b/Apps/Sandcastle/gallery/Globe Materials.html @@ -10,73 +10,150 @@

        Loading...

        -
        -
        -
        -
        - - - - - - -
        Contour Spacing - -
        +
        +
        + + + +
        +
        +
        + +
        +
        + Spacing m +
        +
        + Line Width px +
        +
        + +
        +