Commit Graph

1954 Commits

Author SHA1 Message Date
Kevin Ring e7b0dedaea Start progress at 0 instead of 100. 2025-04-08 07:40:11 +10:00
Kevin Ring 9c0dc55bf0 Fix clang warning. 2025-04-07 14:25:00 +10:00
Kevin Ring 91090b87c0 Test cleanup. 2025-04-07 12:26:50 +10:00
Kevin Ring 499ef058fd Add TileLoadRequester tests. 2025-04-07 12:15:49 +10:00
Kevin Ring 398ae77a1d Doc tweaks. 2025-04-04 19:13:01 +11:00
Tim Moore 733a2872c2 Only use projection matrix method 2025-04-03 19:04:36 +02:00
Kevin Ring abd17bee59 More clang-tidy. 2025-04-03 21:38:59 +11:00
Kevin Ring d64469fe21 clang-tidy. 2025-04-03 21:20:27 +11:00
Kevin Ring cea2af7d12 Fix doc problems. 2025-04-03 19:14:06 +11:00
Kevin Ring f2975cf641 Formatting. 2025-04-03 18:41:29 +11:00
Kevin Ring 9a2b6c646e Re-add the rest of the credits. 2025-04-03 18:27:47 +11:00
Kevin Ring e623a7d7cd Better TilesetViewGroup credit tracking. 2025-04-03 18:01:01 +11:00
Kevin Ring 3499deec02 Start making TilesetViewGroups update credits. 2025-04-02 20:58:50 +11:00
Kevin Ring 4141a83b59 Merge remote-tracking branch 'origin/multiple-views' into multiple-views-credits 2025-04-02 17:24:49 +11:00
Kevin Ring 260e80357c Merge remote-tracking branch 'origin/main' into multiple-views 2025-04-02 17:22:47 +11:00
Ashley Rogers 6b1c311992 Pass bounding volumes to prepareInLoadThread 2025-04-01 14:03:03 -04:00
Tim Moore 225f885d94 Remove obsolete references to dependency header directories 2025-03-31 17:06:14 +02:00
Kevin Ring 58bbb1f159 Merge remote-tracking branch 'origin/main' into vcpkg-pkg 2025-03-31 11:10:31 +11:00
Ashley Rogers 9752291586 clang-tidy fixes 2025-03-28 09:54:00 -04:00
Ashley Rogers 0a723c48df More review comments. 2025-03-28 09:25:53 -04:00
Kevin Ring e9eb9e9e7f New retained mode CreditSystem.
Not hooked up to Tileset yet.
2025-03-28 18:32:35 +11:00
Kevin Ring 4bbb7e4910 clang-tidy warnings. 2025-03-28 08:05:09 +11:00
Kevin Ring 4ca1a1145c Fix clang warning. 2025-03-27 22:41:12 +11:00
Kevin Ring 2445c498b0 Add support for querying TilesetViewGroup load progress. 2025-03-27 22:26:17 +11:00
Ashley Rogers d22bc9c2c0 clang-tidy fixes 2025-03-26 15:43:36 -04:00
Ashley Rogers bcff1e4432 Fix Doxygen issues 2025-03-26 14:27:34 -04:00
Ashley Rogers 15e68cce28 Fix rest of review issues 2025-03-26 14:22:47 -04:00
Ashley Rogers 1220a74b45 Remove EndpointResource for ion tileset loader 2025-03-25 16:03:51 -04:00
Ashley Rogers d499581382 Address a bunch of review comments 2025-03-25 15:19:49 -04:00
Tim Moore 2f2e38ac8a Add header files to assuage clang-tidy 2025-03-24 17:26:33 +01:00
Tim Moore 9cb5852ea3 run format 2025-03-22 18:07:06 +01:00
Tim Moore e7a97a8395 Update ViewState and CullingVolume to take a general projection matrix 2025-03-22 17:49:30 +01:00
Ashley Rogers c481048cc6 clang-tidy and CI fixes 2025-03-19 15:03:49 -04:00
Ashley Rogers 912c67f612 Fix crash on ion token refresh 2025-03-19 14:06:02 -04:00
Kevin Ring eb77e8db79 Fix ref count bug with LOD transitions enabled. 2025-03-16 23:03:57 +11:00
Kevin Ring fd2359cc92 Re-enable selection tests. 2025-03-16 20:43:52 +11:00
Kevin Ring 6894914577 Fix doc errors. 2025-03-16 12:22:12 +11:00
Kevin Ring 4ae059615c Fix clang-tidy warnings. 2025-03-16 12:03:51 +11:00
Kevin Ring bd4d05816f Formatting. 2025-03-16 11:55:40 +11:00
Kevin Ring 3fc4df5274 Fix release build warning. 2025-03-16 10:16:34 +11:00
Kevin Ring 85e20666f0 Avoid nested traversals. 2025-03-16 10:06:08 +11:00
Kevin Ring e837652860 Remove commented-out code. 2025-03-16 09:17:27 +11:00
Kevin Ring 1f1055f4a4 Reactivate LOD transitions. 2025-03-16 09:15:31 +11:00
Kevin Ring a286796a58 Fix DebugTileStateDatabase, add doc. 2025-03-15 23:13:33 +11:00
Kevin Ring eec5a52035 Remove commented-out code, add doc. 2025-03-15 22:31:47 +11:00
Kevin Ring 2e0588186c Improve TreeTraversalState, write tests. 2025-03-14 19:16:05 +11:00
Kevin Ring 0ce7e6d3e6 WIP optimized selection state tracking. 2025-03-12 22:29:46 +11:00
Kevin Ring 8010ede58f Reactivate TilesetSelectionAlgorithm tests. 2025-03-11 22:18:04 +11:00
Kevin Ring a213d8a3d4 Re-renable TilesetContentManager tests. 2025-03-11 22:07:33 +11:00
Kevin Ring e782ba4448 Fix incorrect comment. 2025-03-11 21:48:32 +11:00
Kevin Ring 54a63e4871 Move ViewUpdateResult to TilesetViewGroup. 2025-03-11 21:43:45 +11:00
Kevin Ring 87b9ac2465 More clang-tidy. 2025-03-11 19:08:48 +11:00
Kevin Ring c5d9fe9b08 Clang-tidy. 2025-03-11 18:49:57 +11:00
Kevin Ring 8df7f2af4d Improve names, add doc. 2025-03-11 18:31:16 +11:00
Kevin Ring daed0a11d2 Make Tileset not a friend of TilesetViewGroup. 2025-03-11 16:52:26 +11:00
Kevin Ring 27c384b1ce Doc. 2025-03-11 15:06:48 +11:00
Kevin Ring 600dc3e83d Tile cleanup. 2025-03-11 15:04:12 +11:00
Kevin Ring 35a924fe0e DebugTileStateDatabse logs previous selection state.
The current will usually be cleared at this time.
2025-03-11 13:18:45 +11:00
Kevin Ring d7f36bdcb4 Fix DebugTileStateDatabase. 2025-03-11 13:09:59 +11:00
Kevin Ring e4e563a58e More clang-tidy. 2025-03-11 11:28:41 +11:00
Kevin Ring 1c15340162 clang-tidy warnings. 2025-03-10 23:00:46 +11:00
Kevin Ring 06914b4a09 More missing doc. 2025-03-10 22:50:14 +11:00
Kevin Ring 556d803b6e Documentation. 2025-03-10 21:59:00 +11:00
Kevin Ring 9f170ee8bb Remove invalid use of `static`. 2025-03-10 21:25:20 +11:00
Kevin Ring 74d17e537f Formatting. 2025-03-10 21:23:34 +11:00
Kevin Ring 9b1efc6d0f Clean up LoadedTileEnumerator. 2025-03-10 21:12:05 +11:00
Kevin Ring a64daeaf03 Process height queries in loadTiles instead of updateView. 2025-03-10 17:21:53 +11:00
Kevin Ring cb5b39d139 Remove createViewGroup method. 2025-03-10 16:36:22 +11:00
Kevin Ring 5c3fe540b0 Less magic for registration of TileLoadRequesters.
So it can be done outside of cesium-native itself.
2025-03-10 16:10:48 +11:00
Kevin Ring f31eddd122 Rename ITileLoadRequester to TileLoadRequester. 2025-03-10 15:32:07 +11:00
Kevin Ring 88f23da70d Rename ITileLoadRequester.h to TileLoadRequester.h. 2025-03-10 15:30:22 +11:00
Kevin Ring a5e5bee6a8 Doc, make needs*Loading methods accessible. 2025-03-10 14:07:12 +11:00
Kevin Ring be14e13d72 Fix clang warning. 2025-03-10 13:23:19 +11:00
Ashley Rogers 52cf228646 Add missing include 2025-03-07 10:09:31 -05:00
Kevin Ring c5b5841cec Fix height queries. 2025-03-07 22:18:33 +11:00
Kevin Ring a2dc5fd36e Weighted round robin for main thread loading, too. 2025-03-07 14:46:11 +11:00
Kevin Ring db5602cf6a Settable weights. 2025-03-07 13:36:12 +11:00
Kevin Ring 49783e0e10 Weighted round robin worker thread tile loading. 2025-03-07 13:25:23 +11:00
Ashley Rogers 1c87344f7f Add includes 2025-03-06 17:05:50 -05:00
Ashley Rogers 0ffa232857 Merge branch 'imodel-mesh-export-loader' of github.com:CesiumGS/cesium-native into itwin-reality-data-loader 2025-03-06 17:00:21 -05:00
Ashley Rogers c393756f47 Fix CI issues 2025-03-06 16:58:29 -05:00
Ashley Rogers 9dae8c83de Loader and factory 2025-03-06 11:28:13 -05:00
Kevin Ring 865d8af2c7 Register in remaining TilesetViewGroup constructor. 2025-03-06 22:24:20 +11:00
Kevin Ring 076fcbcc9e Add ITileLoadRequester, register with TilesetContentManager. 2025-03-06 22:23:27 +11:00
Kevin Ring a81e7f3c45 Move load queues into TilesetViewGroup. 2025-03-06 18:50:12 +11:00
Ashley Rogers 6da60a75f5 Add Reality Data loader 2025-03-05 17:03:03 -05:00
Ashley Rogers ee9aa028a1 Fix JSON parsing 2025-03-05 15:45:28 -05:00
Ashley Rogers 7923f6509a Add mesh export service loader 2025-03-05 15:21:44 -05:00
Ashley Rogers 7aaf9e6ae5 clang-tidy fixes 2025-03-05 11:30:46 -05:00
Ashley Rogers 036ce1f5f1 Additional documentation 2025-03-05 11:11:03 -05:00
Ashley Rogers 70f4467f42 Documentation 2025-03-05 11:00:59 -05:00
Ashley Rogers ad371ca843 Working CCC loader 2025-03-05 10:41:55 -05:00
Ashley Rogers bfbfebdb7e ITwinCesiumCuratedContentLoader + Tileset constructor refactor 2025-03-04 17:17:41 -05:00
Ashley Rogers 8cbad73664 Reapply "iTwin Cesium Curated Content tileset loader"
This reverts commit cdcd093d79.
2025-03-04 14:43:19 -05:00
Ashley Rogers cdcd093d79 Revert "iTwin Cesium Curated Content tileset loader"
This reverts commit bdec829c5e.
2025-03-04 14:10:39 -05:00
Ashley Rogers bdec829c5e iTwin Cesium Curated Content tileset loader 2025-03-04 11:32:30 -05:00
Kevin Ring 0092b7b84e Merge remote-tracking branch 'origin/main' into multiple-views 2025-03-04 15:36:27 +11:00
Tim Moore b39d3f03cf Merge remote-tracking branch 'origin/main' into vcpkg-pkg 2025-03-03 14:14:23 -05:00
Ashley Rogers e3be93d05d Fix variable length string arrays 2025-02-28 16:43:48 -05:00
Ashley Rogers 07bb72746e Add test 2025-02-28 15:32:21 -05:00
Kevin Ring 8a626dfbab Remove unused frame number parameters. 2025-02-28 21:09:15 +11:00
Kevin Ring c7fc9c30ac Remove unused frame number from TileSelectionState. 2025-02-28 21:05:03 +11:00
Kevin Ring b3c0999530 More natural tile reference counting. 2025-02-28 20:53:18 +11:00
Kevin Ring 83ecea47f6 Less fiddly updating of LoadedTileEnumerator's root tile. 2025-02-28 15:45:33 +11:00
Kevin Ring ff24badffb TilesetContentManger owns LoadedTileEnumerator. 2025-02-28 14:33:52 +11:00
Kevin Ring 1326242691 New loaded tile enumeration. 2025-02-27 22:34:20 +11:00
Kevin Ring 0613cfad45 Merge remote-tracking branch 'origin/main' into multiple-views 2025-02-27 18:59:16 +11:00
Kevin Ring 9d757a7b0f Mark tile failed when load throws an exception.
The most common reason this may happen is on a connection failure.
2025-02-27 16:55:37 +11:00
Kevin Ring 2009ee1823 Add comment about _doNotUnloadSubtreeCount copying. 2025-02-27 15:18:15 +11:00
Kevin Ring 44cf9548be Move _doNotUnloadSubtreeCount along with other fields. 2025-02-27 14:49:47 +11:00
Ashley Rogers 4ea9154818 Change createChildTiles behavior 2025-02-26 14:31:18 -05:00
Ashley Rogers 3546686bd7 Address some of the review comments. 2025-02-26 13:53:45 -05:00
Tim Moore 9c1eb44400 Merge branch 'main' into vcpkg-pkg 2025-02-26 18:05:07 +01:00
Kevin Ring caf4668d0f New Tile unload approach. 2025-02-26 22:38:48 +11:00
Kevin Ring e60c349a9e Merge remote-tracking branch 'origin/unload-external-tilesets-2' into multiple-views 2025-02-26 18:14:36 +11:00
Kevin Ring 160fa4db1f Merge remote-tracking branch 'origin/main' into unload-external-tilesets-2 2025-02-26 14:54:14 +11:00
Ashley Rogers 75175434d3 Unhackify empty tile handling 2025-02-25 13:56:23 -05:00
Kevin Ring 9bdf4709c0 Merge remote-tracking branch 'origin/main' into multiple-views 2025-02-25 14:13:49 +11:00
Kevin Ring 84416c556d
Merge pull request #1111 from CesiumGS/3dtiles-bounding-volume-cylinder
Add support for `3DTILES_bounding_volume_cylinder`
2025-02-25 13:11:53 +11:00
Ashley Rogers c5de73a841 Fix tileset height query test failure 2025-02-24 17:05:33 -05:00
Ashley Rogers 7bc0896d17 Remove #define left in accidentally 2025-02-24 15:32:21 -05:00
Ashley Rogers 81e5311e05 Remove _tilesStillNotUnloadedCount, rename _doNotUnloadCount, review comments 2025-02-24 15:30:27 -05:00
Janine Liu 124e63a336 The last of clang-tidy, hopefully. 2025-02-24 15:06:08 -05:00
Janine Liu 8c19b0f75f Fix bad bracket placement 2025-02-24 14:50:29 -05:00
Janine Liu 73bb7b9bb0 Formatting, add missing bracket 2025-02-24 14:39:37 -05:00
Janine Liu 65366bc7ed Add support for cylinder bounding volumes in quadtrees 2025-02-24 14:22:13 -05:00
Janine Liu 812d96249f Read bounding volumes using JSON reader 2025-02-24 14:13:42 -05:00
Janine Liu 47b358fbc7 Angle bracket sweep, remove outdated references, tweak glm stuff 2025-02-24 11:24:28 -05:00
Kevin Ring 709ac4498d Pass request headers to tileset.json content requests.
Also fix crash if tileset.json has no root tile.
2025-02-21 20:50:02 +11:00
Ashley Rogers 598f49f92e Remove pointless check I left in 2025-02-20 15:15:52 -05:00
Ashley Rogers 489a541dc1 Fix test 2025-02-20 14:42:11 -05:00
Ashley Rogers b5d46371e9 The final piece?? 2025-02-20 14:16:13 -05:00
Ashley Rogers 40f951ffb9 Lots of SPDLOG_INFO 2025-02-20 11:48:50 -05:00
Ashley Rogers b4dd32ad36 Add *second* counter 2025-02-19 14:43:48 -05:00
Ashley Rogers 8aa6cc0bf8 Fix for other _loadedTiles issue 2025-02-18 14:17:15 -05:00
Ashley Rogers 9289398029 Bizarre fix for ContentLoading issue 2025-02-18 13:57:34 -05:00
Kevin Ring 3f7fed867b Don't check frame number. 2025-02-18 14:20:12 +11:00
Janine Liu d762030d25 Add test to BoundingVolume 2025-02-17 17:04:42 -05:00
Janine Liu bc165ffc93 Fix includes and formatting 2025-02-17 16:44:28 -05:00
Janine Liu 116743cc0b Fix translation bug, try to appease clang-tidy 2025-02-17 16:00:07 -05:00
Kevin Ring 6e0a355504 Call startNextFrame on all ViewGroups. 2025-02-17 14:00:25 +11:00
Kevin Ring 4bed3c859e Merge remote-tracking branch 'origin/main' into multiple-views 2025-02-17 08:57:26 +11:00
Janine Liu 60536f2e1a BoundingCylinder -> BoundingCylinderRegion 2025-02-14 17:44:56 -05:00
Ashley Rogers 140a7d96de Track *most* of the Tile pointers in TilesetHeightQuery 2025-02-14 17:02:20 -05:00
Janine Liu e1cc0c3e5b Merge branch 'axis-aligned-from-points' into 3dtiles-bounding-volume-cylinder 2025-02-14 14:35:39 -05:00
Ashley Rogers 21c03e2e74 Include Assert.h for clang-tidy 2025-02-14 10:09:29 -05:00
Ashley Rogers f705ac2da9 More review comments 2025-02-14 10:05:04 -05:00
Ashley Rogers 7367c77216 Merge branch 'unload-external-tilesets-2' of github.com:CesiumGS/cesium-native into unload-external-tilesets-2 2025-02-13 17:41:09 -05:00
Ashley Rogers 7842279b86 Address review comments 2025-02-13 17:40:40 -05:00
Ashley Rogers 7f8e02308a Merge branch 'main' of github.com:CesiumGS/cesium-native into unload-external-tilesets-2 2025-02-13 17:09:40 -05:00
Tim Moore e221a72631 Merge remote-tracking branch 'origin/main' into vcpkg-pkg 2025-02-13 14:58:27 +01:00
Janine Liu 32f703f754 linting 2025-02-12 16:34:26 -05:00
Janine Liu b0f3c634df Add BoundingCylinder as a tile bounding volume 2025-02-12 14:15:59 -05:00
Kevin Ring 243cae3e80 Move last selection state out of Tile in the simplest way possible. 2025-02-12 16:14:24 +11:00
Ashley Rogers 38a9f0835d Same stuff, different file 2025-02-10 16:47:47 -05:00
Ashley Rogers 7171545306 #ifdef around unordered_map 2025-02-10 15:48:35 -05:00
Ashley Rogers 765e6dbe1b Add [[maybe_unused]] to `reason` 2025-02-10 15:24:12 -05:00
Ashley Rogers 0b27e40ae5 RemoveChildren -> RemoveAndClearChildren 2025-02-10 15:20:33 -05:00
Ashley Rogers 3816ef9835 Add comment, format 2025-02-10 15:15:16 -05:00
Ashley Rogers db707fd09f Final fixes and ifdef for debug tracking 2025-02-10 15:09:35 -05:00
Ashley Rogers 101f71cfba Alllllmost working 2025-02-07 17:51:24 -05:00
Ashley Rogers 2b35b264e2 Inc/dec _doNotUnloadCount from setState 2025-02-07 17:16:13 -05:00
Ashley Rogers 3fb40074be Handle removing children in Tileset 2025-02-07 16:09:34 -05:00
Ashley Rogers e7d1ce5a9c Add *initiator* tile ID to log 2025-02-07 15:32:47 -05:00
Ashley Rogers c5a7fc4641 Scratch that - just add tile ID to log 2025-02-07 15:29:09 -05:00
Ashley Rogers d4c14dbb68 Add _loadedTiles to _doNotUnloadCount 2025-02-07 15:19:08 -05:00
Ashley Rogers 2aa36b3a1a Use _doNotUnloadCount to actually unload external tiles 2025-02-07 14:56:14 -05:00
Ashley Rogers dd27186c87 _doNotUnloadCount tracking 2025-02-07 13:51:42 -05:00
Ashley Rogers a9b4bfc3bb useBaseQuery for LayerJsonTerrainLoader 2025-02-05 10:09:18 -05:00
Kevin Ring b7e1e7c311 Remove unused `maximumSimultaneousSubtreeLoads`. 2025-02-04 18:18:07 +11:00
Tim Moore d1d790afe3 Merge branch 'main' into vcpkg-pkg 2025-02-03 22:26:20 +01:00
Kevin Ring 730bb759f0 Fix placeholder handling in BingMapsRasterOverlay. 2025-02-03 09:26:22 +11:00
Ashley Rogers eb016f0c0e Rename UriQueryParams -> UriQuery 2025-01-31 13:25:07 -05:00
Tim Moore ed58d0236b Merge remote-tracking branch 'origin/main' into vcpkg-pkg 2025-01-31 17:02:12 +01:00
Ashley Rogers 46ad1ac747 Separate query handling from Uri 2025-01-29 17:16:17 -05:00
Ashley Rogers 1c4e4c2acf Merge from main 2025-01-29 10:53:18 -05:00
Kevin Ring 344f386f90
Merge branch 'main' into culling-volume-crash 2025-01-29 19:00:33 +11:00
Ashley Rogers 7006b8177c Remove uriparser, format, etc 2025-01-28 11:57:53 -05:00
Ashley Rogers cb18f767b3 Return to previous substitution logic 2025-01-28 10:42:41 -05:00
Ashley Rogers 9e032f8aed
Merge pull request #1084 from CesiumGS/ada-url-substitute-first
ada-url: Substitute layer.json placeholders before treating as URLs
2025-01-28 10:13:58 -05:00
Ashley Rogers 158de7e4dc Merge branch 'main' of github.com:CesiumGS/cesium-native into ada-url 2025-01-28 09:55:01 -05:00
Kevin Ring 17eefa161f Substitute placeholders before manipulating layer.json URLs. 2025-01-28 21:12:12 +11:00
Ashley Rogers e16c56228b Don't crash when culling volume position is too large 2025-01-24 15:42:45 -05:00
Ashley Rogers 3d9a7f03b3 Remove new line for cross-platform test 2025-01-23 16:59:33 -05:00
Ashley Rogers 68bce2c8d0 Format 2025-01-23 16:42:12 -05:00
Ashley Rogers 06a3975d24 Add tests for Loader errors, log layer.json errors 2025-01-23 16:40:22 -05:00
Ashley Rogers 40d4ba9b71 Merge branch 'main' of github.com:CesiumGS/cesium-native into ada-url 2025-01-23 13:17:37 -05:00
Ashley Rogers cc56388500 Merge branch 'main' of github.com:CesiumGS/cesium-native into doc-raster-overlays 2025-01-23 11:49:30 -05:00
Kevin Ring 6541b5b450 Add a test. 2025-01-22 21:27:55 +11:00
Kevin Ring 4b8e520ef0 Return the highest sample height, not the first one. 2025-01-22 18:50:41 +11:00
Kevin Ring 251c399488 Merge remote-tracking branch 'origin/main' into request-headers-tileset 2025-01-22 13:43:26 +11:00
Ashley Rogers 31f16082fc Fix build errors 2025-01-21 14:50:47 -05:00
Ashley Rogers 6115d11cf7 Format 2025-01-17 16:18:05 -05:00
Ashley Rogers 45d9d7ffa6 Merge from main 2025-01-17 16:06:58 -05:00
Ashley Rogers 9617622dea Part of a Uri refactor 2025-01-17 12:07:24 -05:00
Kevin Ring 017d13393c
Merge pull request #1064 from CesiumGS/doctest
Use doctest instead of Catch2 for tests
2025-01-17 09:52:00 +11:00
Ashley Rogers 8269d1b7da Merge from main 2025-01-16 14:06:17 -05:00
Ashley Rogers e740e3a7b5 Address review comments 2025-01-16 14:05:13 -05:00
Kevin Ring feef2cd0eb Doc how raster overlays work. Other tweaks. 2025-01-16 17:26:18 +11:00
Ashley Rogers 4e318925a5 Switch tests to doctest 2025-01-15 16:58:03 -05:00