Code

Add Material Support to Globe#5919

Code

Merged

pjcozzi merged 35 commits intoCesiumGS:masterCesiumGS/cesium:masterfrom jasonbeverage:globematerialsjasonbeverage/cesium:globematerialsCopy head branch name to clipboardNov 25, 2017

+587-13

Commits

Commits on Oct 20, 2017

• Added material support to the globe

  jasonbeverage

  committed
  24ff46b

• Removed SlopeMaterial shader in favor of the SlopeRampMaterial which now uses a color ramp image

  jasonbeverage

  committed
  4e3ae37

• Got rid of multiple enableLighting calls

  jasonbeverage

  committed
  6c2d17c

• Unsetting uniformMap if there is no material

  jasonbeverage

  committed
  ce71917

• Updated CHANGES.md

  jasonbeverage

  committed
  a2152cc

• Updated CHANGES.md with PR reference

  jasonbeverage

  committed
  5139bad

• Fix eslint warning

  jasonbeverage

  committed
  29d4ae2

• Merge remote-tracking branch 'upstream/master' into globematerials

  Show description for 11325f2
  jasonbeverage

  committed
  11325f2

Commits on Nov 1, 2017

• Merge branch 'master' into globematerials

  jasonbeverage

  authored
  9b7f7d9

Commits on Nov 3, 2017

• Style tweaks

  lilleyse

  committed
  60c0121

• Merge branch 'master' into globematerials

  lilleyse

  authored
  46d1a17

• Merge branch 'master' into globematerials

  lilleyse

  authored
  3ba02db

Commits on Nov 13, 2017

• Setting initial time in Globe Materials demo to make lighting look decent on first view of Mt Everest

  jasonbeverage

  committed
  cbcaea1

• Using defined to check for material in Globe

  jasonbeverage

  committed
  cff763d

• Using defined to check for uniformMap

  jasonbeverage

  committed
  5c619a9

• Wrapping slope and height and globe shaders with APPLY_MATERIAL ifdef.

  jasonbeverage

  committed
  7493d7c

• Renamed minHeight/maxHeight => minimumHeight/maximumHeight in ElevationRampMaterial

  jasonbeverage

  committed
  5e4aab6

• Added lineThickness uniform to ElevationContourMaterial

  Show description for c045a6c
  jasonbeverage

  committed
  c045a6c

Commits on Nov 17, 2017

• fancy sandcastle demo

  

  hpinkos

  committed
  8f4a8a1

Commits on Nov 21, 2017

• Removed trailing whitespace to fix travis

  jasonbeverage

  committed
  e8f9b04

Commits on Nov 25, 2017

• Changed link in CHANGES.md to Globe Material sandcastle demo

  jasonbeverage

  committed
  8ca9ac9

• Changed dirtyShaders to makeShadersDirty and made it a file level function intead of a private function

  jasonbeverage

  committed
  0697c45

• Remove comment

  jasonbeverage

  committed
  83dedf0

• Formatting

  jasonbeverage

  committed
  a5fd43f

• Renamed lineThickness to width for ElevationContourMaterial

  jasonbeverage

  committed
  e469dd7

• Clarification of height in materialInput

  jasonbeverage

  committed
  560caa5

• Commenting slope in materialInput

  jasonbeverage

  committed
  cc77f3a

• Not normalizing v_normalMC in GlobeVS.glsl

  jasonbeverage

  committed
  8c30e90

• Not reading varying values in GlobeVS

  jasonbeverage

  committed
  5bd104f

• Changed default viewpoint of GlobeMaterials to the Himalayas

  jasonbeverage

  committed
  a71d73a

• Added unit tests for rendering a globe with materials

  jasonbeverage

  committed
  b42d079

• Added sets material test for Globe

  jasonbeverage

  committed
  0264ab1

• Tweak CHANGES.md

  pjcozzi

  authored
  8eb3bd4

• Whitespace

  pjcozzi

  authored
  217ce3a

• Default Globe Material Sandcastle example to elevation shading

  pjcozzi

  authored
  fc88b02