-
Notifications
You must be signed in to change notification settings - Fork 3.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Z-ordering for ground geometry entities #6362
Merged
Changes from all commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
bd55144
working z-indexing [ci skip]
c970417
sandcastle example
ce145b5
Fix ordering, add to kml
e34d7c5
specs and CHANGES.md
343f3cf
Merge branch 'master' into z-index
a4da7e5
Merge branch 'master' into z-index
85df9ef
zIndex for static and dynamic geometry
423762a
specs
a1636d5
Merge branch 'master' into z-index
e04ab01
fix specs
3f408e4
type check, negative numbers
045a2ea
Merge branch 'master' into z-index
ba34dc8
fix merge
b0a31b7
Merge branch 'master' into z-index
8d7902c
Merge branch 'master' into z-index
e656a8d
fix classification type
30ae474
fix CHANGES.md
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,93 @@ | ||
<!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 a rectangle or extruded rectangle that conforms to the surface of the globe."> | ||
<meta name="cesium-sandcastle-labels" content="Geometries,New in 1.45"> | ||
<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'); | ||
|
||
viewer.entities.add({ | ||
rectangle : { | ||
coordinates : Cesium.Rectangle.fromDegrees(-110.0, 20.0, -100.5, 30.0), | ||
material : Cesium.Color.RED, | ||
zIndex: 1 | ||
} | ||
}); | ||
|
||
viewer.entities.add({ | ||
rectangle : { | ||
coordinates : Cesium.Rectangle.fromDegrees(-112.0, 25.0, -102.5, 35.0), | ||
material : '../images/Cesium_Logo_Color.jpg', | ||
zIndex: 2 | ||
} | ||
}); | ||
|
||
viewer.entities.add({ | ||
rectangle : { | ||
coordinates : Cesium.Rectangle.fromDegrees(-110.0, 31.0, -100.5, 41.0), | ||
material : Cesium.Color.BLUE, | ||
zIndex: 3 | ||
} | ||
}); | ||
|
||
viewer.entities.add({ | ||
rectangle : { | ||
coordinates : Cesium.Rectangle.fromDegrees(-99.5, 20.0, -90.0, 30.0), | ||
material : '../images/Cesium_Logo_Color.jpg', | ||
zIndex: 3 | ||
} | ||
}); | ||
|
||
viewer.entities.add({ | ||
rectangle : { | ||
coordinates : Cesium.Rectangle.fromDegrees(-97.5, 25.0, -88.0, 35.0), | ||
material : Cesium.Color.GREEN, | ||
zIndex: 2 | ||
} | ||
}); | ||
|
||
viewer.entities.add({ | ||
rectangle : { | ||
coordinates : Cesium.Rectangle.fromDegrees(-99.5, 31.0, -90.0, 41.0), | ||
material : Cesium.Color.BLUE, | ||
zIndex: 1 | ||
} | ||
}); | ||
|
||
viewer.zoomTo(viewer.entities); | ||
//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
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
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
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
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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All of the defaults say 0, but there's not actually a default is there? It's just undefined.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
undefined === 0 for zIndex. I
defaultValue(zIndex, 0)
in the geometry updaters