5e5c4b1911
Add test for height queries against EllipsoidTilesetLoader.
2024-11-19 20:52:05 +11:00
a6e2c8b05f
Eliminate block of useless indices from EllipsoidTilesetLoader.
...
EllipsoidTilesetLoader was passing a size to the constructor for the
std::vector used to store the indices, and then it was also adding the
indices by calling `insert`. That resulted in a giant block of useless
(0,0,0) indices, followed by the useful ones created by the insert.
This change uses `reserve` instead of passing a size to the constructor.
2024-11-19 20:45:27 +11:00
e56c5d776c
Don't create tiles past level 30, because it won't work.
...
EllipsoidTilesetLoader can conceptually create tiles of any level. But
because we use a uint32_t for the tile X and Y coordinates, and because
tile level 31 has 2*2^31=2^32 tiles, we end up overflowing the uint32_t
and producing nonsense tile coordinates. So this change prevents the
loader from creating tiles past level 30.
2024-11-19 20:43:11 +11:00
8a23ca54d9
Merge remote-tracking branch 'origin/main' into cpp20
2024-11-19 09:14:49 +11:00
651d3b4d43
Merge remote-tracking branch 'origin/main' into remove-gsl
2024-11-15 13:58:24 +11:00
f51948fbe4
Remove old CESIUM_NATIVE_ CMake variables
2024-11-13 11:22:17 -05:00
bc9165659f
Merge remote-tracking branch 'origin/cpp20' into remove-gsl
2024-11-12 15:07:50 +11:00
73da501e8c
Merge remote-tracking branch 'origin/main' into cpp20
2024-11-12 15:06:45 +11:00
b986b0b402
Merge branch 'main' of github.com:CesiumGS/cesium-native into ellipsoid-tileset-loader
2024-11-06 15:57:18 -05:00
89dfc44bdc
Remove use of GSL.
...
Change gsl::span to std::span, and replace the few uses of gsl::narrow
with an alternative.
2024-11-06 15:16:03 +11:00
97331792d3
Compile with C++20 and fix the problems.
2024-11-05 16:54:11 +11:00
783adceb87
Merge pull request #956 from CesiumGS/fix-missing-ellipsoid
...
Fix missing ellipsoid parameters
2024-10-31 21:24:45 +11:00
3435ad6a3c
Pass a TilesetSharedAssetSystem into TilesetExternals.
2024-10-30 14:11:22 +11:00
8b60ebdd63
Minor tweaks.
2024-10-30 11:06:14 +11:00
33d4948634
Image::pCesium -> pAsset
2024-10-30 09:40:04 +11:00
c73f5b5f05
staleAssetSizeLimit -> inactiveAssetSizeLimitBytes
2024-10-29 14:09:34 +11:00
feaf448dc3
Flesh out utility functions slightly.
2024-10-29 14:07:09 +11:00
d43edcea85
Add ResultPointer.
2024-10-29 11:38:15 +11:00
49f1d6319c
Introduce TilesetSharedAssetSystem.
2024-10-29 09:24:43 +11:00
727a68d064
Introduce AssetEntry.
2024-10-28 17:13:18 +11:00
38b4811270
Pass factory to asset depot constructor
2024-10-11 12:00:55 -04:00
df1f887e6d
Doc comments, rename ImageCesium
2024-10-10 15:28:05 -04:00
526e660687
default -> getDefault
2024-10-10 22:19:52 +11:00
7f798379f4
GltfSharedAssetSystem
2024-10-10 21:56:09 +11:00
a9516a0c84
Move SharedAsset[Depot] to CesiumAsync.
2024-10-10 21:00:16 +11:00
275bac0325
Better naming.
2024-10-04 21:16:11 +10:00
cee6f21ea6
Make SharedAsset a base class an eliminate AssetContainer.
2024-10-04 16:10:28 +10:00
91f5b5fc65
Merge remote-tracking branch 'origin/main' into shared-assets
2024-10-03 09:14:00 +10:00
a2b31a070b
Fix missing ellipsoid parameters
2024-10-01 11:27:13 -04:00
ec2186cff2
setMightHaveLatentChildren(false) even if tile has real children.
2024-10-01 16:18:33 +10:00
6fb28fe9a0
When tileset fails to load, report all heights not sampled.
...
Instead of rejecting the promise.
2024-10-01 07:54:21 +10:00
d7bef249f1
Merge remote-tracking branch 'origin/main' into shared-assets
2024-09-30 21:04:40 +10:00
05e1af1e80
Show tileset if overlay tile provider can't be created.
2024-09-30 21:03:00 +10:00
03b60efa8c
Don't let failing overlays stop rendering completely.
2024-09-30 21:03:00 +10:00
95840fe38d
Fix compile errors in tests.
2024-09-30 21:03:00 +10:00
fb38ac9f2c
Fail height requests when Tileset is destroyed.
2024-09-27 21:40:59 +10:00
ad18abfc03
Add sampleHeightMostDetailed test against a broken tileset.
2024-09-27 10:10:02 +10:00
87a4e686f1
Update doc.
2024-09-27 10:02:59 +10:00
b48893af99
tilesNeedingLoading -> tileLoadSet
2024-09-27 09:59:14 +10:00
63d6e4dd6d
heightSampled -> sampleSuccess.
2024-09-27 09:54:46 +10:00
e0323e9b1a
Only create latent children if there are not any children yet.
...
And add documentation for createLatentChildrenIfNecessary.
2024-09-27 09:50:25 +10:00
352e609df9
Update doc.
...
Co-authored-by: Janine Liu <32226860+j9liu@users.noreply.github.com>
2024-09-27 09:50:46 +10:00
e401f5996c
Update comment.
...
Co-authored-by: Janine Liu <32226860+j9liu@users.noreply.github.com>
2024-09-27 09:14:16 +10:00
85226ee4be
Update comment.
...
Co-authored-by: Janine Liu <32226860+j9liu@users.noreply.github.com>
2024-09-27 09:13:22 +10:00
74acd1a2ab
Additional tweak
2024-09-26 10:12:28 -04:00
23308ba502
Doc tweaks
2024-09-25 18:24:52 -04:00
f7a75b1778
Merge branch 'main' into height-query
2024-09-25 17:05:54 -04:00
4850751a25
Reject height requests when tileset fails to load.
2024-09-24 07:46:39 +10:00
4851ed2dc2
Fix test
2024-09-18 16:20:19 -04:00
9e7687d7c1
Show tileset if overlay tile provider can't be created.
2024-09-18 09:15:10 +10:00
bc0770a146
Update CHANGES, small cleanup.
2024-09-16 20:48:09 +10:00
3a37ba196b
Fix "done loading" criteria.
2024-09-16 13:39:59 +10:00
5753669933
Better marking of visited tiles.
2024-09-16 11:34:58 +10:00
ca62417638
Keep query tiles loaded until we're done with them.
2024-09-16 11:04:05 +10:00
51a532213e
Cleanup and doc.
2024-09-16 09:19:16 +10:00
06d9e791a6
Move height query functionality out of Tileset.cpp.
2024-09-13 21:00:22 +10:00
7c167ee15a
Minor reorg and documentation.
2024-09-13 19:04:00 +10:00
11d9f8e69c
Rename TerrainQuery to TilesetHeightQuery.
2024-09-13 17:07:24 +10:00
d9ff8acb9b
Report a warning for unsupported extensions.
2024-09-13 16:16:31 +10:00
96cd924630
Update based on review
2024-09-11 14:53:52 -04:00
b7a42443dd
Height queries against implicit tilesets.
2024-09-11 21:50:40 +10:00
349bc22459
Add external and implicit tileset tests.
...
Implicit tileset test is currently failing.
2024-09-11 16:32:32 +10:00
dcc6c09c0b
Don't do a full search if there are already additive candidates.
2024-09-11 16:32:08 +10:00
0a9e7450d4
Add very basic height query tests.
2024-09-11 15:52:54 +10:00
fbb880bdec
Allow a null IPrepareRendererResources.
2024-09-11 15:52:18 +10:00
f270e4dc7e
Allow height queries on a tileset that hasn't loaded at all yet.
2024-09-11 15:51:45 +10:00
adea29379e
visitHeightRequests -> processHeightRequests
2024-09-11 15:51:24 +10:00
1f01f5a4e9
Small tweaks and comments.
2024-09-11 13:47:40 +10:00
5310d25310
Remove unused lambda capture.
2024-09-11 11:42:36 +10:00
f7450a2aa1
Incremental traversal for additive-refined tiles, too.
2024-09-10 22:32:43 +10:00
852710e3f4
Round-robin scheduling of vis and height query loads.
2024-09-10 20:04:40 +10:00
1f778804de
Use addTileToLoadQueue, no need to search existing first.
2024-09-10 15:44:55 +10:00
3be4524adb
We only need ContentLoaded for height queries.
2024-09-10 15:22:49 +10:00
5dc4acb8f4
Don't let failing overlays stop rendering completely.
2024-09-06 14:46:44 +10:00
770c5bbac1
Fix compile errors in tests.
2024-09-05 15:52:25 +10:00
ef273ac266
More performant rayOBBParametric.
2024-08-29 09:42:18 +10:00
360154bd8d
Remove use of variable from debug code.
2024-08-27 21:47:52 +10:00
2accb6a790
Incremental tree search in tryCompleteHeightRequest.
2024-08-27 21:43:41 +10:00
c0f5f18ce9
Merge remote-tracking branch 'origin/main' into height-query
2024-08-26 15:02:56 +10:00
7e36d6c45f
Refactor to use IntrusivePointer for AssetContainer
2024-08-23 14:31:08 -04:00
e79b31379c
Merge with main
2024-08-16 14:13:55 -04:00
4e5bff4dfb
Changes for Unreal implementation
2024-08-16 14:10:08 -04:00
84493a722a
Fix content bounding volume test
2024-08-05 11:11:33 -06:00
1fcdeadfd9
Merge remote-tracking branch 'origin/main' into vcpkg-swl
2024-08-02 19:45:58 +10:00
cc8b03f67b
remove unnecessary check
2024-08-01 11:15:47 -06:00
5a0e06eefd
add support for warnings that occur during tile traversal
2024-08-01 11:11:44 -06:00
0af2f35c6f
fix bug where height queries could unnecessarily wait unneeded tiles to load
2024-07-31 14:55:27 -06:00
7a1eae8a9f
formatting
2024-07-31 14:13:24 -06:00
57cf86907f
fix warning
2024-07-31 14:07:42 -06:00
5f6e9e47fb
process all height requests on every tick, rather than one at a time
2024-07-31 13:59:24 -06:00
73e213b021
Fix compile error
2024-07-29 11:14:32 -06:00
07acc3abab
Merge branch 'main' into height-query
2024-07-29 10:45:13 -06:00
7d21b0c1be
Fix typos and test failure.
2024-07-26 10:42:30 -04:00
0a86cfdca8
Merge branch 'main' into fix-polygon-clipping
2024-07-26 09:40:26 -04:00
9690052efb
Merge branch 'gltf-ray-intersect' into height-query
2024-07-24 14:31:00 -06:00
dd8e3d0775
Merge branch 'main' of github.com:CesiumGS/cesium-native into shared-assets
2024-07-23 14:03:20 -04:00
a0954e3fbc
Add test for shared images
2024-07-23 14:03:06 -04:00
8b9b001b8b
Merge branch 'main' into gltf-ray-intersect
2024-07-23 13:38:37 -04:00
48d1b8bfee
move include path to fix build error
2024-07-12 10:03:46 -06:00
c2b47f0ae4
Reorg to change height finder to terrain query class
2024-07-12 09:54:00 -06:00
44b5ea3657
fix build warning
2024-07-12 08:54:20 -06:00
fe35ba3d92
Fix release build warning
2024-07-11 15:52:42 -06:00
5eba1aa8ee
process request tile load all at once, rather than one at a time
2024-07-11 15:50:14 -06:00
0d2a165a4e
Don't add to load queue if tile already exists
2024-07-11 15:30:54 -06:00
82f56ebdfc
Rework ::_processHeightRequests to split load work and intersect work
...
Also reuse the loading queue from the normal view tile selection
Seems to have a significant speed improvement. My tests went 6-8 seconds to 3 secs.
2024-07-11 15:13:06 -06:00
707dd8b770
Add missing includes
2024-07-11 10:25:23 -04:00
7e5270a2dc
Merge branch 'main' of github.com:CesiumGS/cesium-native into shared-assets
2024-07-10 16:00:40 -04:00
40806a24c7
Add ability for images to be shared between glTFs
2024-07-10 16:00:31 -04:00
7e12ede186
Merge branch 'gltf-ray-intersect' into height-query
2024-07-10 10:00:57 -06:00
7cda07f420
Remove occurrences of including <glm/mat4x4.hpp> in header files
2024-07-09 09:25:27 -06:00
1076b4d936
fix format
2024-07-08 16:20:06 -06:00
6bb57cf6db
Merge branch 'gltf-ray-intersect' into height-query
2024-07-08 16:15:06 -06:00
16d18a1ceb
Remove duplicate implementations of ::readFile
2024-07-08 16:12:56 -06:00
2668014459
update from base branch
2024-07-08 09:29:48 -06:00
2a06b1de9a
add doc comments
2024-07-02 19:56:04 +02:00
782c892a0a
add necessary metadata in gltf model
2024-07-02 19:05:33 +02:00
25bd258813
make geometry error computation consistent
2024-07-02 19:02:28 +02:00
5040669b55
properly declare parameter as unused
2024-07-02 18:49:08 +02:00
7c6bad98c0
rm unused includes
2024-07-02 18:45:02 +02:00
9305c00d0c
rm using namespace from header
2024-07-02 18:04:46 +02:00
25534c3903
Merge remote-tracking branch 'origin/main' into ellipsoid-tileset-loader
2024-07-02 16:25:39 +02:00
7c9ea84178
Merge remote-tracking branch 'origin/main' into vcpkg-swl
2024-07-02 17:39:20 +10:00
68df5462d6
Fix warnings.
2024-06-30 19:44:40 +10:00
98c3e25b68
Merge remote-tracking branch 'origin/main' into i3dm-misc-fixes
2024-06-29 10:59:55 +10:00
2f50cc2c3a
Flesh out test, fix a gltfUpAxis bug.
2024-06-29 10:22:31 +10:00
26476676d8
Fit loader with latest ellipsoid changes
2024-06-28 14:12:39 -04:00
90a78564dd
Merge branch 'main' of github.com:CesiumGS/cesium-native into ellipsoid-tileset-loader
2024-06-28 13:42:59 -04:00
5a7a640f7a
Add a test of upsampled bounding volumes.
2024-06-28 23:22:04 +10:00
75cc378aa7
Union with tight-fitting rectangle.
2024-06-27 18:57:17 +10:00
a67c65fdd1
Upsample with raster overlay rectangle instead of content rectangle.
...
A detailed explanation is here:
https://github.com/CesiumGS/cesium-unreal/issues/1461#issuecomment-2193873408
2024-06-27 18:41:05 +10:00
fd524ff07a
Remove debugging code
2024-06-27 18:26:32 +10:00
3e612ec92e
Add some assertions.
2024-06-27 18:20:08 +10:00
aab5cb9031
Merge remote-tracking branch 'origin/main' into i3dm-misc-fixes
2024-06-26 08:46:24 +10:00
c664a40208
Merge remote-tracking branch 'origin/main' into create-loader-future
2024-06-26 08:31:35 +10:00
bd5a4805ab
Merge remote-tracking branch 'origin/main' into i3dm-misc-fixes
2024-06-24 15:02:17 +02:00
ff96b9b07a
Merge pull request #874 from CesiumGS/forced-assertions
...
Add ability to force assertions
2024-06-21 16:12:56 +10:00
ec8f8ec5fd
Modify return of _getHeightsAtCoordinates to support warnings
2024-06-20 15:56:43 -06:00
7f3dbed76d
Can't forget the format!
2024-06-20 14:22:30 -04:00
11f9c0f3e5
Fix more review feedback
2024-06-20 14:21:49 -04:00
74653140f3
Rename to CESIUM_ASSERT
2024-06-20 10:14:38 -06:00
91300f9a61
update from main
2024-06-20 09:54:52 -06:00
11221f1190
Change request header passthrough, remove wait
2024-06-18 17:44:52 -04:00
ddeb117daf
Formatting
2024-06-18 13:54:21 -04:00
94ce714205
Change TilesetJsonLoader::createLoader to return future
2024-06-18 13:42:19 -04:00
110ff3b009
Fix build
2024-06-14 16:00:44 -04:00
943f06e07b
Formatting
2024-06-14 15:34:40 -04:00
65dda8335d
Respond to review, cut down on stored ellipsoids
2024-06-14 15:33:47 -04:00
fa2eb23228
tidy createModel method
2024-06-14 16:32:46 +02:00
d2ed4b9470
add proper root tiles handling
2024-06-14 16:08:51 +02:00
ce119c5f37
Fix closest hit logix
2024-06-13 15:51:58 -06:00
29250be392
Changes to support new IntersectResult
2024-06-13 15:23:21 -06:00
2f86112d2c
Merge branch 'gltf-ray-intersect' into height-query
2024-06-13 15:12:12 -06:00
7c01db3ba7
Resolve sign conversion error
2024-06-13 15:00:26 -04:00
785e9884c1
add proper geographic projection
2024-06-13 15:32:05 +02:00
8f5141c15f
Force MSVC to error on issues Clang will surface.
2024-06-12 15:46:24 -04:00
160490aff0
fix conversion errors
2024-06-12 18:14:26 +02:00
8eb874b443
add ellipsoid tileset loader
2024-06-12 14:22:53 +02:00
f5086231f3
Fix test
2024-06-11 16:46:34 -04:00
1598c3f863
Format
2024-06-11 14:23:36 -04:00
0f64573faf
Address rest of review comments
2024-06-11 14:22:45 -04:00
7517ad97df
Address some review comments
2024-06-11 13:58:26 -04:00
b48f1381af
Pass up axis to GltfConverters
...
The i3dm converter needs to know the coordinate axis convention of the
tileset in order to correctly construct instance transformations.
Resolves #904 .
2024-06-11 16:36:47 +02:00
f332464b30
Merge with main
2024-06-06 16:57:20 -04:00
d961a40e3d
Remove as many WGS84 defaults as possible.
2024-06-06 16:53:48 -04:00
ca42500d54
Merge remote-tracking branch 'origin/main' into vcpkg-2
2024-06-05 14:06:47 +10:00
0e74915a90
Add i3dm tests and fix some bugs.
2024-06-03 10:57:46 +10:00
dd6dece5c3
Update to new hit results, and rework height return data to show if the intersection succeeded
2024-05-31 16:20:48 -06:00
3f3944b34a
Merge branch 'gltf-ray-intersect' into height-query
2024-05-31 14:36:02 -06:00
565c255c1a
Let ::getHeightsAtCoordinates return full Cartographic coordinates, not just height
2024-05-28 11:53:47 -06:00
1046b4679f
Fix gcc error
2024-05-24 13:30:57 -04:00
98dbde97ba
Merge branch 'gltf-ray-intersect' into height-query
2024-05-24 10:08:14 -06:00
a871394773
Pass ellipsoid through prepareOnLoadThread
2024-05-24 11:37:46 -04:00
854915d048
Format code
2024-05-24 10:37:26 -04:00
4aa001e5c9
Support specifying a custom ellipsoid.
2024-05-24 10:30:59 -04:00
d822cf481e
Use a fail() local function in ImplicitOctreeLoader
...
This follows the change in ImplicitQuadtreeLoader.
2024-05-23 17:25:11 +02:00
c35b8d3b94
Undo unnecessary changes
2024-05-16 15:24:56 -06:00
530d4c2609
Updates from intersectRayGltfModelParametric changes
2024-05-16 13:27:24 -06:00
ea79bb8a76
Reponse to feedback: change ConverterSubprocessor to AssetFetcher
2024-05-16 17:05:33 +02:00
89f515152f
Merge branch 'gltf-ray-intersect' into height-query
2024-05-06 16:23:26 -06:00
b765a735c9
update from main
2024-05-06 15:07:03 -06:00
44f50bc58a
Take out test code
2024-05-03 14:17:00 -06:00
47414f09fb
Make our ASSERT macro. Move everything to use this.
2024-05-03 12:50:50 -06:00
0a4a5a9665
Merge branch 'main' into i3dm-2024
2024-04-17 17:56:57 +02:00
81bb2ff1bd
Change ConverterSubprocessor arguments from pointer to reference
...
It's required now.
2024-04-17 16:55:35 +02:00
806d0edfec
WIP glTF converter functions return a Future
2024-04-17 12:40:24 +02:00
c55660118c
Merge branch 'main' into upsampling-inverted-v
2024-04-12 14:49:08 -06:00
abaf72bada
upsampleGltfForRasterOverlays -> RasterOverlayUtilities
2024-04-12 16:59:24 +10:00
44ceb53856
Merge branch 'main' into upsampling-inverted-v
2024-04-10 16:50:26 -04:00
17fd4d3452
Merge remote-tracking branch 'origin/cesium-legacy-terrain' into gltf-correctness
2024-04-10 14:59:36 +10:00
30f5d14864
CesiumLegacyTerrain -> CesiumQuantizedMeshTerrain.
2024-04-10 14:07:11 +10:00
dd563d5c72
Add support for I3dm 3D Tile instance files
...
Initial commit of the main body of new code. A lot was taken or
inspired from PntsToGltfConverter, which should now be refactored to
use the new common functions.
ENU rotations are not supported yet.
2024-04-08 18:43:35 +02:00
e094899d16
More tests, clarify changelog.
2024-04-08 19:09:50 +10:00
f024e53448
Add hasInvertedVCoordinate option to upsampleGltfForRasterOverlays.
2024-04-05 17:00:43 +11:00
45dc731f33
upsampleGltfForRasterOverlays takes tex coord attr name as a parameter.
2024-04-05 17:00:43 +11:00
57a9ed3e2c
Move QuantizedMeshLoader to CesiumLegacyTerrain.
2024-04-04 22:15:11 +11:00
d32a017010
Fix early reporting of completion, when main thread tile loads still exist
2024-03-14 10:54:47 -06:00
b723de2e95
Merge branch 'main' into ref-counted-thread-safe
2024-02-26 10:17:30 -05:00
5f5f726ce6
Revert "Rename member name for clarity"
...
This reverts commit e16a3e1ac4
2024-02-26 09:56:14 -05:00
23c1cc82fb
Merge remote-tracking branch 'origin/main' into ref-counted-thread-safe
2024-02-26 11:33:57 +11:00
9f8b011a6e
Just one templatized ReferenceCounted class.
2024-02-25 22:44:05 +11:00
Kevin Ring
Sean Lilley
Ashley Rogers
Janine Liu
Brian L
Julien QUENTIN
Tim Moore