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 maintain-camera-heading-on-zoom
- Loading branch information
Showing
72 changed files
with
1,777 additions
and
347 deletions.
There are no files selected for viewing
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,46 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <kml xmlns="http://www.opengis.net/kml/2.2" xmlns:gx="http://www.google.com/kml/ext/2.2" xmlns:kml="http://www.opengis.net/kml/2.2" xmlns:atom="http://www.w3.org/2005/Atom"> | ||
| <Document id="Document_65"> | ||
| <name>Eiffel Tower Flyto</name> | ||
| <visibility>1</visibility> | ||
| <open>0</open> | ||
| <Folder id="Folder_66"> | ||
| <name>AutoPlay</name> | ||
| <visibility>1</visibility> | ||
| <open>0</open> | ||
| </Folder> | ||
| <gx:Tour id="Tour_69"> | ||
| <name>eiffel-tower-flyto</name> | ||
| <gx:Playlist> | ||
| <gx:Wait id="Wait_70"> | ||
| <gx:duration>0.2</gx:duration> | ||
| </gx:Wait> | ||
| <gx:FlyTo id="FlyTo_74"> | ||
| <gx:duration>6</gx:duration> | ||
| <LookAt id="LookAt_72"> | ||
| <longitude>2.29448129999356</longitude> | ||
| <latitude>48.8583700998311</latitude> | ||
| <altitude>196.5753973788714</altitude> | ||
| <heading>0.0</heading> | ||
| <tilt>67.0</tilt> | ||
| <range>1500.0</range> | ||
| <gx:altitudeMode>relativeToSeaFloor</gx:altitudeMode> | ||
| </LookAt> | ||
| </gx:FlyTo> | ||
| <gx:Wait id="Wait_75"> | ||
| <gx:duration>4</gx:duration> | ||
| </gx:Wait> | ||
| <gx:FlyTo id="FlyTo_74"> | ||
| <gx:duration>6</gx:duration> | ||
| <Camera> | ||
| <longitude>170.157</longitude> | ||
| <latitude>-43.671</latitude> | ||
| <altitude>9700</altitude> | ||
| <heading>-6.333</heading> | ||
| <tilt>33.5</tilt> | ||
| </Camera> | ||
| </gx:FlyTo> | ||
| </gx:Playlist> | ||
| </gx:Tour> | ||
| </Document> | ||
| </kml> |
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
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,94 @@ | ||
| <!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="Draw the intersection of a volume and a photgrammetry dataset and terrain."> | ||
| <meta name="cesium-sandcastle-labels" content="Tutorials, Showcases"> | ||
| <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 viewer = new Cesium.Viewer('cesiumContainer'); | ||
|
|
||
| var tileset = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({ | ||
| url : 'https://beta.cesium.com/api/assets/1458?access_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIxYmJiNTAxOC1lOTg5LTQzN2EtODg1OC0zMWJjM2IxNGNlYmMiLCJpZCI6NDQsImFzc2V0cyI6WzE0NThdLCJpYXQiOjE0OTkyNjM4MjB9.1WKijRa-ILkmG6utrhDWX6rDgasjD7dZv-G5ZyCmkKg' | ||
| })); | ||
|
|
||
| tileset.readyPromise.then(function() { | ||
| var boundingSphere = tileset.boundingSphere; | ||
| viewer.camera.viewBoundingSphere(boundingSphere, new Cesium.HeadingPitchRange(0.0, -0.5, boundingSphere.radius + 500.0)); | ||
| viewer.camera.lookAtTransform(Cesium.Matrix4.IDENTITY); | ||
| }).otherwise(function(error) { | ||
| throw(error); | ||
| }); | ||
|
|
||
| var cartographics = [new Cesium.Cartographic(-1.3194369277314022, 0.6988062530900625), | ||
| new Cesium.Cartographic(-1.3193955980204217, 0.6988091578771254), | ||
| new Cesium.Cartographic(-1.3193931220959367, 0.698743632490865), | ||
| new Cesium.Cartographic(-1.3194358224045408, 0.6987471965556998)]; | ||
| var rectangle = Cesium.Rectangle.fromCartographicArray(cartographics); | ||
| var rectanglePrimitive = viewer.scene.primitives.add(new Cesium.GroundPrimitive({ | ||
| geometryInstances : new Cesium.GeometryInstance({ | ||
| geometry : new Cesium.RectangleGeometry({ | ||
| rectangle : rectangle | ||
| }), | ||
| attributes: { | ||
| color: Cesium.ColorGeometryInstanceAttribute.fromColor(new Cesium.Color(1.0, 0.0, 0.0, 0.5)) | ||
| } | ||
| }), | ||
| classificationType : Cesium.ClassificationType.BOTH | ||
| })); | ||
|
|
||
| var options = [{ | ||
| text : 'Classify Both', | ||
| onselect : function() { | ||
| if (Cesium.defined(rectanglePrimitive)) { | ||
| rectanglePrimitive.classificationType = Cesium.ClassificationType.BOTH; | ||
| } | ||
| } | ||
| }, { | ||
| text : 'Classify Terrain', | ||
| onselect : function() { | ||
| if (Cesium.defined(rectanglePrimitive)) { | ||
| rectanglePrimitive.classificationType = Cesium.ClassificationType.TERRAIN; | ||
| } | ||
| } | ||
| }, { | ||
| text : 'Classify 3D Tiles', | ||
| onselect : function() { | ||
| if (Cesium.defined(rectanglePrimitive)) { | ||
| rectanglePrimitive.classificationType = Cesium.ClassificationType.CESIUM_3D_TILE; | ||
| } | ||
| } | ||
| }]; | ||
| Sandcastle.addToolbarMenu(options); | ||
| //Sandcastle_End | ||
| Sandcastle.finishedLoading(); | ||
| } | ||
| if (typeof Cesium !== "undefined") { | ||
| startup(Cesium); | ||
| } else if (typeof require === "function") { | ||
| require(["Cesium"], startup); | ||
| } | ||
| </script> | ||
| </body> | ||
| </html> |
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
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,79 @@ | ||
| <!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="A simple KML example."> | ||
| <meta name="cesium-sandcastle-labels" content="Showcases, 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"> | ||
| 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 viewer = new Cesium.Viewer('cesiumContainer'); | ||
| var options = { | ||
| camera : viewer.scene.camera, | ||
| canvas : viewer.scene.canvas | ||
| }; | ||
|
|
||
| var tour = null; | ||
| viewer.dataSources.add( | ||
| Cesium.KmlDataSource.load('../../SampleData/kml/eiffel-tower-flyto.kml', options)) | ||
| .then(function(dataSource) { | ||
| tour = dataSource.kmlTours[0]; | ||
| tour.tourStart.addEventListener(function() { | ||
| console.log('Start tour'); | ||
| }); | ||
| tour.tourEnd.addEventListener(function(terminated) { | ||
| console.log((terminated ? 'Terminate' : 'End') + ' tour'); | ||
| }); | ||
| tour.entryStart.addEventListener(function(entry) { | ||
| console.log('Play ' + entry.type + ' ('+ entry.duration + ')'); | ||
| }); | ||
| tour.entryEnd.addEventListener(function(entry, terminated) { | ||
| console.log((terminated ? 'Terminate' : 'End') + ' ' + entry.type); | ||
| }); | ||
| }); | ||
|
|
||
| Sandcastle.addToolbarButton('Play', function(){ | ||
| tour.play(viewer); | ||
| }); | ||
|
|
||
| Sandcastle.addToolbarButton('Terminate', function(){ | ||
| tour.stop(); | ||
| }); | ||
|
|
||
| Sandcastle.reset = function() { | ||
| viewer.dataSources.removeAll(); | ||
| viewer.clock.clockRange = Cesium.ClockRange.UNBOUNDED; | ||
| viewer.clock.clockStep = Cesium.ClockStep.SYSTEM_CLOCK; | ||
| }; | ||
| //Sandcastle_End | ||
| Sandcastle.finishedLoading(); | ||
| } | ||
| if (typeof Cesium !== "undefined") { | ||
| startup(Cesium); | ||
| } else if (typeof require === "function") { | ||
| require(["Cesium"], startup); | ||
| } | ||
| </script> | ||
| </body> | ||
| </html> |
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.