forked from CesiumGS/cesium
-
Notifications
You must be signed in to change notification settings - Fork 0
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 height-reference-warnings
- Loading branch information
Showing
53 changed files
with
3,165 additions
and
956 deletions.
There are no files selected for viewing
This file was deleted.
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,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. | ||
--> |
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,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 | ||
--> |
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,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: |
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,41 @@ | ||
[ | ||
{ | ||
"id": "document", | ||
"version": "1.0", | ||
"clock": { | ||
"interval": "2018-07-19T15:18:00Z/2018-07-19T15:18:30Z", | ||
"currentTime": "2018-07-19T15:18:00Z", | ||
"multiplier": 5, | ||
"range": "LOOP_STOP", | ||
"step": "SYSTEM_CLOCK_MULTIPLIER" | ||
} | ||
}, | ||
{ | ||
"id": "CesiumMilkTruck", | ||
"model": { | ||
"gltf": "models/CesiumMilkTruck/CesiumMilkTruck.glb" | ||
}, | ||
"position": { | ||
"interpolationAlgorithm": "LINEAR", | ||
"forwardExtrapolationType": "HOLD", | ||
"cartesian": [ | ||
"2018-07-19T15:18:00Z", | ||
1216348.1632364073, | ||
-4736348.958775471, | ||
4081284.5528982095, | ||
"2018-07-19T15:18:30Z", | ||
1216369.1229444197, | ||
-4736377.467107148, | ||
4081240.888485707 | ||
] | ||
}, | ||
"orientation": { | ||
"unitQuaternion": [ | ||
0.3084011337938999, | ||
0.3210181022701266, | ||
-0.45850421987074924, | ||
0.7686388857813198 | ||
] | ||
} | ||
} | ||
] |
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,110 @@ | ||
<!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="Clamp a point and label to a model using the sampleHeight function."> | ||
<meta name="cesium-sandcastle-labels" content="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"> | ||
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 viewer = new Cesium.Viewer('cesiumContainer', { | ||
infoBox : false, | ||
selectionIndicator : false, | ||
shadows : true, | ||
shouldAnimate : true | ||
}); | ||
var scene = viewer.scene; | ||
scene.globe.depthTestAgainstTerrain = true; | ||
|
||
if (!scene.sampleHeightSupported) { | ||
console.log('This browser does not support sampleHeight.'); | ||
} | ||
|
||
var longitude = -2.1480545852753163; | ||
var latitude = 0.7688240036937101; | ||
var range = 0.000002; | ||
var duration = 4.0; | ||
|
||
var entity = viewer.entities.add({ | ||
position : Cesium.Cartesian3.fromRadians(longitude, latitude), | ||
model : { | ||
uri : '../../SampleData/models/GroundVehicle/GroundVehicle.glb' | ||
} | ||
}); | ||
|
||
var point = viewer.entities.add({ | ||
position : new Cesium.CallbackProperty(updatePosition, false), | ||
point : { | ||
pixelSize : 10, | ||
color : Cesium.Color.YELLOW, | ||
disableDepthTestDistance : Number.POSITIVE_INFINITY | ||
}, | ||
label : { | ||
show : false, | ||
showBackground : true, | ||
font : '14px monospace', | ||
horizontalOrigin : Cesium.HorizontalOrigin.LEFT, | ||
verticalOrigin : Cesium.VerticalOrigin.BOTTOM, | ||
pixelOffset : new Cesium.Cartesian2(5, 5), | ||
disableDepthTestDistance : Number.POSITIVE_INFINITY | ||
} | ||
}); | ||
|
||
var objectsToExclude = [point]; | ||
var cartographic = new Cesium.Cartographic(); | ||
|
||
function updatePosition(time, result) { | ||
var offset = (time.secondsOfDay % duration) / duration; | ||
cartographic.longitude = longitude - range + offset * range * 2.0; | ||
cartographic.latitude = latitude; | ||
|
||
var height; | ||
if (scene.sampleHeightSupported) { | ||
height = scene.sampleHeight(cartographic, objectsToExclude); | ||
} | ||
|
||
if (Cesium.defined(height)) { | ||
cartographic.height = height; | ||
point.label.text = Math.abs(height).toFixed(2).toString() + ' m'; | ||
point.label.show = true; | ||
} else { | ||
cartographic.height = 0.0; | ||
point.label.show = false; | ||
} | ||
|
||
return Cesium.Cartographic.toCartesian(cartographic, Cesium.Ellipsoid.WGS84, result); | ||
} | ||
viewer.trackedEntity = entity; | ||
//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,82 @@ | ||
<!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="Clamp a model to a 3D Tileset using the clampToHeight function."> | ||
<meta name="cesium-sandcastle-labels" content="Showcases, 3D Tiles"> | ||
<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 viewer = new Cesium.Viewer('cesiumContainer', { | ||
terrainProvider : Cesium.createWorldTerrain() | ||
}); | ||
var scene = viewer.scene; | ||
var clock = viewer.clock; | ||
|
||
var entity; | ||
var positionProperty; | ||
var dataSourcePromise = Cesium.CzmlDataSource.load('../../SampleData/ClampToGround.czml'); | ||
viewer.dataSources.add(dataSourcePromise).then(function(dataSource) { | ||
entity = dataSource.entities.getById('CesiumMilkTruck'); | ||
positionProperty = entity.position; | ||
}); | ||
|
||
var tileset = scene.primitives.add( | ||
new Cesium.Cesium3DTileset({ | ||
url: Cesium.IonResource.fromAssetId(6074) | ||
}) | ||
); | ||
|
||
viewer.camera.setView({ | ||
destination: new Cesium.Cartesian3(1216403.8845586285, -4736357.493351395, 4081299.715698949), | ||
orientation: new Cesium.HeadingPitchRoll(4.2892217081808806, -0.4799070147502502, 6.279789177843313), | ||
endTransform : Cesium.Matrix4.IDENTITY | ||
}); | ||
|
||
if (scene.clampToHeightSupported) { | ||
tileset.initialTilesLoaded.addEventListener(start); | ||
} else { | ||
console.log('This browser does not support clampToHeight.'); | ||
} | ||
|
||
function start() { | ||
clock.shouldAnimate = true; | ||
var objectsToExclude = [entity]; | ||
scene.postRender.addEventListener(function() { | ||
var position = positionProperty.getValue(clock.currentTime); | ||
entity.position = scene.clampToHeight(position, objectsToExclude); | ||
}); | ||
} | ||
//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.
File renamed without changes.
File renamed without changes
Oops, something went wrong.