5c19574166
Hide the implementation details of our implementation details.
2021-12-03 23:28:29 +11:00
b292342a4d
Move loading operations out of Tileset.cpp.
2021-12-03 23:12:33 +11:00
2cdcb92e20
Namespace cleanup
2021-12-02 18:34:22 -05:00
5cd3d3db09
Merge branch 'main' into debug-overlay
2021-11-29 11:11:05 -05:00
67e73c6a3d
Merge pull request #398 from CesiumGS/mac-test-failures
...
Fix macOS test failures.
2021-11-29 11:03:44 -05:00
55c12d0861
add support for transcoding to more formats
2021-11-27 17:53:27 -05:00
5f424295f1
running into strange deletion problem
2021-11-24 19:45:21 -05:00
c3916567b6
Fix clang warning.
2021-11-23 23:10:57 +11:00
c77eba0fd9
Eliminate errors with empty primitives.
2021-11-23 22:16:27 +11:00
abda4f02e0
Merge remote-tracking branch 'origin/main' into bad-upsample-tex-coords
2021-11-23 21:41:30 +11:00
9311d04bd0
Clean up includes.
2021-11-23 21:12:06 +11:00
096701fa17
More cleanup.
2021-11-23 21:09:45 +11:00
fe7b82bdd6
Merge remote-tracking branch 'origin/main' into implicit-s2
2021-11-23 20:34:50 +11:00
2d5538ab5a
Fix clang warnings.
2021-11-23 17:10:22 +11:00
2f0c6cc5ad
Use better impl for computeBoundingRegion, too.
2021-11-23 16:48:17 +11:00
3707b402bd
Much more accurate subdivision for raster overlays.
2021-11-23 16:38:44 +11:00
787dfec106
Add GlobeRectangle::expandToIncludePosition, improve stability.
2021-11-22 23:20:45 +11:00
a3da758200
Partial fix for broken upsampling with raster overlays.
2021-11-19 22:34:44 +11:00
2456b81d64
Formatting.
2021-11-18 22:31:19 +11:00
c43bfcb3a7
Small tweaks from review.
2021-11-18 22:05:59 +11:00
7456f06e59
Fix macOS test failures.
2021-11-17 23:20:21 -05:00
4587f49618
Merge branch 'implicit-tiling' into implicit-s2
2021-11-17 11:25:18 -05:00
dddf9c1cee
clarify logic in addTileToLoadQueue
2021-11-17 11:22:44 -05:00
1ec0fbe625
fix nullptr context crash, recombine loadContent and continueLoading
2021-11-17 09:43:43 -05:00
b68d3bfdf4
fix bug from merge
2021-11-17 02:40:52 -05:00
59f15a35c8
Merge branch 'implicit-tiling' into implicit-s2
2021-11-17 01:57:02 -05:00
a8582e0989
QuadtreeAvailability and OctreeAvailability classes don't need tiling scheme
2021-11-17 01:54:47 -05:00
a7765dfbc0
Merge branch 'implicit-tiling' into implicit-s2
2021-11-17 01:41:39 -05:00
1ac74f4504
Only load available content, add clear pre/post conditions for loadContent
...
I think the Tile loading state space is slightly clearer now for cases where
content is unavailable, including in implicit tilesets.
2021-11-17 01:26:04 -05:00
18c55e732d
use const references for ImplicitTraversalInfo
2021-11-16 20:43:04 -05:00
cb5ca8b8c5
remove needless move semantics on ImplicitTraversalInfo
2021-11-16 14:59:45 -05:00
592cd2ae96
re-add accidentally deleted comment
2021-11-16 14:33:02 -05:00
7d7e0d7503
don't create subtree node until loading begins
2021-11-16 12:18:59 -05:00
2251b5e7f1
format
2021-11-16 07:56:11 -05:00
968285d5cb
Update Cesium3DTilesSelection/include/Cesium3DTilesSelection/TileContentLoadResult.h
...
Co-authored-by: Kevin Ring <kevin@kotachrome.com>
2021-11-16 07:36:00 -05:00
58a8745203
Update Cesium3DTilesSelection/include/Cesium3DTilesSelection/TileContext.h
...
Co-authored-by: Kevin Ring <kevin@kotachrome.com>
2021-11-16 07:35:37 -05:00
40eb126f89
Update Cesium3DTilesSelection/include/Cesium3DTilesSelection/TileContentLoadResult.h
...
Co-authored-by: Kevin Ring <kevin@kotachrome.com>
2021-11-16 07:35:23 -05:00
e5e5b08964
Update Cesium3DTilesSelection/include/Cesium3DTilesSelection/ImplicitTraversal.h
...
Co-authored-by: Kevin Ring <kevin@kotachrome.com>
2021-11-16 07:35:10 -05:00
65eab0cd53
Update Cesium3DTilesSelection/include/Cesium3DTilesSelection/ImplicitTraversal.h
...
Co-authored-by: Kevin Ring <kevin@kotachrome.com>
2021-11-16 07:35:05 -05:00
78fa9285ca
Update Cesium3DTilesSelection/include/Cesium3DTilesSelection/ImplicitTraversal.h
...
Co-authored-by: Kevin Ring <kevin@kotachrome.com>
2021-11-16 07:34:58 -05:00
e5ab167a25
Update Cesium3DTilesSelection/include/Cesium3DTilesSelection/ImplicitTraversal.h
...
Co-authored-by: Kevin Ring <kevin@kotachrome.com>
2021-11-16 07:34:50 -05:00
6892d1732e
fix comment
2021-11-16 00:07:58 -05:00
17de12244f
Add DebugColorizeTilesRasterOverlay.
2021-11-16 16:04:28 +11:00
b5f73c77af
Only attempt to create implicit children when ContentLoaded AND subtree is loaded
...
Waits to push a tile to Done if it's waiting on a subtree load
2021-11-15 23:25:42 -05:00
c9ae1b7abb
better fix for premature refinement of dummy implicit root
2021-11-15 22:35:02 -05:00
266ac9c1c9
implicit dummy root should not have implicit context + premature refinement fix
2021-11-15 21:43:44 -05:00
e8ec218780
add error catch to loadSubtree and add max subtree loads to TilesetOptions
2021-11-15 16:30:30 -05:00
5cc2be937d
Fix subtree vs content loading race condition
...
Also avoids creating fake upsampled children before subtree is loaded, so we
know there are no _actual_ children.
2021-11-15 15:10:22 -05:00
6c8fba498c
format
2021-11-13 20:32:03 -05:00
368d52ad5c
attempt to fix merge issues, still broken
2021-11-13 19:48:38 -05:00
ee5b04041e
Merge branch 'main' into implicit-tiling
2021-11-13 12:51:16 -05:00
a4b6822ffe
specialize estimateGlobeRectangle for S2CellBoundingVolume
2021-11-12 15:34:53 -05:00
5868f553b3
Merge branch 'main' into overlays-on-3dtiles
2021-11-12 15:21:01 -05:00
de1b237a25
Target C++11 for s2geometry.
...
Apparently it doesn't build when targeting C++17 with Visual Studio.
2021-11-12 20:30:25 +11:00
5111f277a9
Merge branch 'implicit-tiling' into implicit-s2
2021-11-11 20:59:51 -05:00
e54e087674
Merge branch 'external-buffers-images2' into implicit-tiling
2021-11-11 20:43:28 -05:00
8029489dbd
Merge branch 'main' into external-buffers-images2
2021-11-11 20:31:23 -05:00
de378a04a0
format
2021-11-11 18:58:09 -05:00
44801c74f2
Fix possible use-after-free.
2021-11-11 18:47:44 -05:00
4b6f706453
add some logging for failed external buffer loads
2021-11-11 18:47:44 -05:00
52f70e2d80
remove unused variable
2021-11-11 18:47:44 -05:00
f7f7faed80
fix b3dm tests
2021-11-11 18:43:55 -05:00
576dce4514
format
2021-11-11 18:42:08 -05:00
990c432c77
WIP external textures/buffers
2021-11-11 16:47:09 -05:00
3aff3bd80d
Fix compiler errors.
2021-11-10 13:36:04 +11:00
29778d6648
Merge remote-tracking branch 'origin/main' into overlays-on-3dtiles
2021-11-10 13:29:30 +11:00
56d354e65b
Don't try to load the template URI as real content.
2021-11-09 18:30:22 +11:00
f22a9c0f18
missed merge conflict
2021-11-08 21:56:07 -05:00
d53a63b2fa
Merge remote-tracking branch 'origin/main' into s2
2021-11-09 13:36:30 +11:00
58a2941f3d
Merge branch 'external-buffers-images' into implicit-s2
2021-11-08 20:45:15 -05:00
a3cb3c4e2c
attempt to integrate implicit tiling with s2
2021-11-08 20:44:36 -05:00
5378fa0498
Merge remote-tracking branch 'origin/main' into external-buffers-images
2021-11-09 12:40:22 +11:00
83c01885b2
Fix xcode 12 error.
2021-11-09 09:20:43 +11:00
40ad113a86
Merge remote-tracking branch 'origin/s2' into implicit-s2
2021-11-08 11:50:45 -05:00
1aa0e4b492
add some logging for failed external buffer loads
2021-11-08 10:52:45 -05:00
ae7889a24b
Merge branch 'implicit-tiling' into external-buffers-images
2021-11-08 10:23:29 -05:00
642ea83af0
factored out loaded content parsing into separate helper function
...
Also factored out implicit tileset json parsing into a helper function
2021-11-08 10:19:30 -05:00
71faadd617
Add a test, fix two bugs.
2021-11-08 23:40:22 +11:00
d8d48911dc
Merge branch 'implicit-tiling' into external-buffers-images
2021-11-08 00:01:12 -05:00
65fa93edc2
fix gcc warning (attempt 2)
2021-11-07 23:50:55 -05:00
4139eba5da
fix gcc warning?
2021-11-07 23:32:46 -05:00
6ca9a60c14
Cleaned up Tileset.cpp, moved implicit traversal into helper file
...
The logic is much less tangled now, but still could use some improvement
2021-11-07 23:09:50 -05:00
64dbee1b36
Parse 3DTILES_bounding_volume_S2 extension.
2021-11-05 16:56:55 +11:00
d2f0cf33fa
Merge remote-tracking branch 'origin/main' into s2
2021-11-05 16:34:49 +11:00
134db78716
Merge branch 'main' into implicit-tiling
2021-11-04 21:47:30 -04:00
67f8ba022e
unnecessary semicolon
2021-11-04 17:31:32 -04:00
f907b15185
fix subtree issue
2021-11-04 17:00:00 -04:00
735f31671f
fixed CWT and tests, yemen seems to be working, other test dataset doesn't
2021-11-04 15:28:50 -04:00
92f0d71b51
WIP support for S2 bounding volumes.
2021-11-04 23:58:58 +11:00
c234ceb735
Continue refactoring subtree loading logic into tile traversal
...
everything is broken
2021-11-04 00:37:24 -04:00
4aaafb890a
Merge pull request #380 from CesiumGS/glmUpdate
...
Added stricter GLM defines
2021-11-04 10:34:24 +11:00
854ad62328
fix Tileset destructor hanging?
2021-11-03 11:23:37 -04:00
7507eed83b
Fix xcode 12 error.
2021-11-03 22:40:13 +11:00
76ad622ab6
Fix compile error in release builds.
2021-11-03 20:47:38 +11:00
8b47d63ea3
Pass through RasterOverlayOptions.
2021-11-03 18:46:03 +11:00
ec30b81c58
Merge branch 'implicit-tiling' into external-buffers-images
2021-11-03 00:48:49 -04:00
6dc7a7b787
add faster way to insert new child subtree
2021-11-03 00:46:48 -04:00
0c4a8fb3d5
Fix incorrect texture coordinates for upsampled tiles.
2021-11-03 10:56:04 +11:00
e6e4900af5
remove unused variable
2021-11-02 11:49:38 -04:00
258f78150b
Add assertion, update CHANGES.md.
2021-11-02 20:37:12 +11:00
f26e158730
Merge branch 'implicit-tiling' into external-buffers-images
2021-11-02 04:44:30 -04:00
b311d44d6b
WIP move subtree loading to Tileset.cpp
2021-11-02 04:43:12 -04:00
9b9b3c2cb5
Doc, cleanup.
2021-11-02 18:36:42 +11:00
a56ab97f1f
Make applyRtcCenter and applyGltfUpAxisTransform public.
2021-11-02 18:19:45 +11:00
c8408daad5
Remove unused method.
2021-11-02 18:01:50 +11:00
6f05416289
getGlobeRectangle->estimateGlobeRectangle, some doc improvements.
2021-11-02 17:51:17 +11:00
593ce37c5c
fix subtree content loader bugs
2021-11-01 20:22:53 -04:00
1072e055c4
Merge remote-tracking branch 'origin/main' into overlays-on-3dtiles
2021-11-02 10:40:25 +11:00
944e85f9d5
added new GLM defines
2021-11-01 10:29:11 -04:00
056ecffb77
Merge branch 'implicit-tiling' into external-buffers-images
2021-10-31 23:36:34 -04:00
fb8c599673
Merge branch 'main' into implicit-tiling
2021-10-31 23:27:42 -04:00
93f22a39bf
Merge branch 'main' into invalid-iterator
2021-11-01 11:02:26 +11:00
5b7ee59a1f
Return the correct value.
2021-11-01 09:27:40 +11:00
b54df83e24
Fix use of potentially invalidated iterator.
2021-11-01 09:23:54 +11:00
29d3c8a889
Fix clang warning.
2021-11-01 09:15:52 +11:00
9acc5ac71a
Rename Primitive back to MeshPrimitive
2021-10-30 14:56:43 -04:00
6fd48d8735
Use different naming convention for extension classes
2021-10-30 14:55:40 -04:00
f1b4942a20
Always compute fitting heights, more efficient tex coord gen
2021-10-29 23:14:10 +11:00
0d692c7c44
Doc, minor cleanup.
2021-10-28 12:35:55 +11:00
adac02c1ec
Move getCoverageRectangle to base class, quick discard tiles outside it.
2021-10-28 11:28:10 +11:00
36e9ab3352
Fix clang warning.
2021-10-28 10:40:41 +11:00
c5c0ac413d
format
2021-10-26 19:22:16 -04:00
35273e179a
Merge remote-tracking branch 'origin/implicit-tiling' into external-buffers-images
2021-10-26 18:34:56 -04:00
6c12c66848
renamed AvailabilityTree -> Availability
2021-10-26 14:49:35 -04:00
47935f824d
fix AvailabilityAccessor, gcc/clang tests should pass now
2021-10-26 11:50:59 -04:00
3bb94c1d99
Copy transform to upsampled children.
2021-10-26 22:27:32 +11:00
3b2767023a
Formatting.
2021-10-26 18:44:12 +11:00
c14d6844e4
Upsampling for non-implicit, non-region tiles.
2021-10-26 18:43:45 +11:00
7fdd9afbb5
Merge branch 'main' into implicit-tiling
2021-10-25 16:18:31 -04:00
3061fb878d
Fix clang/gcc warnings.
2021-10-25 23:07:15 +11:00
c3261c6476
Rasterize polygons to an ideal-sized texture.
2021-10-25 22:42:18 +11:00
7dda0a0ffc
Make sure iterator isn't invalidated before it's used.
2021-10-25 18:48:52 +11:00
4e57a5b7af
Use content bounding volume for tex coords if available.
2021-10-25 18:48:28 +11:00
a8f5d0db17
Don't require that parent overlay fully covers child to use it.
...
The immediate problem is that the implementation would falsely flag some
parent tiles as not fully covering children, and so we'd end up
rendering untextured grey areas on the globe.
But the bigger reason is because even a parent texture that doesn't fully
cover the child is probably a better to use than the ancestor tile (or
nothing at all). The texture will just be stretched to the edges.
2021-10-25 16:19:26 +11:00
9861923ad9
Configurable SSE, doc, minor cleanup.
2021-10-22 23:27:22 +11:00
211463ab7c
Fix test failures.
2021-10-22 15:27:28 +11:00
0cd2edc07d
Fix some Clang warnings.
2021-10-22 14:26:18 +11:00
c236642833
Don't use parent textures that don't cover the child tile.
2021-10-22 13:22:04 +11:00
c8c228d332
Merge remote-tracking branch 'origin/main' into overlays-on-3dtiles
2021-10-22 12:39:17 +11:00
1d1b168dea
fix b3dm tests
2021-10-21 18:30:36 -04:00
be39b1b077
format
2021-10-21 18:30:08 -04:00
43def1adab
WIP external textures/buffers
2021-10-21 18:28:09 -04:00
86ace9b3a9
Revert "WIP external textures/buffers"
...
This reverts commit 983de7dfff
2021-10-21 18:24:06 -04:00
48f32ba839
Revert "format"
...
This reverts commit 658cf95ca3
2021-10-21 18:23:49 -04:00
77e198a4ea
Revert "fix b3dm tests"
...
This reverts commit 7c3e8744f5
2021-10-21 18:22:45 -04:00
7c3e8744f5
fix b3dm tests
2021-10-21 13:28:30 -04:00
658cf95ca3
format
2021-10-21 10:48:33 -04:00
983de7dfff
WIP external textures/buffers
2021-10-21 10:27:49 -04:00
9e9cb99fc4
Use bounding region even if it has loose fitting heights.
2021-10-21 21:18:24 +11:00
38dc6009c6
cleaner handling of new contexts from external tileset parsing
2021-10-20 10:25:14 -04:00
1b1dbdb742
Select raster LOD with target screen pixels instead of geometric error.
2021-10-20 21:58:26 +11:00
9692b7eaeb
hack for external + implicit tilesets, needs to be redone
2021-10-19 09:15:38 -04:00
06fd62b6a8
Better handling of geometric error for leaf tiles.
2021-10-19 23:38:41 +11:00
a79cfe8e86
Only try to use raster overlays if we have a Model.
...
This prevents external tilesets from being reloaded repeatedly.
2021-10-19 21:18:18 +11:00
775a18b04d
Load overlays immediately when possible, some refactoring.
2021-10-19 15:39:22 +11:00
f9b48fbe0e
Renegerate glTF classes
2021-10-18 18:46:58 -04:00
4350e5f8c5
Pretty good raster overlays on 3D Tiles.
2021-10-15 12:28:34 +11:00
0e6592975a
fix test
2021-10-13 15:11:16 -04:00
27687137c7
another gcc/clang warning, almost passing CI?
2021-10-13 14:59:30 -04:00
2682aad718
gcc/clang warnings
2021-10-13 12:30:57 -04:00
eb78ce599b
Expose a SharedFuture for RasterOverlayTileProvider creation.
2021-10-13 22:56:47 +11:00
9ad4b15e49
Merge remote-tracking branch 'origin/main' into overlays-on-3dtiles
2021-10-13 18:29:51 +11:00
52283f3359
Fix includes
2021-10-11 17:28:44 -04:00
1cbb2f4cc9
hook up OctreeAvailability into implicit tiling
2021-10-11 14:41:58 -04:00
ac2db1a119
add OctreeAvailability
2021-10-11 13:52:01 -04:00
c38b7ed034
Formatting.
2021-10-11 15:52:26 +11:00
c85f9dc0e9
Merge remote-tracking branch 'origin/main' into overlays-on-3dtiles
2021-10-11 15:42:55 +11:00
03c0e1da97
better names for availability classes?
2021-10-09 15:49:09 -04:00
b94106ede2
pass on refinement mode to implicit children
2021-10-09 15:12:10 -04:00
c74ddb9f31
small fixes, simple implicit quadtree tileset almost working
2021-10-08 20:52:32 -04:00
8724a676e8
small fixes, fix test
2021-10-06 20:34:15 -04:00
a3a9177c96
Availability accessors, Generalized some availability functionality
...
Tried too hook up the subtree content parsing back into the availability tree.
Close to being able to test on a basic tileset.
2021-10-06 16:12:02 -04:00
b8f21fa85f
subtree file parsing, some more adjustment to subtree representation
...
lots of async nonsense
2021-10-06 03:54:47 -04:00
70d31d64fb
implicit tileset parsing, some rearrangement/fixes in quadtreeSubtreeAvailability
2021-10-05 17:23:10 -04:00
07eb06718a
format
2021-10-05 01:22:32 -04:00
b577556e11
fixed issues from merge, added subtree requests
2021-10-05 01:19:52 -04:00
c05591858e
Merge branch 'main' into implicit-tiling
2021-10-05 00:23:28 -04:00
be91170625
return more availability info from a single tile availability query
2021-10-04 23:51:48 -04:00
fb2e0374d0
started hooking up quadtree subtree availability
...
compiling again now, regular quantized mesh working again
2021-10-03 20:55:27 -04:00
a139035a60
finished(?) QuadtreeSubtreeAvailability, everything else still WIP
2021-10-02 21:02:58 -04:00
1eb4caad97
Allow this special status code of 0.
...
This one took several hours of debugging.
2021-10-01 20:31:53 +02:00
9695bf4e9c
Merge pull request #349 from CesiumGS/include-style-fixes
...
Include style fixes, part 0
2021-09-30 22:46:25 +10:00
e171dadb6a
tiling schemes look correct now and some upgrades in Tile.cpp, availability next
2021-09-29 17:12:59 -04:00
9855400417
Use proper relative paths in all public headers
2021-09-28 17:23:07 +02:00
50a52ed084
Formatting - WIP
...
Noticed a wrong include order, to be fixed with next commits.
2021-09-28 14:47:55 +02:00
27fdd26e27
Merge remote-tracking branch 'origin/main' into include-style-fixes
...
# Conflicts:
# Cesium3DTilesSelection/include/Cesium3DTilesSelection/GltfContent.h
# Cesium3DTilesSelection/src/Batched3DModelContent.cpp
# Cesium3DTilesSelection/src/CompositeContent.cpp
# Cesium3DTilesSelection/src/ExternalTilesetContent.cpp
# Cesium3DTilesSelection/src/GltfContent.cpp
# Cesium3DTilesSelection/src/QuantizedMeshContent.cpp
# Cesium3DTilesSelection/src/Tile.cpp
# Cesium3DTilesSelection/src/TileContentFactory.cpp
# Cesium3DTilesSelection/src/calcQuadtreeMaxGeometricError.h
2021-09-28 14:38:33 +02:00
90a7369406
Don't ignore RTC_CENTER when it has an integer coordinate value.
2021-09-28 16:26:43 +10:00
0e827f7afd
Updated includes based on clang-format with Regroup
...
This MAINLY inserted some blank lines between
the blocks.
2021-09-26 17:46:27 +02:00
270a709ca3
Merge remote-tracking branch 'origin/main' into fix-vs-warnings
2021-09-24 17:35:10 +10:00
acb2294342
Merge remote-tracking branch 'origin/main' into async-tile-load
2021-09-24 17:09:25 +10:00
4e13dfaa2d
Doc tweak, remove unused headers.
2021-09-24 17:09:09 +10:00
1a46a22222
format
2021-09-22 00:24:53 -04:00
73b0945f66
move loadInput into lambda capture
2021-09-22 00:14:03 -04:00
4042d0b263
address review comments
2021-09-21 13:00:06 -04:00
82e18454b1
Remove const from rvalue reference parameters
2021-09-21 00:06:44 +02:00
fa7f1fd9cf
Fixed include path based on review comment
2021-09-20 23:51:29 +02:00
8e1637c7dc
Added include wrapper for tinyxml2
...
Similar to the existing spdlog one
2021-09-19 15:58:41 +02:00
01cf10590c
Formatting
2021-09-19 15:43:55 +02:00
281e527056
Include style fixes for Cesium3DTilesSelection, part 2
2021-09-19 15:12:26 +02:00
fa09b16727
Include style fixes for Cesium3DTilesSelection
2021-09-19 15:05:40 +02:00
27de1ccf82
Update for resolved merge conflict
2021-09-17 21:26:17 +02:00
bb48dd1c86
Merge remote-tracking branch 'origin/main' into fix-vs-warnings
...
# Conflicts:
# Cesium3DTilesSelection/src/Tileset.cpp
2021-09-17 21:25:48 +02:00
7586c10a4a
Use helper for underlying_type, from review suggestion
...
Co-authored-by: Kevin Ring <kevin@kotachrome.com>
2021-09-17 21:19:29 +02:00
3bd88050ee
Use rvalue, based on review comment
...
Co-authored-by: Kevin Ring <kevin@kotachrome.com>
2021-09-17 21:17:53 +02:00
3f6d0abd89
format
2021-09-16 10:58:13 -04:00
2898882a93
address review comments, simplify TileContentLoadInput
2021-09-16 10:42:17 -04:00
db0392daec
remove two lines that had no effect
2021-09-15 21:30:22 -04:00
dbcbce99cb
remove this from lambda capture
2021-09-15 21:24:20 -04:00
9c8ae58c7e
Formatting after const parameters
2021-09-15 17:44:12 +02:00
6a5e0d3d48
Added missing const for reference parameters
...
C26460: The reference argument ... for function ... can be marked as const
2021-09-15 17:43:42 +02:00
cdae0aa7ef
fix test, removed lambda workaround in Tile.cpp
2021-09-15 11:04:51 -04:00
106c3065ad
Formatting after adding noexcept specifiers
2021-09-15 17:03:56 +02:00
3e75d1fc6b
Added further missing noexcept specifiers
...
C26440: Function ... can be declared noexcept
2021-09-15 17:03:15 +02:00
2b462194ee
Convert enum class to underlying type
2021-09-15 16:53:38 +02:00
e998f1f9ab
Fixed wrong parameter type
...
C6330: 'char' passed as _Param_(1) when 'unsigned char'
is required in call to 'isspace'.
2021-09-15 16:27:39 +02:00
ea8acbcb9f
Formatting after avoiding unnecessary copy
2021-09-15 16:24:58 +02:00
7d535b5c56
Avoided unnecessary copy
...
C26817: Potentially expensive copy of variable ... in
range-for loop. Consider making it a const reference.
2021-09-15 16:24:33 +02:00
47d49ecca0
Changed const to constexpr
...
C26814: The const variable ... can be computed at compile-time.
Consider using constexpr
2021-09-15 16:20:35 +02:00
0e1e2f33df
Initialized member variables
2021-09-15 16:13:48 +02:00
329875609a
Allow unwrapped Future continuations to be mutable.
2021-09-15 23:54:09 +10:00
46c9c7ec7d
Formatting after adding const
2021-09-15 15:38:06 +02:00
de8145ab9e
Added missing const keyword
...
C26496: The variable ... is assigned only once, mark it as const
2021-09-15 15:37:29 +02:00
84a6e708b1
make inner tiles merging happen on worker thread
2021-09-15 09:12:05 -04:00
a84b09c238
Added further noexcept specifiers
2021-09-15 02:35:40 +02:00
588c5a1ab9
Add noexcept for default constructors
...
C26455: Default constructor may not throw.
2021-09-15 01:35:34 +02:00
5949134156
Fixed noexcept specifiers
...
It's hard to make them consisten for the JSON part...
2021-09-15 00:54:54 +02:00
f37a1db276
TileContentLoadInput is now the only argument for content loading
2021-09-14 12:05:15 -04:00
97a2757e39
Added missing noexcept specifiers
...
Reported as "C26440 Function ... can be declared noexcept"
2021-09-14 16:12:50 +02:00
56fb8acfb3
Merge branch 'main' into fix-forbid-holes
2021-09-14 20:36:28 +10:00
be1d76cf29
wip, some cleanup/workarounds in Tile.cpp async code
2021-09-14 01:32:36 -04:00
835de62665
improve async logic in Tile.cpp
2021-09-13 14:12:39 -04:00
e46184a2dd
changes + remove extraneous newline
2021-09-09 08:31:18 -04:00
e5b7323d1b
fix forbid holes for external tilesets
2021-09-09 07:54:22 -04:00
8f5291e077
update test to expect LoadState::Failed without a failcallback
2021-09-09 07:31:28 -04:00
388ed457b8
let geometric error of infinity signal unconditional refinement
2021-09-09 07:02:00 -04:00
2a9538dd8b
fix pessimizing-moves
2021-09-08 13:44:48 -04:00
b762be098e
pass asset accessor and request headers to tile content loading
2021-09-08 13:29:26 -04:00
b68440a8ae
don't pass functions as references in lambda capture
2021-09-08 12:14:57 -04:00
98b65c0cd4
fix cherry-pick, format
2021-09-07 14:52:11 -04:00
2851783ac5
_attempt_ to use futures for the tile content loader interface
...
lots of difficulties popping up in this refactor
2021-09-07 10:39:28 -04:00
c8a2f1ad42
don't call Tile::update before tile's content is loaded
2021-09-03 18:32:06 -04:00
64c287e925
remove extraneous change
2021-09-03 16:54:05 -04:00
f8bfc543dc
better solution?
2021-09-03 16:53:18 -04:00
cbb6e2886b
fix gcc/clang issue
2021-09-03 15:05:23 -04:00
1b394b9e64
work-around "Forbid Holes" not working
...
Children were not considered "renderable" even though their content and rasters were
loaded. This happened since the loaded rasters hadn't yet had a chance to be marked
ready. Forbid Holes was keeping the children from being visited and so
Tile::update -> RasterMappedTo3DTile::update were not being called, and so even when
rasters were loaded they couldn't be marked ready. Since the children were not being
considered renderable, Forbid Holes forced the parents to wait indefinitely for the
children before refining.
2021-09-03 14:29:48 -04:00
b5f87844ce
fix comment and tests
2021-09-03 11:40:34 -04:00
0f222d657d
Fixed external tilesets not loading when frustum culling was disabled
2021-09-03 11:14:35 -04:00
26087ca74b
Re-enable overlays on non-region tilesets.
2021-09-03 16:58:12 +10:00
d247452af7
Merge remote-tracking branch 'origin/main' into overlays-on-3dtiles
2021-09-03 14:19:14 +10:00
6f42c0decc
fix credits not showing after raster overlay refactor
2021-09-02 10:19:43 -04:00
6bb8ca3179
Detect missing overlay textures coordinates and add them.
2021-09-01 15:56:24 +10:00
fc3f11dd2b
Merge pull request #326 from CesiumGS/clipping-2.5d-kring
...
Clipping / insetting
2021-08-31 14:25:57 -04:00
36309817c2
Fix internal compiler error.
...
The predefined constant should be used anyhow.
2021-08-31 14:47:02 +02:00
92c79297ab
Introduce ITileExcluder, simplify CartographicPolygon.
2021-08-31 22:31:58 +10:00
09b4283fbb
Merge remote-tracking branch 'origin/raster-overlay-refactoring' into clipping-2.5d-kring
2021-08-31 12:42:16 +10:00
f885f349ee
Delete tile when it is removed from the tile provider.
2021-08-31 12:16:53 +10:00
62622a370f
CartographicSelection -> CartographicPolygon, move to CesiumGeospatial
2021-08-30 22:41:02 +10:00
5d06ec2cb7
Small optimizations and cleanup.
2021-08-30 21:17:12 +10:00
70908ccf69
Merge remote-tracking branch 'origin/raster-overlay-refactoring' into clipping-2.5d-kring
2021-08-30 16:47:33 +10:00
8b979eb643
Store renderer resources from load thread.
2021-08-30 15:03:30 +10:00
beffe9a783
Remove unnecessary changes.
2021-08-30 14:02:08 +10:00
53d8ab5a43
Merge remote-tracking branch 'origin/raster-overlay-refactoring' into clipping-2.5d-kring
2021-08-30 13:53:44 +10:00
acd276388a
Fix merge problem.
2021-08-30 13:52:28 +10:00
3d490f4651
Merge remote-tracking branch 'origin/raster-overlay-refactoring' into clipping-2.5d-kring
2021-08-30 11:33:24 +10:00
690b2259f8
Fix merge problem.
2021-08-30 11:25:02 +10:00
b7adf2c1e8
Merge remote-tracking branch 'origin/main' into raster-overlay-refactoring
2021-08-30 11:19:24 +10:00
36ef899803
Merge branch 'main' into gen-smooth-norms
2021-08-30 10:29:28 +10:00
cbd14a73c1
Re-add raster overlay on 3D Tiles support.
2021-08-27 22:35:21 +10:00
bd0187235b
Remove overlays-on-3DTiles support.
2021-08-27 22:34:08 +10:00
14493f0149
Fix some merge problems.
2021-08-27 22:25:25 +10:00
ae975be07b
Merge remote-tracking branch 'origin/raster-overlay-refactoring' into clipping-2.5d-kring
2021-08-27 22:05:06 +10:00
9566296e3e
Some of the code I just deleted was more important than I realized.
2021-08-27 21:25:00 +10:00
9b1745746d
Fix GCC warning by deleting a bunch of code.
2021-08-27 18:55:38 +10:00
d6c84b6a20
Remove unused code, unnecessary moves.
2021-08-27 17:57:00 +10:00
99a351195c
Fix tests.
2021-08-26 14:47:25 +10:00
d48f577342
Improve comment.
2021-08-26 14:32:50 +10:00
a665c1bd4c
Remove texture coordinate rectangle parameters.
2021-08-26 14:23:33 +10:00
ba506422da
Make subtile cache configurable.
2021-08-26 13:50:53 +10:00
19a99af2a2
QuadtreeRasterOverlayTileProvider tests.
2021-08-26 13:25:29 +10:00
8c7964bb75
WIP raster overlay tests.
2021-08-26 10:37:58 +10:00
75a61da65c
More doc and cleanup.
2021-08-24 21:59:03 +10:00
286c8d72e0
Formatting.
2021-08-24 19:28:50 +10:00
6bac2f2872
RasterOverlayTileProvider doc.
2021-08-24 19:25:26 +10:00
db2fa140d3
More cleanup.
2021-08-24 18:33:17 +10:00
492621cc07
Misc cleanup.
2021-08-24 16:34:14 +10:00
015e92e8de
Separate raster overlay refactoring into a new branch.
2021-08-24 13:32:56 +10:00
6b678f8de5
Merge remote-tracking branch 'origin/merged-for-clipping' into clipping-2.5d-kring
2021-08-24 12:04:01 +10:00
8cccf1753b
Merge pull request #318 from CesiumGS/rectangle-union
...
Add Rectangle::computeUnion method and rename intersect to match
2021-08-23 11:43:26 -04:00
df173934bc
Merge pull request #310 from CesiumGS/add-async-include-in-externals
2021-08-23 10:36:53 -04:00
9d33917358
Cleanup, remove some unnecessary changes.
2021-08-24 00:16:16 +10:00
acb2acd69c
Merge remote-tracking branch 'origin/merged-for-clipping' into clipping-2.5d-kring
2021-08-23 23:29:15 +10:00
b1dae79a17
Merge remote-tracking branch 'origin/rectangle-union' into clipping-2.5d-kring
2021-08-23 19:30:50 +10:00
2911275357
Rename GlobeRectangle::intersect to computeIntersection.
2021-08-23 19:24:55 +10:00
c0b7b130fb
Rename intersect to computeIntersection.
2021-08-23 19:22:08 +10:00
e0b835f686
Fix linux build problems.
2021-08-23 14:55:10 +10:00
b163c9b8a3
Formatting.
2021-08-23 12:13:48 +10:00
6f13727b14
Revert to ID-based overlay texture coordinate handling.
...
Creating unique names per projection isn't really scalable or necessary.
2021-08-23 12:06:21 +10:00
d1fe4e72a9
Minor cleanup.
2021-08-20 18:24:56 +10:00
87a4e44bee
Merge remote-tracking branch 'origin/tile-url' into clipping-2.5d-kring
2021-08-19 20:13:00 +10:00
342da1fa08
Fix tile URL extra in gltfs.
2021-08-19 19:58:44 +10:00
36a1f2301b
Make TMS overlay work when tilemapresource.xml is missing.
2021-08-18 21:57:54 +10:00
02430a1643
remove flat normal generation from cesium-native
2021-08-17 16:57:25 -04:00
00c25ecf51
Move some blitting code to a more reusable place.
2021-08-17 21:36:28 +10:00
1e91659cee
Cleanup.
2021-08-17 16:21:43 +10:00
8b43bf4e40
Clean up earcut cmake config.
2021-08-17 16:14:32 +10:00
1c6fed348e
Remove remnants of RastersMappedTo3DTile.
2021-08-17 16:04:32 +10:00
d769b17fda
add generate missing flat normals options
2021-08-16 12:26:50 -04:00
3c840c3be5
fix tests
2021-08-15 18:48:53 -04:00
6a4477136d
WIP move code to CesiumGltf::Model
2021-08-15 12:57:35 -04:00
1b60b26533
Added missing include of AsyncSystem in TilesetExternals
2021-08-14 00:50:22 +02:00
19042bfe65
attempt to fix GCC warnings (again)
2021-08-13 12:22:42 -04:00
1711d90b31
optimizations to smooth normals generation
2021-08-13 00:42:27 -04:00
677d47fb41
attempt to fix templated index gcc warnings
2021-08-12 14:03:03 -04:00
6a90dbcf83
Cleaner user of AsyncSystem, formatting.
2021-08-12 21:04:06 +10:00
f09d6e2e35
WIP support for non-indexed primitives
2021-08-11 18:10:27 -04:00
2d44fb8219
more casting fixes
2021-08-11 11:36:18 -04:00
2028d5e0b0
attempt to fix integer type error gcc/clang
2021-08-11 11:18:04 -04:00
15d48c9b55
Merge remote-tracking branch 'origin/main' into clipping-2.5d-kring
2021-08-11 22:40:20 +10:00
d68e0d61ac
Merge branch 'main' into gen-smooth-norms
2021-08-10 22:46:34 -04:00
5ee36632d3
Fix missed/incorrect Cesium3DTiles -> Cesium3DTilesSelection renames
2021-08-04 08:01:39 -04:00
81317f0fc3
Rename Cesium3DTiles -> Cesium3DTilesSelection in merge from main
2021-08-02 10:52:04 -04:00
2848ea62d4
Merge branch 'main' into rename-3d-tiles-pipeline
2021-08-02 10:46:03 -04:00
8b3bb34827
Rename Cesium3DTiles -> Cesium3DTilesSelection
2021-07-30 11:45:37 -04:00
Kevin Ring
Sean Lilley
Nithin Pranesh
Ian Lilley
Marco Hutter
Marco Hutter
baothientran
Daniel Krupka