Merge branch 'master' into patch-1

.concierge/config.json

@@ -0,0 +1,4 @@
+{
+    "contributorsUrl": "https://api.github.com/repos/AnalyticalGraphicsInc/cesium/contents/CONTRIBUTORS.md",
+    "maxDaysSinceUpdate": 30
+}

.concierge/templates/pullRequestOpened.hbs

@@ -1,35 +1,44 @@
-{{#if claEnabled}}
-{{#if errorCla}}
-@{{ userName }}, thanks for the pull request!
+{{#if askAboutContributors}}
+Thank you so much for the pull request @{{ userName }}! I noticed this is your first pull request and I wanted to say welcome to the Cesium community!
 
-If this is your first contribution, please send in a [Contributor License Agreement](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTING.md#contributor-license-agreement-cla) (CLA) so that we can review and merge this pull request.
+The [Pull Request Guidelines](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTING.md#pull-request-guidelines) is a handy reference for making sure your PR gets accepted quickly, so make sure to skim that.
 
-:x: Maintainers, there was an error processing the CLA, resolve it to continue CLA checking.
-```
-{{ errorCla }}
-```
+* :x: Missing `CONTRIBUTORS.md` entry.
+    * Please add yourself to the [contributors]({{ contributorsUrl }}) file!
+{{else}}
+Thanks for the pull request @{{ userName }}!
+{{/if}}
+{{#if claEnabled}}
+{{#if errorCla}}
+* :grey_exclamation: There was an error checking the CLA! If this is your first contribution, please send in a [Contributor License Agreement](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTING.md#contributor-license-agreement-cla).
+    * Maintainers, this was the error I ran into while attempting to process the CLA check. Please resolve it to continue CLA checking.
+    ```
+    {{ errorCla }}
+    ```
 {{else}}
 {{#if askForCla}}
-[![Please sign the CLA before we review this PR.](https://img.shields.io/badge/CLA-required-red.svg)](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTING.md#contributor-license-agreement-cla)
-
-Welcome to the Cesium community @{{ userName }}!
-
-Can you please send in a [Contributor License Agreement](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTING.md#contributor-license-agreement-cla) (CLA) so that we can review and merge this pull request?
+* :x: Missing CLA.
+    * Please send in a [Contributor License Agreement](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTING.md#contributor-license-agreement-cla) (CLA) and comment back here to let us know to check this!
 {{else}}
-![Signed CLA is on file.](https://img.shields.io/badge/CLA-signed-brightgreen.svg)
-
-@{{ userName }}, thanks for the pull request! Maintainers, we have a signed CLA from @{{ userName }}, so you can review this at any time.
+* :heavy_check_mark: Signed CLA found.
 {{/if}}
 {{/if}}
-{{else}}
-@{{ userName }}, thanks for the pull request!
 {{/if}}
-
 {{#if askAboutChanges}}
-:warning: I noticed that [CHANGES.md]({{ repository_url }}/blob/master/CHANGES.md) has not been updated. If this change updates the public API in any way, fixes a bug, or makes any non-trivial update, please add a bullet point to `CHANGES.md` and comment on this pull request so we know it was updated. For more info, see the [Pull Request Guidelines]( https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTING.md#pull-request-guidelines).
-
+* :grey_question: [CHANGES.md]({{ repository_url }}/blob/{{ headBranch }}/CHANGES.md) was not updated.
+    * If this change updates the public API in any way, please add a bullet point to `CHANGES.md`.
 {{/if}}
 {{#if askAboutThirdParty}}
-:warning: I noticed that a file in one of our ThirdParty folders (`{{ thirdPartyFolders }}`) has been added or modified. Please verify that it has a section in [LICENSE.md]({{ repository_url }}/blob/master/LICENSE.md) and that its license information is up to date with this new version. Once you do, please confirm by commenting on this pull request.
-
+* :grey_question: Changes to third party files were made.
+    * Looks like a file in one of our ThirdParty folders (`{{ thirdPartyFolders }}`) has been added or modified. Please verify that it has a section in [LICENSE.md]({{ repository_url }}/blob/master/LICENSE.md) and that its license information is up to date with this new version.
+{{/if}}
+{{#if askAboutTests}}
+* :grey_question: Unit tests were not updated.
+    * Make sure you've [updated tests](https://github.com/AnalyticalGraphicsInc/cesium/tree/master/Documentation/Contributors/TestingGuide) to reflect your changes, added tests for any new code, and ran the code coverage tool.
 {{/if}}
+
+Reviewers, don't forget to make sure that:
+
+- [ ] Cesium Viewer works.
+- [ ] Works in 2D/CV.
+- [ ] Works (or fails gracefully) in IE11.

.concierge/templates/signature.hbs

@@ -1,3 +1,4 @@
+
 ---
 
 __I am a bot who helps you make Cesium awesome! [Contributions to my configuration are welcome.](https://github.com/AnalyticalGraphicsInc/cesium/tree/master/.concierge)__

.eslintignore

@@ -8,3 +8,5 @@ Source/ThirdParty/**
 Source/Workers/cesiumWorkerBootstrapper.js
 ThirdParty/**
 Tools/**
+Apps/Sandcastle/jsHintOptions.js
+Apps/Sandcastle/gallery/gallery-index.js

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,28 @@
+---
+name: Report a bug
+about: Let us know so we can fix it!
+---
+
+<!--
+Thanks for helping us improve Cesium! Please describe what the expected behavior is vs what actually happens. 
+
+Creating a Sandcastle example (https://cesiumjs.org/Cesium/Build/Apps/Sandcastle/) that reproduces the issue helps us a lot in tracking down bugs. Paste the link you get from the "Share" button in Sandcastle below.
+--> 
+
+Sandcastle example: 
+
+Browser:
+
+Operating System:
+
+<!-- 
+
+If you can also contribute a fix, we'd absolutely appreciate it! Fixing a bug in Cesium often means fixing a bug for thousands of applications and millions of end users. 
+
+Check out the contributor guide to get started: 
+
+https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTING.md
+
+Just let us know you're working on it and we'd be happy to provide advice and feedback.
+
+-->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,14 @@
+---
+name: Request a feature
+about: New ideas & improvements to Cesium are always welcome.
+---
+
+<!-- 
+Thanks for helping make Cesium better! 
+
+When suggesting an idea, give examples of the intended use case. Features that benefit the wider community are more likely to be prioritized. 
+
+The best way to get your ideas into Cesium is to help us! We love contributions and are always happy to be provide feedback and advice. Check out the contributor guide to get started: 
+
+https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTING.md
+--> 

.github/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,6 @@
+---
+name: Ask a question
+about: Please use the forum (https://groups.google.com/forum/#!forum/cesium-dev) for general questions about using Cesium. 
+---
+
+:exclamation: Please use the [forum](https://groups.google.com/forum/#!forum/cesium-dev) for asking questions about how to use Cesium and best practices. The core Cesium team actively monitors the forum and we love seeing what people are working on! :exclamation:

.travis.yml

@@ -2,6 +2,9 @@ language: node_js
 node_js:
   - "8"
 sudo: false
+addons:
+  chrome: stable
+  firefox: latest
 before_script:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
@@ -17,7 +20,7 @@ script:
 
   - echo 'test webgl-stub' && echo -en 'travis_fold:start:script.test\\r'
   - npm run build
-  - npm run test -- --browsers Electron --webgl-stub --failTaskOnError --suppressPassed
+  - npm run test -- --browsers FirefoxHeadless --webgl-stub --failTaskOnError --suppressPassed
   - echo -en 'travis_fold:end:script.test\\r'
 
   - echo 'makeZipFile' && echo -en 'travis_fold:start:script.makeZipFile\\r'
@@ -36,7 +39,7 @@ script:
   - echo -en 'travis_fold:end:script.deploy\\r'
 
   - echo 'test webgl-stub release' && echo -en 'travis_fold:start:script test.release\\r'
-  - npm run test -- --browsers Electron --failTaskOnError --webgl-stub --release --suppressPassed
+  - npm run test -- --browsers ChromeCI --failTaskOnError --webgl-stub --release --suppressPassed
   - echo -en 'travis_fold:end:script test.release\\r'
 
   - echo 'test node' && echo -en 'travis_fold:start:script test.node\\r'

.vscode/settings.json

@@ -6,21 +6,19 @@
         "**/Thumbs.db": true,
         ".idea": true,
         ".metadata": true,
-        "Build": true,
-        "Instrumented": true,
-        "node_modules": true,
         ".settings": true,
         ".externalToolBuilders": true,
         ".project": true,
-        "launches": true,
-        "Cesium-*.zip": true,
-        "cesium-*.tgz": true,
-        "Apps/Sandcastle/jsHintOptions.js": true,
-        "Apps/Sandcastle/gallery/gallery-index.js": true,
-        "Source/Cesium.js": true,
-        "Source/Shaders/**/*.js": true,
-        "Specs/SpecList.js": true,
-        "npm-debug.log": true
+        "launches": true
+    },
+    "search.exclude": {
+        "Build": true,
+        "Instrumented": true,
+        "node_modules": true,
+        "Source/Shaders/**/*.js": true
+    },
+    "files.associations": {
+        "*.czml": "json"
     },
     "files.trimTrailingWhitespace": true,
     "files.insertFinalNewline": true,

Specs/Data/Cesium3DTiles/Batched/BatchedWithQuantization/tileset.json → Apps/SampleData/Cesium3DTiles/Batched/BatchedColors/tileset.json

@@ -8,16 +8,16 @@
       "maximum": 9
     },
     "Longitude": {
-      "minimum": -1.3196972173766555,
-      "maximum": -1.3196718547473905
+      "minimum": -1.3196959060375169,
+      "maximum": -1.3196607462778132
     },
     "Latitude": {
-      "minimum": 0.6988624606923348,
-      "maximum": 0.6988888301460953
+      "minimum": 0.6988590050687061,
+      "maximum": 0.6988864387845588
     },
     "Height": {
-      "minimum": 6.2074098233133554,
-      "maximum": 12.83180232718587
+      "minimum": 6.1022464875131845,
+      "maximum": 13.410263679921627
     }
   },
   "geometricError": 70,
@@ -35,7 +35,7 @@
     },
     "geometricError": 0,
     "content": {
-      "url": "batchedWithQuantization.b3dm"
+      "uri": "batchedColors.b3dm"
     }
   }
 }

Specs/Data/Cesium3DTiles/Batched/BatchedCompressedTextures/tileset.json → Apps/SampleData/Cesium3DTiles/Batched/BatchedTranslucent/tileset.json

@@ -8,16 +8,16 @@
       "maximum": 9
     },
     "Longitude": {
-      "minimum": -1.3196972173766555,
-      "maximum": -1.3196718547473905
+      "minimum": -1.3196959060375169,
+      "maximum": -1.3196607462778132
     },
     "Latitude": {
-      "minimum": 0.6988624606923348,
-      "maximum": 0.6988888301460953
+      "minimum": 0.6988590050687061,
+      "maximum": 0.6988864387845588
     },
     "Height": {
-      "minimum": 6.2074098233133554,
-      "maximum": 12.83180232718587
+      "minimum": 6.1022464875131845,
+      "maximum": 13.410263679921627
     }
   },
   "geometricError": 70,
@@ -35,7 +35,7 @@
     },
     "geometricError": 0,
     "content": {
-      "url": "batchedCompressedTextures.b3dm"
+      "uri": "batchedTranslucent.b3dm"
     }
   }
 }

Specs/Data/Cesium3DTiles/Batched/BatchedWithKHRMaterialsCommon/tileset.json → Apps/SampleData/Cesium3DTiles/Batched/BatchedTranslucentOpaqueMix/tileset.json

@@ -8,16 +8,16 @@
       "maximum": 9
     },
     "Longitude": {
-      "minimum": -1.3196972173766555,
-      "maximum": -1.3196718547473905
+      "minimum": -1.3196959060375169,
+      "maximum": -1.3196607462778132
     },
     "Latitude": {
-      "minimum": 0.6988624606923348,
-      "maximum": 0.6988888301460953
+      "minimum": 0.6988590050687061,
+      "maximum": 0.6988864387845588
     },
     "Height": {
-      "minimum": 6.2074098233133554,
-      "maximum": 12.83180232718587
+      "minimum": 6.1022464875131845,
+      "maximum": 13.410263679921627
     }
   },
   "geometricError": 70,
@@ -35,7 +35,7 @@
     },
     "geometricError": 0,
     "content": {
-      "url": "batchedWithKHRMaterialsCommon.b3dm"
+      "uri": "batchedTranslucentOpaqueMix.b3dm"
     }
   }
 }

Specs/Data/Cesium3DTiles/Batched/BatchedGltfZUp/tileset.json → Apps/SampleData/Cesium3DTiles/Batched/BatchedWithBatchTable/tileset.json

@@ -1,24 +1,23 @@
 {
   "asset": {
-    "version": "1.0",
-    "gltfUpAxis": "Z"
+    "version": "1.0"
   },
   "properties": {
     "id": {
       "minimum": 0,
       "maximum": 9
     },
     "Longitude": {
-      "minimum": -1.3196972173766555,
-      "maximum": -1.3196718547473905
+      "minimum": -1.3196959060375169,
+      "maximum": -1.3196607462778132
     },
     "Latitude": {
-      "minimum": 0.6988624606923348,
-      "maximum": 0.6988888301460953
+      "minimum": 0.6988590050687061,
+      "maximum": 0.6988864387845588
     },
     "Height": {
-      "minimum": 6.2074098233133554,
-      "maximum": 12.83180232718587
+      "minimum": 6.1022464875131845,
+      "maximum": 13.410263679921627
     }
   },
   "geometricError": 70,
@@ -36,7 +35,7 @@
     },
     "geometricError": 0,
     "content": {
-      "url": "batchedGltfZUp.b3dm"
+      "uri": "batchedWithBatchTable.b3dm"
     }
   }
 }

Apps/SampleData/Cesium3DTiles/Classification/Photogrammetry/tileset.json

@@ -0,0 +1,31 @@
+{
+    "asset": {
+        "version": "1.0",
+        "tilesetVersion": "1.0"
+    },
+    "properties": {
+        "Longitude": {
+            "minimum": -1.3194245623155147,
+            "maximum": -1.3194092552469474
+        },
+        "Latitude": {
+            "minimum": 0.6988049305192636,
+            "maximum": 0.6988185175658763
+        },
+        "Height": {
+            "minimum": 73.0000006258161,
+            "maximum": 102.999890661765747
+        }
+    },
+    "geometricError": 1000.0,
+    "root": {
+        "boundingVolume": {
+            "region": [-1.3194315762936881, 0.6987998244450816, -1.3194015908860113, 0.6988235397748883, 73.0000006258161, 102.999890661765747]
+        },
+        "geometricError": 0,
+        "refine": "ADD",
+        "content": {
+            "uri": "content.b3dm"
+        }
+    }
+}