Code

merge latest#1

Code

Merged

dwastberg merged 156 commits intodwastberg:masterdwastberg/cesium:masterfrom CesiumGS:masterCesiumGS/cesium:masterCopy head branch name to clipboardSep 25, 2018

+5,942-3,825

Commits

Commits on Jul 16, 2018

• Update gltf pipeline files and support KHR_techniques_webgl and KHR_blend extensions

  ggetz

  committed
  be6fffa

• Cleanup

  ggetz

  committed
  9d907df

Commits on Jul 19, 2018

• Doc edits

  lilleyse

  committed
  e82b4b6

Commits on Jul 23, 2018

• Minor cleanup

  lilleyse

  committed
  395eb34

Commits on Jul 25, 2018

• Cleanup model with new gltf-pipeline

  ggetz

  committed
  173f4b5

• Add back ground atmosphere from space.

  bagnell

  committed
  b3aeee9

• Fix fog.

  bagnell

  committed
  c052aa0

Commits on Aug 1, 2018

• Merge branch 'master' into atmosphere

  bagnell

  committed
  381c0b2

• Add option to enable disable ground atmosphere.

  bagnell

  committed
  75e14f7

• Fix sky atmosphere.

  bagnell

  committed
  139a529

• Revert sky atmosphere changes.

  bagnell

  committed
  edc42fa

• Remove unused code in sky atmosphere shader.

  bagnell

  committed
  e642085

Commits on Aug 2, 2018

• Fix night atmosphere color.

  bagnell

  committed
  5f11c50

• Use atmosphere with correct sun lighting.

  bagnell

  committed
  d3a9950

• Simplify render states

  ggetz

  committed
  923874b

• Make night fade in/out distances a uniform.

  bagnell

  committed
  bb402de

• Update doc.

  bagnell

  committed
  2e2b825

• Fix 2D/CV.

  bagnell

  committed
  a708860

• Update CHANGES.md.

  bagnell

  committed
  31de234

• Fix ClassificationModel, factor out duplicate code

  ggetz

  committed
  7abc5c7

Commits on Aug 3, 2018

• Various gltf cleanup

  ggetz

  committed
  1e5d67f

• Merge branch 'master' into gltf-update-pipeline

  ggetz

  committed
  58f99b4

• alphaCutoff uniform, attribute location fix

  ggetz

  committed
  6de38fe

• Update gltf-pipeline

  ggetz

  committed
  5651d79

• Merge branch 'master' into atmosphere

  bagnell

  committed
  f6bf14c

Commits on Aug 9, 2018

• Merge branch 'master' into atmosphere

  bagnell

  committed
  dbccbd8

Commits on Aug 20, 2018

• Update pipeline, resolve material errors

  ggetz

  committed
  c098115

• Merge branch 'master' into atmosphere

  bagnell

  committed
  a7234d7

• Make ground atmosphere per-fragment for a smoother transition from night to day.

  bagnell

  committed
  9d31730

• Remove pipeline extras where possible

  ggetz

  committed
  be83cc2

• Only use per-fragment ground atmosphere when the camera is greater than the fade out distance.

  bagnell

  committed
  2279eac

Commits on Aug 23, 2018

• Merge branch 'master' into atmosphere

  bagnell

  committed
  f6a1522

Commits on Aug 27, 2018

• Fix model caching, cleanup forward axis, cleanup specs

  ggetz

  committed
  681aa24

• Fix docs, use gltfPipeline removePipelineExtras

  ggetz

  committed
  c0db13d

• Cleanup eslint error

  ggetz

  committed
  c69505b

• Fix render states

  ggetz

  committed
  a7a4ced

• Discard instead of blend for alphaMode MASK

  ggetz

  committed
  514c2b7

• Cleanup eslint error

  ggetz

  committed
  71ff4c4

Commits on Aug 29, 2018

• Merge branch 'master' into atmosphere

  bagnell

  committed
  1e6aafe

Commits on Aug 30, 2018

• Add KHR_materials_unlit to list of supported extensions

  

  Omar Shehata

  committed
  ccad16c

• Turn off lighting when detects unlit extension

  

  Omar Shehata

  committed
  b136052

• Updated changes.md

  

  Omar Shehata

  committed
  7a9faa7

• Ignore unlit and occlusion when unlit

  

  Omar Shehata

  committed
  c56a339

Commits on Aug 31, 2018

• Remove log and fix formatting

  

  Omar Shehata

  committed
  21caa93

• Added test for unlit

  

  Omar Shehata

  committed
  7c28d2a

• Moved BoxUnlit to its own folder

  

  Omar Shehata

  committed
  ba4d840

Commits on Sep 4, 2018

• Added KHR_materials_pbrSpecularGlossiness to supported extensions

  

  Omar Shehata

  committed
  db96ceb

• Add support for spec gloss

  

  Shehata

  committed
  ca4dc6c

Commits on Sep 5, 2018

• Moved changes.md text into October release

  

  Shehata

  committed
  f3afd01

• Merge branch 'master' into gltf-update-pipeline

  ggetz

  committed
  0d8a577

• Added BoomBox SpecGloss model

  

  Shehata

  committed
  6401433

