Commit Graph

1203 Commits

Author SHA1 Message Date
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
Bao Tran 315579c2f4 test state machine of upsampled children 2022-08-02 14:18:35 -04:00
Bao Tran 07af355609 test tile state machine 2022-08-02 11:49:47 -04:00
Bao Tran df98568f8f test tile state machine 2022-08-01 11:34:34 -04:00
Joseph Kaile fe78846cee improve tms code 2022-07-29 19:02:35 -04:00
Bao Tran f76b6dbf0b format 2022-07-29 17:38:14 -04:00
Bao Tran 856a81960f fix mem leak 2022-07-29 17:37:35 -04:00
Joseph Kaile a6c850c037 change unordered map to vector 2022-07-29 14:39:43 -04:00
Joseph Kaile 9a44105685 Merge branch 'main' into tms-update 2022-07-29 14:22:38 -04:00
Bao Tran 56c016b1ab Merge branch 'const-ref-integration' into unit-test-integration 2022-07-28 14:43:04 -04:00
Bao Tran 3619dbb53d tileset json and upsampler cannot create children so return fail stat 2022-07-28 14:31:18 -04:00
Bao Tran 19d4db0687 Merge branch 'const-ref-integration' into unit-test-integration 2022-07-28 14:10:19 -04:00
Nithin Pranesh 2cc9aa6dea format 2022-07-27 18:04:15 -04:00
Mia Tang 9098e140e4
Update Cesium3DTilesSelection/src/Tileset.cpp
Co-authored-by: Nithin Pranesh <nithinpra7@gmail.com>
2022-07-27 16:46:53 -04:00
Mia Tang 4e895f5ff7
Update Cesium3DTilesSelection/src/Tileset.cpp
Co-authored-by: Nithin Pranesh <nithinpra7@gmail.com>
2022-07-27 16:46:49 -04:00
Bao Tran f0c1a5be16 add createTileChildren api with const ref tile 2022-07-27 15:54:00 -04:00
Mia Tang 4a77cceddf Change tileset load percentage to float 2022-07-27 14:26:46 -04:00
Bao Tran b3afae8d5e add TileLoadInput param 2022-07-27 13:37:30 -04:00
Bao Tran 921b6431e5 add more comment 2022-07-27 13:00:36 -04:00
Bao Tran c6adcf04dd make loadTileContent accept const ref for tile 2022-07-27 12:53:29 -04:00
Nithin Pranesh 051cb9fa12
Merge pull request #530 from CesiumGS/remove-empty-credit
Remove Empty Credit
2022-07-27 12:28:09 -04:00
Mia Tang 854ced7666 Remove supportsRasterOverlays bool 2022-07-26 16:33:32 -04:00
Bao Tran 25161e01f5 remove dependency between raster overlay collection and tileset 2022-07-26 12:09:42 -04:00
Bao Tran e82529dfda add API for custom loader in tileset 2022-07-25 17:21:51 -04:00
Bao Tran 497062cfa2 test tile at subtree root 2022-07-25 15:39:56 -04:00
Joseph Kaile c3efc3c0ba dont add credit if there is content in the string 2022-07-25 15:31:39 -04:00
Bao Tran d1a8ff4f48 move some methods to private 2022-07-25 11:31:16 -04:00
Bao Tran f69002d0a2 add doc for tile methods 2022-07-22 15:33:11 -04:00
Bao Tran 48be977ad5 add test fixtures to namespace Cesium3DTilesSelection 2022-07-22 15:04:29 -04:00
Bao Tran 9d71f1e056 move load state to tile 2022-07-22 14:04:47 -04:00
Bao Tran b963a7981f ensure layers doesn't load availability twice 2022-07-21 15:34:44 -04:00
Bao Tran c897fd6b9d load tile with multiple layer json 2022-07-21 13:39:04 -04:00
Joseph Kaile b8c2bc9cb3 append slash to url for relative uris 2022-07-20 16:36:45 -04:00
Joseph Kaile 00baa35af9 print error if srs is not supported 2022-07-20 15:45:31 -04:00
Joseph Kaile 24580de937 check that the xml file actually holds tileset metadata 2022-07-20 14:43:43 -04:00
Bao Tran 3ebb8f035d remove unneeded file 2022-07-20 10:27:18 -04:00
Bao Tran f4b735d9cd format 2022-07-19 18:34:39 -04:00
Bao Tran 0f58003669 test that loader will request watermask for tiles 2022-07-19 18:33:55 -04:00
Bao Tran 16c79dd048 test layer json attribution 2022-07-19 18:20:01 -04:00
Joseph Kaile a0a6cd0ad8 get the google projection to work in geoserver 2022-07-19 15:01:23 -04:00
Bao Tran b390520517 more thorough test for layer json loader 2022-07-19 13:58:50 -04:00
Bao Tran b85c206f42 template loader result for testing purposes 2022-07-19 13:39:27 -04:00
Joseph Kaile f5ea981791 avoid appending backslash to uris.. 2022-07-19 12:41:37 -04:00
Joseph Kaile dc3dbe75c5 fix compile warning on mac 2022-07-18 17:47:21 -04:00
Bao Tran 7c4623f833 load layer json with no url template 2022-07-18 15:59:47 -04:00
Joseph Kaile 2dea237a15 renaming, fix ininite loop 2022-07-18 15:14:26 -04:00
Bao Tran 253cd8eea3 test layer json tile geometric error 2022-07-18 14:28:13 -04:00
Bao Tran 7d00a3eb97 test layer json children 2022-07-18 14:10:40 -04:00
Bao Tran de69a04b66 add comment about parent tile lifetime when upsampling a tile 2022-07-18 11:21:38 -04:00
Joseph Kaile 343569f4c2 added backwards compatability, checking for SRS if profile not recognized 2022-07-16 01:07:22 -04:00
Bao Tran 574def6c5c test S2 subdivide 2022-07-16 00:15:21 -04:00
Mia Tang 8ea604bce8 Fix build error 2022-07-15 13:24:49 -04:00
Joseph Kaile 1f7442fddc testing tms loading from file 2022-07-14 17:47:15 -04:00
Bao Tran 90fefecbad finish test implicit octree 2022-07-14 17:40:12 -04:00
Bao Tran 2d400c2609 test octree subdividing region 2022-07-14 17:22:27 -04:00
Bao Tran a81e41fc42 format 2022-07-14 15:06:40 -04:00
Bao Tran 27ef39ee7b test subdivide bounding box for octree 2022-07-14 15:06:14 -04:00
Mia Tang f1f6b60a60 Format 2022-07-14 14:13:15 -04:00
Bao Tran 5d9087eecb begin test implicit octree 2022-07-14 11:51:48 -04:00
Bao Tran e18caf2981 format 2022-07-13 15:24:51 -04:00
Bao Tran ea49c9a5c7 test subdivide region for quadtree 2022-07-13 14:50:33 -04:00
Bao Tran 5b7e13cf4f test subdivide bounding box 2022-07-13 13:34:20 -04:00
Nithin Pranesh 087dfbc433 fix creation not running every frame 2022-07-12 18:36:47 -04:00
Bao Tran 4c92f93818 test invalid implicit tile 2022-07-12 17:33:58 -04:00
Bao Tran 16e4d33f1c test implicit quadtree loader 2022-07-12 16:51:13 -04:00
Bao Tran d1ef0f5ebf test tileset bounding volumes 2022-07-12 13:01:58 -04:00
Nithin Pranesh bd17e28015 debug stats logging of resource creation time 2022-07-12 10:06:09 -04:00
Bao Tran 2019d19691 clean up loader test 2022-07-12 00:38:56 -04:00
Bao Tran 1a50a99b54 test implicit tile 2022-07-12 00:06:03 -04:00
Bao Tran 29ae57e1d9 test render content tile 2022-07-11 15:36:15 -04:00
Mia Tang b5ae079831 Compute loaded tiles percentage 2022-07-11 13:50:55 -04:00