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
Nithin Pranesh
Kevin Ring
Marco Hutter
Marco Hutter
baothientran
Daniel Krupka