• Updated old boom box model

  

  Shehata

  committed
  3dad95a

• Added entry to CHANGES.md

  

  Shehata

  committed
  6d8e5dc

• Merge branch 'master' into atmosphere

  bagnell

  committed
  681fb0f

• Update CHANGES.md after merge.

  bagnell

  committed
  2225851

• Merge branch 'gltf-update-pipeline' into gltf-unlit

  lilleyse

  authored
  974af0d

• Merge pull request #6977 from OmarShehata/gltf-unlit

  Show description for 604400d
  lilleyse

  authored
  604400d

Commits on Sep 6, 2018

• Merge branch 'master' into atmosphere

  bagnell

  committed
  8da546f

Commits on Sep 7, 2018

• Merge branch 'gltf-update-pipeline' into specgloss-ext

  OmarShehata

  authored
  602db48

• Fixed linting

  

  Omar Shehata

  committed
  73db740

• Emackey's feedback

  

  Omar Shehata

  committed
  5fb072e

• Rename to processPbrMaterials.js

  

  Omar Shehata

  committed
  d97b899

• Added spec gloss tests

  

  Omar Shehata

  committed
  fcd4433

• Add one more test

  

  Omar Shehata

  committed
  e59593a

Commits on Sep 11, 2018

• Always use root tileset's transform

  

  Omar Shehata

  committed
  ad7abcd

• Merge branch 'master' into atmosphere

  bagnell

  committed
  fc3e0c7

• Apply RTC & bounding sphere fallback for clipping planes

  

  Omar Shehata

  committed
  9f55539

• Clean up globe shader parameters.

  bagnell

  committed
  4426bd2

• More aggressive fade distances. Have enable lighting off by default.

  bagnell

  committed
  bfd11bd

• Change water specular intensity when ground atmosphere is enabled.

  bagnell

  committed
  7180803

• Fix day/night terrain shading.

  bagnell

  committed
  80e591d

Commits on Sep 13, 2018

• Update gltf-pipeline

  ggetz

  committed
  67ef702

• Update axis based on version before update

  ggetz

  committed
  22cc546

• Fix model specs

  ggetz

  committed
  4ec829c

• Add additional tests

  ggetz

  committed
  3cc7c98

• All glTF materials are PBR by default

  

  Shehata

  committed
  5b94577

• Fix merge conflict

  

  Shehata

  committed
  05ef68d

• Fix failing tests

  

  Shehata

  committed
  0e63533

• Merge branch 'master' into gltf-update-pipeline

  ggetz

  committed
  3cad9ea

• Update CHANGES.md

  ggetz

  committed
  b137ab4

Commits on Sep 14, 2018

• Added simpler example in Transforms

  

  Omar Shehata

  committed
  bedb222

• Fixed crash if root tile wasn't loaded

  

  Omar Shehata

  committed
  9ed3695

• Apply eastNorthUp to RTC center

  

  Omar Shehata

  committed
  bdb8799

Commits on Sep 17, 2018

• Update comment in example code.

  OmarShehata

  authored
  b43d791

• Simplify check for PBR materials

  

  Omar Shehata

  committed
  2de8d69

• No need to account for glTF 1.0

  

  Omar Shehata

  committed
  4d5d53f

• Fixed trailing space

  

  Omar Shehata

  committed
  0716e17

• Merge pull request #7006 from OmarShehata/specgloss-ext

  Show description for e88ac9d
  lilleyse

  authored
  e88ac9d

• Fixed RTC for b3dm

  

  Shehata

  committed
  6cb0426

• Fix test failures from #7039

  lilleyse

  committed
  dcfefc9

Commits on Sep 18, 2018

• Fix bug in StaticGroundGeometryPerMaterialBatch where an array of items is mutated but loop length is not adjusted accordingly, causing a Cesiumt to crash.

  impactblue573

  committed
  be9a3b2

• Traversal uses correct tileset transforms for clipping

  

  Shehata

  committed
  aa71e96

• Fix glTF 1.0 asset version and no mesh edge cases

  ggetz

  committed
  88ebec6

• Sinplified BoundingSphere fallback check

  

  Omar Shehata

  committed
  0ec49a5

• No need to keep track of RTC anymore

  

  Omar Shehata

  committed
  0a07e56

• Fix modelInstanceCollection spec

  ggetz

  committed
  4c168a9

• Update model specs

  ggetz

  committed
  015e700

• Simplify clipping sandcastle example

  

  Omar Shehata

  committed
  5aee22a

• Use correct matrix for point clouds

  

  Omar Shehata

  committed
  1f1cd16

• Fixed old tests

  

  Omar Shehata

  committed
  8996da6

• Fix point cloud tests

  

  Omar Shehata

  committed
  7d5bb57

• Added bounding sphere tests

  

  Omar Shehata

  committed
  b605a61

• Added clipping plane doc example

  

  Omar Shehata

  committed
  0d2dd5f

Commits on Sep 19, 2018

• Clean up after test

  

  Omar Shehata

  committed
  e5e495c

• Added expectations to spec gloss tests

  

  Omar Shehata

  committed
  f78b4f5

