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
Kevin Ring
Nithin Pranesh
Ian Lilley
Sean Lilley