Commit Graph

1273 Commits

Author SHA1 Message Date
insar-dev 42d2c92333
Update TestSubtreeAvailability.cpp 2023-01-19 11:44:55 +08:00
Kevin Ring 0481cec7ac
Merge branch 'main' into additive-render-nothing 2023-01-19 07:57:23 +11:00
insar-dev 406a28bfbc
Update TestSubtreeAvailability.cpp 2023-01-17 20:10:46 +08:00
Kevin Ring 1d4d6c75f4 Don't cull with children bounds with additive-refined tilesets. 2023-01-12 11:55:28 +11:00
Joseph Kaile 8c7600d4a4
Merge pull request #579 from CesiumGS/reinterop
Detach raster overlay tiles before freeing the geometry tiles they're attached to
2023-01-11 11:00:25 -05:00
Kevin Ring f582dd5a11 Merge remote-tracking branch 'origin/main' into additive-render-nothing 2023-01-11 22:39:15 +11:00
Joseph Kaile 740784c997
Merge pull request #578 from CesiumGS/snprintf
Use snprintf instead of sprintf.
2022-12-21 12:07:30 -05:00
Kevin Ring 6f77fdec00 Merge remote-tracking branch 'origin/reinterop' into additive-render-nothing 2022-12-21 20:19:13 +11:00
Kevin Ring 60a992da00 Merge remote-tracking branch 'origin/main' into reinterop 2022-12-21 20:18:59 +11:00
Kevin Ring 3c92244d46 Don't wait for tile that will never be renderable. 2022-12-21 20:15:33 +11:00
Nithin Pranesh 10abfd3043
Merge pull request #581 from CesiumGS/disable-gltfupaxis-warning
Disable gltf-up-axis warning
2022-12-07 21:17:09 -05:00
Nithin Pranesh abe987ad86 Disable gltf-up-axis warning 2022-12-07 20:31:41 -05:00
Xuelong Mu e399dac406 add optional field to specify custom ion endpoint 2022-12-07 15:37:01 -05:00
Kevin Ring 999ae8c889 Use snprintf instead of sprintf.
It's safer and Xcode 14 reports a warning on use of sprintf which turns
into an error, breaking the build.
2022-12-01 16:12:29 +11:00
Kevin Ring 14b31e29da Detach raster overlays before unloading tile. 2022-11-24 22:57:09 +11:00
Kevin Ring 1bb23f4b5a Create TMS and WMS tile providers in the main thread.
Otherwise there's a chance of overlay reference count corruption.
2022-11-03 12:08:50 +11:00
Kevin Ring 9988633ccf Don't try to upsample tiles with no geometry. 2022-11-01 13:04:54 +11:00
Kevin Ring 1607421897 Create placeholder tile properly when rectangle is unknown. 2022-11-01 11:52:39 +11:00
Kevin Ring 3702b52790 Fix token refresh for quantized mesh tiles. 2022-10-19 16:26:56 +11:00
Kevin Ring cdbb7c0fb0 Pass tileset status code through to loadErrorCallback. 2022-10-19 15:43:36 +11:00
Kevin Ring ffaf65b4bb Formatting. 2022-10-18 18:00:14 +11:00
Kevin Ring f31638fbfa Cleaner RasterOverlay error reporting. 2022-10-18 17:59:23 +11:00
Kevin Ring fda1d74c52 Formatting. 2022-10-15 16:28:05 +11:00
Kevin Ring 3b7ecc4c0f Raise an event when async Tileset destruction completes. 2022-10-15 15:38:08 +11:00
Kevin Ring 72cc94496a Merge remote-tracking branch 'origin/intrusive-lifetime' into async-prepare 2022-10-14 21:51:15 +11:00
Kevin Ring df5759de40 Merge remote-tracking branch 'origin/main' into intrusive-lifetime 2022-10-14 21:44:30 +11:00
Nithin Pranesh c0aa875ccc call unloadCachedTiles before tickMainThreadLoading (slightly reduces max cache occupancy) 2022-10-12 14:41:50 -04:00
Nithin Pranesh 5041694cea simplify time budgeting with std::chrono 2022-10-12 09:42:40 -04:00
Nithin Pranesh 5645113864 add this-> back in two places 2022-10-12 08:55:07 -04:00
Nithin Pranesh 1417e01586 use this->... for member variables 2022-10-11 21:15:54 -04:00
Nithin Pranesh 86101d99a8 fix white tiles - call updateDoneState in finishLoading to prepare a raster tile to be rendered 2022-10-11 19:50:15 -04:00
Nithin Pranesh b8f95de5bd tests passing 2022-10-10 23:50:37 -04:00
Nithin Pranesh b9e3381bde remove CreatingResources state, throttle ContentLoaded->Done transitions instead 2022-10-10 18:15:13 -04:00
Nithin Pranesh ee574fa53e add some main-thread tracing 2022-10-10 16:48:29 -04:00
Nithin Pranesh 57d8aafe44 Merge branch 'main' into mipmaps 2022-10-10 09:23:59 -04:00
Nithin Pranesh 04172d69d0 mip map creation is now just a client helper, clients now allowed to modify images during loading 2022-10-10 09:22:23 -04:00
Nithin Pranesh cc903e7b8d allow tracing macros to be overriden by clients 2022-10-04 22:54:13 -04:00
Nithin Pranesh 4ed97dca66 undo hacky cache-unload throttling 2022-10-03 19:36:33 -04:00
Nithin Pranesh f979592548 increased main thread creation budget to 5ms + format 2022-09-27 12:05:29 -04:00
Kevin Ring b4f30f81f9 Make prepareInLoadThread async, return a Future. 2022-09-22 18:35:21 +10:00
Kevin Ring 628e46f795 Merge remote-tracking branch 'origin/main' into intrusive-lifetime 2022-09-22 17:28:57 +10:00
Nithin Pranesh b7f4cc5c8f expose option to generate mipmaps 2022-09-21 23:18:15 -04:00
Kevin Ring e43f4da439
Merge branch 'main' into raster-clean-up 2022-09-21 14:58:33 +10:00
Bao Tran 64fa16d613 format 2022-09-21 00:37:46 -04:00
Bao Tran 6512c9faa2 clean up map raster tile when a geometric tile is failed to load 2022-09-21 00:17:22 -04:00
Joseph Kaile 2ef4e02acf pass status code as integer 2022-09-19 23:00:47 -04:00
Nithin Pranesh d5bbd8f6ce Merge branch 'resource-throttling' into mipmaps 2022-09-19 10:12:23 -04:00
Kevin Ring dec57ba82f Merge remote-tracking branch 'origin/main' into intrusive-lifetime 2022-09-19 22:43:55 +10:00
Nithin Pranesh 8da6f1a4c8 actually time-budget tickResourceCreation, hack throttle unloadCachedTiles 2022-09-16 10:08:38 -04:00
Joseph Kaile 41234892f0 delete old endpoint and create a new one 2022-09-15 13:41:04 -04:00
Nithin Pranesh 23bb49d092 format 2022-09-14 23:17:15 -04:00
Nithin Pranesh 11a0c5bfde Merge branch 'main' into resource-throttling 2022-09-14 23:16:37 -04:00
Joseph Kaile 35d0b825ff add nullptr check 2022-09-14 17:26:28 -04:00
Joseph Kaile de597a06cb fix incorrect search string 2022-09-14 17:06:49 -04:00
Joseph Kaile 55db9daefd wrap layer json and tileset json requests with a 'refresh token if needed' 2022-09-14 16:44:20 -04:00
Kevin Ring b95b30f640
Merge branch 'main' into add-renderer-options-to-tileset-options 2022-09-06 23:19:57 +00:00
Nithin Pranesh b4b1f39e46 simplify the "don't unload until faded out" logic 2022-09-06 12:02:53 -04:00
Nithin Pranesh 0fb2a43324 move mipmap generation out of readImage, integrate with gltf textures + raster imagery 2022-09-05 22:33:34 -04:00
Kevin Ring 2daea88927 Remove tile providers and placeholders when removing overlays. 2022-09-05 22:31:53 +10:00
Janine Liu 725b648c2e Remove redundant assignments in capture clauses 2022-09-02 15:55:34 -04:00
Janine Liu 28b5e51682 Remove accidental comma / linebreak 2022-09-02 15:39:49 -04:00
Janine Liu 37eb55ac88 Add rendererOptions to TilesetOptions 2022-09-02 15:24:42 -04:00
Nithin Pranesh bf27ff2542 format 2022-09-02 12:43:13 -04:00
Nithin Pranesh 336e25e9ba update comments 2022-09-02 12:42:52 -04:00
Nithin Pranesh 2bbb9dc816 change the fade out range to also be 0->1 2022-09-02 12:37:14 -04:00
Kevin Ring 120c6f52de Merge remote-tracking branch 'origin/main' into intrusive-lifetime 2022-09-02 22:00:04 +10:00
Kevin Ring a3d9f9dec1 Re-add a check to a test, update CHANGES.md. 2022-09-01 15:26:06 +10:00
Kevin Ring 3c2efef112 Merge remote-tracking branch 'origin/main' into lod-dither 2022-09-01 10:32:36 +10:00
Bao Tran 45c518c691 update raster right after content has glTF render resources 2022-08-31 19:05:13 -04:00
Nithin Pranesh 916207eb3b fix one-frame holes. Remove out-of-date comment 2022-08-31 18:43:29 -04:00
Nithin Pranesh f264059e2a Merge branch 'main' into lod-dither 2022-08-31 16:26:24 -04:00
Nithin Pranesh 48f9212884 remove incorrect assert 2022-08-31 11:09:01 -04:00
Kevin Ring e854ea3bde Fix tests. 2022-09-01 00:23:10 +10:00
Nithin Pranesh 5c640ae80d fix small bug 2022-08-31 10:04:31 -04:00
Kevin Ring 3c1ee65fcd Ref count more async ops, remove unneeded code. 2022-08-31 23:32:56 +10:00
Kevin Ring f5b477f4a2 Justify use of raw pointer. 2022-08-31 22:45:49 +10:00
Kevin Ring 190d7cfb15 Fix incorrect doc comments. 2022-08-31 22:42:03 +10:00
Kevin Ring d148d95218 Fix clang warnings.
Apparently Clang missed these warnings before because they were obscured
by a std::make_unique.
2022-08-31 22:33:58 +10:00
Kevin Ring 7b7a168590 Excluder holds intrusive pointer to overlay. 2022-08-31 22:08:42 +10:00
Kevin Ring 3c0e1f7c07 Simplify reference counting during overlay load. 2022-08-31 21:47:12 +10:00
Kevin Ring 03e7927afc Fix test build problem. 2022-08-31 20:05:13 +10:00
Kevin Ring 4801ed398c Don't use unique_ptr for raster overlays. 2022-08-31 19:00:06 +10:00
Kevin Ring f25d54e770 Use base class for ref counting RasterOverlayTile. 2022-08-31 18:50:54 +10:00
Kevin Ring 486f73d17f Use a base class for ref counting everywhere except RasterOverlayTile. 2022-08-31 18:45:13 +10:00
Kevin Ring 7e232b632a Add Unloading state for tiles that can't quite be unloaded yet. 2022-08-31 17:12:00 +10:00
Kevin Ring 699f13aae5 Unload tiles when shutting down content manager. 2022-08-31 09:59:32 +10:00
Nithin Pranesh fee95b67f1 remove incorrect assert 2022-08-30 18:01:32 -04:00
Sean Lilley 3f532e90e9 Fix gcc-11 build 2022-08-30 15:26:48 -04:00
Nithin Pranesh cd6963557c fix bug where fully faded out tiles were removed before clients were aware 2022-08-30 14:33:19 -04:00
Kevin Ring ac0ba1462d Non owning reference from RasterOverlayTile to Provider. 2022-08-30 12:01:37 +10:00
Kevin Ring de6b66553e Const correctness, more intrusive pointers. 2022-08-29 18:18:15 +10:00
Kevin Ring 3cb54be0a4 Start using IntrusivePointer to manage lifetimes. 2022-08-29 16:22:42 +10:00
Kevin Ring 9407880a6d Merge remote-tracking branch 'origin/main' into reinterop 2022-08-29 16:21:04 +10:00
Nithin Pranesh 2ae1f4708b simplify ViewUpdateResult + simplify fade percentage logic, move dither logic to client 2022-08-28 14:48:22 -04:00
Nithin Pranesh 730d4806c5 change default transition to 1 second 2022-08-25 14:04:50 -04:00
Bao Tran 647d247aaa add test when initializing manager with url 2022-08-25 14:04:01 -04:00
Nithin Pranesh 776c9fbf7e better naming, docs, readability, + address other review comments 2022-08-25 13:52:17 -04:00
Bao Tran 536461e529 add raster overlay details to result after checking overlay bounding 2022-08-25 13:29:04 -04:00
Bao Tran 76d388cc4a format 2022-08-25 12:17:11 -04:00
Bao Tran 2d1517147f create quantized mesh when have url 2022-08-24 18:01:33 -04:00
Bao Tran 08b44e8360 add conversion constructor and operator= for loader result 2022-08-24 16:59:48 -04:00
Bao Tran 700c858328 fix ambiguous call 2022-08-24 16:36:35 -04:00
Bao Tran 2ee56d3447 add API to create loader from json 2022-08-24 15:21:01 -04:00
Kevin Ring 0abaab8852 Remove a function that shouldn't have been added. 2022-08-24 23:10:06 +10:00
Kevin Ring 5b4be82fd5 Merge remote-tracking branch 'origin/main' into reinterop 2022-08-24 22:56:07 +10:00
Nithin Pranesh 84231a7db3 make the "fade-in descendant kicking" optional 2022-08-23 12:21:34 -04:00
Nithin Pranesh 67c5691843 fix merge errors + set default lod transition period to 2.0f 2022-08-23 11:24:15 -04:00
Nithin Pranesh c3dba9ff58 fix type + format 2022-08-23 11:08:59 -04:00
Nithin Pranesh a0af01a4c8 Merge branch 'main' into lod-dither 2022-08-23 10:39:33 -04:00
Nithin Pranesh ae5a9f24fe remove vestigial comment + only do fade-related kicking when lod transitions are enabled 2022-08-23 01:05:38 -04:00
Nithin Pranesh b11a583bad disable culling when using lod transitions 2022-08-23 00:22:53 -04:00
Nithin Pranesh e2845070e8 avoid breaking changes to Cesium Native API, fix tests 2022-08-22 23:26:45 -04:00
Nithin Pranesh 2b79ddffab Revert "change Cesium Native api to be backward compatible, fix tests"
This reverts commit a0ffc3a4b6.
2022-08-22 23:25:42 -04:00
Nithin Pranesh a0ffc3a4b6 change Cesium Native api to be backward compatible, fix tests 2022-08-22 23:22:53 -04:00
Bao Tran 27262a3265 Merge branch 'refactor-staging-main' into doc-integration 2022-08-22 22:24:08 -04:00
Bao Tran 503f31f7ae Merge branch 'main' into refactor-staging-main 2022-08-22 22:12:22 -04:00
Bao Tran 45e62fc401 add comment 2022-08-22 21:46:48 -04:00
Nithin Pranesh 1887e8d1a2 kick descendants of tile that is fading in. don't set fade to 0.0 for kicked tiles. 2022-08-22 19:16:13 -04:00
Bao Tran 7c75b0a15b add up axis to load result 2022-08-22 18:32:00 -04:00
Bao Tran 6b710462d8 add error message for converter 2022-08-22 16:21:11 -04:00
Bao Tran c2400cc40d format 2022-08-22 13:50:04 -04:00
Nithin Pranesh ba2934a461 Merge branch 'main' into lod-dither 2022-08-22 13:47:43 -04:00
Bao Tran 5881de748f use const ref for raster overlay detail merge method 2022-08-22 13:08:45 -04:00
Nithin Pranesh 4509f6fe31 handle case where fading out tiles reappear on the render list 2022-08-22 13:04:18 -04:00
Bao Tran caec6ed3db change back to original file 2022-08-22 13:04:15 -04:00
Bao Tran 91e2bcdf0a change to temp file 2022-08-22 13:03:35 -04:00
Bao Tran 43954302f8 rename file to logTileLoadResult 2022-08-22 12:59:36 -04:00
Bao Tran e16592984f change to int64_t for ion ID 2022-08-22 12:50:24 -04:00
Bao Tran 829331eedd reserve vector 2022-08-22 12:43:06 -04:00
Bao Tran ba9608e2a5 reserve vector 2022-08-22 12:39:47 -04:00
Bao Tran f28e84b6af change method names 2022-08-22 12:35:44 -04:00
Bao Tran d5283bd6e7 change waitIdle to waitUntilIdle 2022-08-22 12:33:41 -04:00
Bao Tran ada2bcd8c1 update headers 2022-08-22 12:26:35 -04:00
Bao Tran 3f6607ae20 update header style 2022-08-22 12:18:49 -04:00
Bao Tran 44383c8113 update header style 2022-08-22 12:16:46 -04:00
Bao Tran 057c836649 update header style 2022-08-22 12:14:38 -04:00
Bao Tran 22131c3367 update header style 2022-08-22 12:12:35 -04:00
Bao Tran ee64c228b3 update header style 2022-08-22 12:10:30 -04:00
Bao Tran 8d36bbc016 update header style 2022-08-22 12:08:11 -04:00
Bao Tran 661077e632 add plural warnings 2022-08-22 12:00:52 -04:00
Bao Tran 77741fbd53 add doc for error list 2022-08-22 11:55:04 -04:00
Bao Tran 652b0f019a add doc for loader 2022-08-22 11:43:56 -04:00
Kevin Ring cd43a33033 Check for subtree loads, too. 2022-08-22 23:15:07 +10:00
Bao Tran 9b2a1fceae add doc for TileContent 2022-08-19 14:58:35 -04:00
Kevin Ring 931701ebf1 Destroy the occlusion pool after async operations complete. 2022-08-19 10:34:40 +10:00
Kevin Ring 66ad15aaed Merge remote-tracking branch 'origin/main' into reinterop 2022-08-19 10:32:09 +10:00
Bao Tran d3fb551100 convert to R-value ref for setContentKind 2022-08-18 15:58:41 -04:00
Bao Tran d42a191887 change shouldContentContinueUpdated to shouldContentContinueUpdating 2022-08-18 15:55:38 -04:00
Bao Tran 293b1bfe13 change shouldContentContinueUpdated to shouldContentContinueUpdating 2022-08-18 15:53:56 -04:00
Bao Tran 37c6d5df46 update tile doc 2022-08-18 15:45:43 -04:00
Bao Tran 990487bd9a update GltfConverters doc 2022-08-18 15:39:41 -04:00
Bao Tran 1fe78d9908 add docs for RasterOverlayDetails 2022-08-18 15:13:35 -04:00
Bao Tran 2c232b704a add comments for GltfUtilities 2022-08-18 14:40:29 -04:00
Bao Tran 37008704ca add export for GltfConverterResult 2022-08-18 14:16:22 -04:00
Bao Tran f0a1649659 add doc for GltfConverters 2022-08-18 14:11:41 -04:00
Bao Tran 620698f8c8 don't abbreviate ConverterFun 2022-08-18 13:54:05 -04:00
Bao Tran 956e763051 add doc comment 2022-08-18 13:50:30 -04:00
Kevin Ring 5070d4e311 Add Tileset::canBeDestroyedWithoutBlocking. 2022-08-18 22:13:34 +10:00
Bao Tran 8116d17920 keep track of loading tile when loading tileset json and ion 2022-08-17 18:06:07 -04:00
Nithin Pranesh e7cc8effd1 expose option to enable / disable lod transitions. Fix transitions when un-culling a tile 2022-08-17 14:35:27 -04:00
Bao Tran ee4ecc6c1c let manager owns root tile and raster overlay collection 2022-08-17 12:50:50 -04:00
Bao Tran ef87387b6d format 2022-08-16 17:19:04 -04:00
Bao Tran 5ce9e40f64 add missing header 2022-08-16 16:56:02 -04:00
Bao Tran 94ab8615a5 fix compiler error 2022-08-16 15:01:58 -04:00
Bao Tran d34fcfd8c3 Merge branch 'refactor-staging-main' into tile-content-integration 2022-08-16 14:46:09 -04:00
Bao Tran 0bdf9813d1 test that manager doesn't generate raster UV from duplicated projections 2022-08-15 17:20:27 -04:00
Bao Tran 60d1f0fd4b move content kind 2022-08-15 11:45:17 -04:00
Bao Tran d63eb08583 change tileHasUpsampledChild() function 2022-08-15 11:36:59 -04:00
Bao Tran 1552bbfb51 address PR comment for PR 531 2022-08-15 11:01:02 -04:00
Bao Tran e4de79fc41 address comments for PR 521 2022-08-15 10:52:19 -04:00
Bao Tran ae13eb97de resolve PR comment for PR516 2022-08-15 10:26:17 -04:00
Bao Tran 12d9853705 reuse log utility 2022-08-12 16:00:11 -04:00
Bao Tran 88237bbefc format 2022-08-12 10:16:25 -04:00
Bao Tran 7687a5021d add missing header 2022-08-12 10:09:46 -04:00
Joseph Kaile 287e988487 pass pOwner to report Error instead of this 2022-08-11 15:49:31 -04:00
Bao Tran 86cb018fcf don't allocate tile content 2022-08-11 11:33:15 -04:00
Bao Tran b4c4b4f614 use this keyword to access class field 2022-08-09 13:46:48 -04:00
Bao Tran 5fe16fb209 use std::visit to subdivide octree and quadtree bounding volume 2022-08-09 12:22:19 -04:00
Bao Tran 2332bc3b3a use std::get to retrieve quadtree and octree ID 2022-08-09 11:33:44 -04:00
Bao Tran 005c353451 put log tile load result into different file 2022-08-09 11:12:20 -04:00
Bao Tran 93fa74ee25 add logError() and logWarning() for ErrorList 2022-08-08 18:32:56 -04:00
Bao Tran 4c8e0c5c14 remove optional model 2022-08-08 15:02:03 -04:00
Bao Tran 66bcefafd2 resolve compiler warning 2022-08-08 11:04:06 -04:00
Bao Tran b6606d762a resolve compiler warning 2022-08-08 10:49:40 -04:00
Bao Tran 3332045c86 resolve compiler warning 2022-08-08 10:29:09 -04:00
Bao Tran b0c5be8243 test gltf up axis to extra 2022-08-05 21:06:30 -04:00
Bao Tran 22c43e790d add override keyword 2022-08-05 20:50:35 -04:00
Bao Tran 1f103a739a ensure fittest bounding region is calculated for loose tile 2022-08-05 20:35:17 -04:00
Bao Tran 079587ae3a test that tile is updated with the overlay details bounding region 2022-08-05 19:03:09 -04:00
Bao Tran b619953829 test raster overlay UVs 2022-08-05 15:50:53 -04:00
Bao Tran 53e0d526e4 fix faulty tests 2022-08-05 14:04:35 -04:00
Bao Tran ad4056dfe2 add TilesetContentLoader::getTileUpAxis() and assign that value to tile gltf 2022-08-05 13:30:05 -04:00
Bao Tran 04c04e0c71 remove compiler error 2022-08-04 14:12:02 -04:00
Bao Tran e8a5ce0a7e better test for normal 2022-08-04 13:19:26 -04:00
Bao Tran 5b42c4724c test that smooth normal is generated 2022-08-04 13:07:21 -04:00
Bao Tran b3c6d62bae make sure raster overlay works with tileset 2022-08-03 14:41:25 -04:00
Bao Tran 173daef00d test that content manager should resolve the external buffers for gltf 2022-08-03 12:45:51 -04:00
Bao Tran 8e40ea5691 handle non-specs compliant for empty tile 2022-08-03 11:00:38 -04:00
Bao Tran df0d0aa145 begin add test for gltf post processing 2022-08-03 10:14:14 -04:00
Bao Tran 19ca6a97a6 update comment 2022-08-02 14:24:00 -04:00