• Use defaultValue

  

  Omar Shehata

  committed
  125c36f

• Fix 'Many Clipping Planes' example

  

  Omar Shehata

  committed
  814c5ae

• Put back point cloud clipping plane matrix

  

  Omar Shehata

  committed
  dd3a7c6

• Style and wording edits

  

  Omar Shehata

  committed
  9db4500

• Moved clippingPlaneOffsetMatrix to Tileset

  

  Omar Shehata

  committed
  2dac9f4

• 2 -> 2.0

  

  Omar Shehata

  committed
  fb69626

• Updated tests

  

  Omar Shehata

  committed
  2fadcf9

• Merge pull request #7050 from OmarShehata/gltf-update-pipeline

  Show description for c0eaf28
  ggetz

  authored
  c0eaf28

• Merge pull request #7041 from OmarShehata/icrf-example

  Show description for d9bb9c2
  mramato

  authored
  d9bb9c2

• Merge pull request #6805 from AnalyticalGraphicsInc/gltf-update-pipeline

  Show description for 0ffd273
  lilleyse

  authored
  0ffd273

• Fixed old clipping planes test

  

  Omar Shehata

  committed
  b251c6b

• Fix lint

  

  Omar Shehata

  committed
  e879cca

Commits on Sep 20, 2018

• Tweak params

  lilleyse

  committed
  e1005fe

• fix bounding volumes for hemisphere-size GroundPolylineGeometry

  likangning93

  committed
  98f6f5a

• update CHANGES.md

  likangning93

  committed
  0b12d29

• Fix entity show issues

  cleroux

  committed
  07b9130

• Fix entity show issues #7048

  cleroux

  committed
  6552dde

• Revert "Fix entity show issues #7048"

  Show description for 11298d6
  cleroux

  committed
  11298d6

• Add fix for entity show issues #7048

  cleroux

  authored
  7c01bc5

• Update CONTRIBUTORS.md

  cleroux

  authored
  8ffa22f

• Remove underscore from _clippingPlaneOffsetMatrix

  

  Shehata

  committed
  5245643

• Moved clippingPlaneOffset update to tileset

  

  Shehata

  committed
  65a8496

• Merge pull request #7052 from AnalyticalGraphicsInc/fixPolylineOnTerrainBoundingVolume

  Show description for 15eaa73
  

  Hannah

  authored
  15eaa73

• Merge branch 'master' into master

  

  Hannah

  authored
  36bb4ec

• No need to use setter for clippingPlaneOffsetMatrix

  

  Shehata

  committed
  3cc7aa0

• Added breaking change to CHANGES.md

  

  Shehata

  committed
  888e2b2

• Merge pull request #7046 from AnalyticalGraphicsInc/update-tests

  Show description for d5d293f
  bagnell

  authored
  d5d293f

• Merge branch 'master' into atmosphere

  bagnell

  committed
  61cf20e

• Fix sign in doc

  

  Shehata

  committed
  f56c71c

• Fade water effect when zooming.

  bagnell

  committed
  85b08e5

• Fix for when atmosphere is disabled.

  bagnell

  committed
  14e3114

• Add atmosphere lighting example.

  bagnell

  committed
  3636dbb

• Reworded unionClippingRegions

  

  Shehata

  committed
  911a520

Commits on Sep 21, 2018

• More tweaks

  lilleyse

  committed
  5e36c99

• Apply length fix to StaticGeometryPerMaterialBatch

  impactblue573

  committed
  fb423da

• Apply length fix to StaticGroundPolylinePerMaterialBatch

  impactblue573

  committed
  4ad883d

• Update contributors.md

  impactblue573

  committed
  dfe518a

• Merge pull request #7047 from PropellerAero/static-ground-geomtry-per-material-batch-update-fix

  Show description for 1ca5dae
  

  Hannah

  authored
  1ca5dae

• Update CHANGES.md

  

  Hannah

  authored
  db69cb9

• Merge pull request #7053 from cleroux/master

  Show description for 5352b53
  

  Hannah

  authored
  5352b53

• Reset sliders and text box when the reset button is clicked in the atmosphere Sandcastle example.

  bagnell

  committed
  a53cd15

• Fix edge color for union clipping planes

  

  Shehata

  committed
  a43ab57

• Update from review.

  bagnell

  committed
  3fc5808

• Remove input ids.

  bagnell

  committed
  fe410fa

• Fix fog.

  bagnell

  committed
  a623027

• Added terrain union example

  

  Shehata

  committed
  79a49e0

• Merge pull request #7034 from OmarShehata/clipping-planes-matrix-fix

  Show description for b73152b
  lilleyse

  authored
  b73152b

Commits on Sep 24, 2018

• Fix typo in docs

  

  Shehata

  committed
  15814cc

• Update docs and changes a bit

  lilleyse

  committed
  b75d1cf

• Merge pull request #6877 from AnalyticalGraphicsInc/atmosphere

  Show description for 4bd8ae8
  lilleyse

  authored
  4bd8ae8

• Merge pull request #7064 from OmarShehata/fix-doc-typo

  Show description for c448444
  

  Hannah

  authored
  c448444