-
Notifications
You must be signed in to change notification settings - Fork 3.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into fix_alpha_blending
- Loading branch information
Showing
139 changed files
with
2,810 additions
and
1,167 deletions.
There are no files selected for viewing
Binary file not shown.
574 changes: 574 additions & 0 deletions
574
Apps/SampleData/models/DracoCompressed/CesiumMilkTruck.gltf
Large diffs are not rendered by default.
Oops, something went wrong.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Large diffs are not rendered by default.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| (The MIT License) | ||
|
|
||
| Copyright (C) 2014-2017 by Vitaly Puzrin and Andrei Tuputcyn | ||
|
|
||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| of this software and associated documentation files (the "Software"), to deal | ||
| in the Software without restriction, including without limitation the rights | ||
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| copies of the Software, and to permit persons to whom the Software is | ||
| furnished to do so, subject to the following conditions: | ||
|
|
||
| The above copyright notice and this permission notice shall be included in | ||
| all copies or substantial portions of the Software. | ||
|
|
||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| THE SOFTWARE. |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="utf-8"> | ||
| <meta http-equiv="X-UA-Compatible" content="IE=edge"> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no"> | ||
| <meta name="description" content="Change the order in which DataSources draw ground primitives"> | ||
| <meta name="cesium-sandcastle-labels" content="DataSources"> | ||
| <title>Cesium Demo</title> | ||
| <script type="text/javascript" src="../Sandcastle-header.js"></script> | ||
| <script type="text/javascript" src="../../../ThirdParty/requirejs-2.1.20/require.js"></script> | ||
| <script type="text/javascript"> | ||
| if(typeof require === "function") { | ||
| require.config({ | ||
| baseUrl : '../../../Source', | ||
| waitSeconds : 120 | ||
| }); | ||
| } | ||
| </script> | ||
| </head> | ||
| <body class="sandcastle-loading" data-sandcastle-bucket="bucket-requirejs.html"> | ||
| <style> | ||
| @import url(../templates/bucket.css); | ||
| </style> | ||
| <div id="cesiumContainer" class="fullSize"></div> | ||
| <div id="loadingOverlay"><h1>Loading...</h1></div> | ||
| <div id="toolbar"></div> | ||
| <script id="cesium_sandcastle_script"> | ||
| function startup(Cesium) { | ||
| 'use strict'; | ||
| //Sandcastle_Begin | ||
| var czml1 = [{ | ||
| "id" : "document", | ||
| "name" : "CZML Geometries: Rectangle", | ||
| "version" : "1.0" | ||
| }, { | ||
| "rectangle" : { | ||
| "coordinates" : { | ||
| "wsenDegrees" : [-120, 40, -110, 50] | ||
| }, | ||
| "fill" : true, | ||
| "material" : { | ||
| "solidColor" : { | ||
| "color": { | ||
| "rgba" : [255, 0, 0, 255] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, { | ||
| "rectangle" : { | ||
| "coordinates" : { | ||
| "wsenDegrees" : [-110, 40, -100, 50] | ||
| }, | ||
| "fill" : true, | ||
| "material" : { | ||
| "solidColor" : { | ||
| "color": { | ||
| "rgba" : [0, 0, 255, 255] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }]; | ||
|
|
||
| var czml2 = [{ | ||
| "id" : "document", | ||
| "name" : "CZML Geometries: Rectangle", | ||
| "version" : "1.0" | ||
| }, { | ||
| "rectangle" : { | ||
| "coordinates" : { | ||
| "wsenDegrees" : [-120, 45, -110, 55] | ||
| }, | ||
| "fill" : true, | ||
| "material" : { | ||
| "solidColor" : { | ||
| "color": { | ||
| "rgba" : [255, 255, 0, 255] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, { | ||
| "rectangle" : { | ||
| "coordinates" : { | ||
| "wsenDegrees" : [-110, 45, -100, 55] | ||
| }, | ||
| "fill" : true, | ||
| "material" : { | ||
| "solidColor" : { | ||
| "color": { | ||
| "rgba" : [0, 255, 255, 255] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }]; | ||
|
|
||
| var viewer = new Cesium.Viewer('cesiumContainer'); | ||
| var promise1 = Cesium.CzmlDataSource.load(czml1); | ||
| viewer.dataSources.add(promise1); | ||
| var promise2 = Cesium.CzmlDataSource.load(czml2); | ||
| viewer.dataSources.add(promise2); | ||
|
|
||
| Sandcastle.addToolbarButton('Swap', function() { | ||
| Cesium.when.all([promise1, promise2]) | ||
| .then(function(results) { | ||
| var ds1 = results[0]; | ||
| var ds2 = results[1]; | ||
| if (viewer.dataSources.indexOf(ds1) === 0) { | ||
| viewer.dataSources.raise(ds1); | ||
| } else { | ||
| viewer.dataSources.lower(ds1); | ||
| } | ||
| }); | ||
| });//Sandcastle_End | ||
| Sandcastle.finishedLoading(); | ||
| } | ||
| if (typeof Cesium !== "undefined") { | ||
| startup(Cesium); | ||
| } else if (typeof require === "function") { | ||
| require(["Cesium"], startup); | ||
| } | ||
| </script> | ||
| </body> | ||
| </html> |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.