-
Notifications
You must be signed in to change notification settings - Fork 271
Add VectorTilesRasterOverlay
#1365
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
Merged
Merged
Changes from 18 commits
Commits
Show all changes
37 commits
Select commit
Hold shift + click to select a range
8da5554
First sketches of vector tiles overlay
azrogers 30bbd16
Basic tile selection that doesn't yet work...
azrogers 5f06efd
It works... I think
azrogers 4a94e9e
It's rasterizing something!
azrogers 997680e
Primitive restart support
azrogers c22f0b9
Fix mutex, add tick
azrogers 7be2262
Formatting
azrogers b9f956b
Merge branch 'main' of github.com:CesiumGS/cesium-native into vector-…
azrogers 99da4eb
Remove concurrentqueue
azrogers 9f152d1
Actual test dataset
azrogers 2d158c2
Improved (?) tick behavior
azrogers 537b608
Fix I forgot to commit
azrogers 224f7a5
Add additional constructor to VectorStyle
azrogers 0e0d06a
thenInWorkerThread crashes... not sure why
azrogers 693eecd
Algorithm for finding edge loops for triangulated polygon.
azrogers 94a0b9e
More efficient edge algorithm, still no match for this many polygons
azrogers 8e70bfb
Generate EXT_mesh_polygon
azrogers 2a1446f
Working with EXT_mesh_polygon
azrogers f7ac37d
Fix duplicate variable name
azrogers 03dad83
Use raw pointer instead of intrusive pointer for requestedTiles set
azrogers 11c4120
Reorganize into new library
azrogers 1eac54c
Real test data for polygons, ion vector tiles loading, format
azrogers 01f8d1d
Re-privatize TilesetContentManager, address some review comments
azrogers b7b59db
More review comments
azrogers 2a0e295
Remove unused tick behaviors
azrogers 6225227
Linting and documentation fixes for CI
azrogers b321e08
Merge from main
azrogers 5491182
Fix incorrectly removing CesiumVectorData from Cesium3DTilesSelection…
azrogers ff0b152
Fix CI
azrogers b37dba3
Fix CI again
azrogers 6f71bbf
Linting fixes again...
azrogers 4a4c6da
Add registerAllTileContentTypes
azrogers 23757c6
Use parent content if no renderable children
azrogers 6e0816b
Merge branch 'vector-tiles-overlay' of github.com:CesiumGS/cesium-nat…
azrogers 4f8b75d
Update from review
azrogers 7fd368a
Don't override constructor
azrogers 97d6f37
Merge branch 'main' into vector-tiles-overlay
azrogers 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 hidden or 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
43 changes: 43 additions & 0 deletions
43
Cesium3DTilesSelection/include/Cesium3DTilesSelection/VectorTilesRasterOverlay.h
This file contains hidden or 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,43 @@ | ||
| #include "CesiumVectorData/VectorStyle.h" | ||
|
|
||
| #include <Cesium3DTilesSelection/TilesetContentLoader.h> | ||
| #include <CesiumRasterOverlays/RasterOverlay.h> | ||
|
|
||
| namespace Cesium3DTilesSelection { | ||
| class TilesetContentManager; | ||
|
|
||
| /** | ||
| * @brief A raster overlay made from rasterizing a \ref | ||
| * CesiumVectorData::GeoJsonDocument. | ||
| */ | ||
| class CESIUMRASTEROVERLAYS_API VectorTilesRasterOverlay final | ||
| : public CesiumRasterOverlays::RasterOverlay { | ||
|
|
||
| public: | ||
| /** | ||
| * @brief Creates a new EmbeddedTilesetRasterOverlayTest. | ||
| * | ||
| * @param asyncSystem The async system to use. | ||
| * @param name The user-given name of this polygon layer. | ||
| * @param document The GeoJSON document to use for the overlay. | ||
| * @param vectorOverlayOptions Options to configure this | ||
| * GeoJsonDocumentRasterOverlay. | ||
| * @param overlayOptions Options to use for this RasterOverlay. | ||
| */ | ||
| VectorTilesRasterOverlay( | ||
| const std::string& name, | ||
| const std::string& url, // todo: accept factory instead of url | ||
| const CesiumVectorData::VectorStyle& defaultStyle = {}, | ||
| const CesiumRasterOverlays::RasterOverlayOptions& overlayOptions = {}); | ||
|
|
||
| virtual ~VectorTilesRasterOverlay() override = default; | ||
|
|
||
| virtual CesiumAsync::Future<CreateTileProviderResult> createTileProvider( | ||
| const CesiumRasterOverlays::CreateRasterOverlayTileProviderParameters& | ||
| parameters) const override; | ||
|
|
||
| private: | ||
| std::string _url; | ||
| CesiumVectorData::VectorStyle _defaultStyle; | ||
| }; | ||
| } // namespace Cesium3DTilesSelection |
This file contains hidden or 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 hidden or 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.
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.
Uh oh!
There was an error while loading. Please reload this page.