-
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 pull request #3989 from AnalyticalGraphicsInc/addCzmlEntityTypes
Add Box, Cylinder and Corridor to CZML
- Loading branch information
Showing
13 changed files
with
645 additions
and
96 deletions.
There are no files selected for viewing
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,108 @@ | ||
| <!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="CZML Circles and Ellipses"> | ||
| <meta name="cesium-sandcastle-labels" content="CZML"> | ||
| <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"> | ||
| require.config({ | ||
| baseUrl : '../../../Source', | ||
| waitSeconds : 60 | ||
| }); | ||
| </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 czml = [{ | ||
| "id" : "document", | ||
| "name" : "box", | ||
| "version" : "1.0" | ||
| }, { | ||
| "id" : "shape1", | ||
| "name" : "Blue box", | ||
| "position" : { | ||
| "cartographicDegrees" : [-114.0, 40.0, 300000.0] | ||
| }, | ||
| "box" : { | ||
| "dimensions" : { | ||
| "cartesian": [400000.0, 300000.0, 500000.0] | ||
| }, | ||
| "material" : { | ||
| "solidColor" : { | ||
| "color" : { | ||
| "rgba" : [0, 0, 255, 255] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, { | ||
| "id" : "shape2", | ||
| "name" : "Red box with black outline", | ||
| "position" : { | ||
| "cartographicDegrees" : [-107.0, 40.0, 300000.0] | ||
| }, | ||
| "box" : { | ||
| "dimensions" : { | ||
| "cartesian": [400000.0, 300000.0, 500000.0] | ||
| }, | ||
| "material" : { | ||
| "solidColor" : { | ||
| "color" : { | ||
| "rgba" : [255, 0, 0, 128] | ||
| } | ||
| } | ||
| }, | ||
| "outline" : true, | ||
| "outlineColor" : { | ||
| "rgba" : [0, 0, 0, 255] | ||
| } | ||
| } | ||
| }, { | ||
| "id" : "shape3", | ||
| "name" : "Yellow box outline", | ||
| "position" : { | ||
| "cartographicDegrees" : [-100.0, 40.0, 300000.0] | ||
| }, | ||
| "box" : { | ||
| "dimensions" : { | ||
| "cartesian": [400000.0, 300000.0, 500000.0] | ||
| }, | ||
| "fill" : false, | ||
| "outline" : true, | ||
| "outlineColor" : { | ||
| "rgba" : [255, 255, 0, 255] | ||
| } | ||
| } | ||
| }]; | ||
|
|
||
| var viewer = new Cesium.Viewer('cesiumContainer'); | ||
| var dataSource = Cesium.CzmlDataSource.load(czml); | ||
| viewer.dataSources.add(dataSource); | ||
| viewer.zoomTo(dataSource); | ||
|
|
||
| //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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| <!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="CZML Cones and Cylinders"> | ||
| <meta name="cesium-sandcastle-labels" content="CZML"> | ||
| <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"> | ||
| require.config({ | ||
| baseUrl : '../../../Source', | ||
| waitSeconds : 60 | ||
| }); | ||
| </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 czml = [{ | ||
| "id" : "document", | ||
| "name" : "CZML Geometries: Cones and Cylinders", | ||
| "version" : "1.0" | ||
| }, { | ||
| "id" : "shape1", | ||
| "name" : "Green cylinder with black outline", | ||
| "position" : { | ||
| "cartographicDegrees" : [-100.0, 40.0, 200000.0] | ||
| }, | ||
| "cylinder" : { | ||
| "length" : 400000.0, | ||
| "topRadius" : 200000.0, | ||
| "bottomRadius" : 200000.0, | ||
| "material" : { | ||
| "solidColor" : { | ||
| "color" : { | ||
| "rgba" : [0, 255, 0, 128] | ||
| } | ||
| } | ||
| }, | ||
| "outline" : true, | ||
| "outlineColor" : { | ||
| "rgba" : [0, 0, 0, 255] | ||
| } | ||
| } | ||
| }, { | ||
| "id" : "shape2", | ||
| "name" : "Red cone", | ||
| "position" : { | ||
| "cartographicDegrees" : [-105.0, 40.0, 200000.0] | ||
| }, | ||
| "cylinder" : { | ||
| "length" : 400000.0, | ||
| "topRadius" : 0.0, | ||
| "bottomRadius" : 200000.0, | ||
| "material" : { | ||
| "solidColor" : { | ||
| "color" : { | ||
| "rgba" : [255, 0, 0, 255] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }]; | ||
|
|
||
| var viewer = new Cesium.Viewer('cesiumContainer'); | ||
| var dataSource = Cesium.CzmlDataSource.load(czml); | ||
| viewer.dataSources.add(dataSource); | ||
| viewer.zoomTo(dataSource); | ||
|
|
||
| //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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| <!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="CZML Polyline"> | ||
| <meta name="cesium-sandcastle-labels" content="CZML"> | ||
| <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"> | ||
| require.config({ | ||
| baseUrl : '../../../Source', | ||
| waitSeconds : 60 | ||
| }); | ||
| </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 czml = [{ | ||
| "id" : "document", | ||
| "name" : "CZML Geometries: Polyline", | ||
| "version" : "1.0" | ||
| }, { | ||
| "id" : "redCorridor", | ||
| "name" : "Red corridor on surface with rounded corners and outline", | ||
| "corridor" : { | ||
| "positions" : { | ||
| "cartographicDegrees" : [ | ||
| -100.0, 40.0, 0, | ||
| -105.0, 40.0, 0, | ||
| -105.0, 35.0, 0 | ||
| ] | ||
| }, | ||
| "width" : 200000.0, | ||
| "material" : { | ||
| "solidColor" : { | ||
| "color" : { | ||
| "rgba" : [255, 0, 0, 127] | ||
| } | ||
| } | ||
| }, | ||
| "outline" : true, | ||
| "outlineColor" : { | ||
| "rgba" : [255, 0, 0, 255] | ||
| } | ||
| } | ||
| }, { | ||
| "id" : "greenCorridor", | ||
| "name" : "Green corridor at height with mitered corners", | ||
| "corridor" : { | ||
| "positions" : { | ||
| "cartographicDegrees" : [ | ||
| -90.0, 40.0, 0, | ||
| -95.0, 40.0, 0, | ||
| -95.0, 35.0, 0 | ||
| ] | ||
| }, | ||
| "height" : 100000.0, | ||
| "cornerType" : "MITERED", | ||
| "width" : 200000.0, | ||
| "material" : { | ||
| "solidColor" : { | ||
| "color" : { | ||
| "rgba" : [0, 255, 0, 255] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, { | ||
| "id" : "blueCorridor", | ||
| "name" : "Blue extruded corridor with beveled corners and outline", | ||
| "corridor" : { | ||
| "positions" : { | ||
| "cartographicDegrees" : [ | ||
| -80.0, 40.0, 0, | ||
| -85.0, 40.0, 0, | ||
| -85.0, 35.0, 0 | ||
| ] | ||
| }, | ||
| "height" : 200000.0, | ||
| "extrudedHeight" : 100000.0, | ||
| "width" : 200000.0, | ||
| "cornerType": "BEVELED", | ||
| "material" : { | ||
| "solidColor" : { | ||
| "color" : { | ||
| "rgba" : [0, 0, 255, 255] | ||
| } | ||
| } | ||
| }, | ||
| "outline" : true, | ||
| "outlineColor" : { | ||
| "rgba" : [0, 0, 0, 255] | ||
| } | ||
| } | ||
| }]; | ||
|
|
||
| var viewer = new Cesium.Viewer('cesiumContainer'); | ||
| var dataSource = Cesium.CzmlDataSource.load(czml); | ||
| viewer.dataSources.add(dataSource); | ||
| viewer.zoomTo(dataSource); | ||
|
|
||
| //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.