Commit Graph

1203 Commits

Author SHA1 Message Date
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
Bao Tran 10a3955c14 check loading external tileset 2022-07-11 11:49:02 -04:00
Bao Tran 4dd4652a14 format 2022-07-08 15:35:02 -04:00
Bao Tran fd981e7392 test transform of implicit tile 2022-07-08 15:34:38 -04:00
Bao Tran 08e5759990 test implicit tileset parser 2022-07-08 14:20:39 -04:00
Mia Tang 1a6905220a Get total loading tiles 2022-07-08 11:48:49 -04:00
Bao Tran 5fb10efa9d format 2022-07-08 11:06:14 -04:00
Bao Tran 26a79642ee test tileset that contains empty tile 2022-07-08 11:05:48 -04:00
Bao Tran a907a3401c ensure geometric error is scaled along with tile transform 2022-07-08 10:54:18 -04:00
Bao Tran 9b691a422d format 2022-07-07 17:45:46 -04:00
Bao Tran 9e62835a5a test tileset where tile has no bounding volume 2022-07-07 17:45:22 -04:00
Bao Tran 006ad1b788 better check for ADD tileset 2022-07-07 16:56:44 -04:00
Mia Tang b11c180ebd Send over loading number 2022-07-07 16:47:23 -04:00
Bao Tran 3802fbaf23 format 2022-07-07 16:16:39 -04:00
Bao Tran 7224c466de check replace and add tileset 2022-07-07 16:16:14 -04:00
Mia Tang 0d2add8880 Add loading status getter 2022-07-07 14:32:01 -04:00
Bao Tran 4c6ff3ae52 test ill format for bytelength in subtree 2022-07-06 17:24:13 -04:00
Bao Tran c397faa4fd test subtree wrong format 2022-07-06 17:12:05 -04:00
Nithin Pranesh 187905b26c Merge branch 'main' into resource-throttling 2022-07-06 15:38:44 -04:00
Bao Tran 8f9de1adec test subtree json 2022-07-06 15:04:27 -04:00
Bao Tran 21e218d9fa test invalid morton ID 2022-07-06 13:13:56 -04:00
Bao Tran c1feda4d2d test for illegal quadtree ID 2022-07-06 13:04:35 -04:00
Bao Tran b2929296a9 check availability of parsed subtree 2022-07-06 12:27:09 -04:00
Bao Tran 0f80b7e089 serialize subtree to binary buffer 2022-07-06 11:23:51 -04:00
Kevin Ring 66f13c9719 Minor cleanup. 2022-07-06 19:47:25 +10:00
Bao Tran e036a40234 test constant subtree 2022-07-05 15:33:46 -04:00
Bao Tran 429e5f52c6 format 2022-07-05 15:21:59 -04:00
Bao Tran 4b43dfde4f test content and subtree available for subtrees 2022-07-05 15:21:38 -04:00
Bao Tran b1dbf11d35 test SubtreeAvailability::isTileAvailable() 2022-07-05 14:39:24 -04:00
Bao Tran 100b7d395c remove unused var 2022-07-05 11:22:38 -04:00
Bao Tran 03d268a8ff fix unit test for quantized mesh 2022-07-05 11:01:58 -04:00
Kevin Ring e8c525d4ad Merge remote-tracking branch 'origin/occlusion-experiments' into no-init-pool 2022-07-05 18:02:14 +10:00
Kevin Ring c003c6351f Merge remote-tracking branch 'origin/main' into occlusion-experiments 2022-07-05 18:00:22 +10:00
Kevin Ring f3e5d14183 Fix clang warnings. 2022-07-05 16:25:35 +10:00
Kevin Ring cb0a485038 Remove explicit initPool step. 2022-07-05 11:08:44 +10:00
Bao Tran 2a019bb3d4 parse copyright gltf 2022-06-30 17:11:59 -04:00
Bao Tran 16235deff6 add credit of raster overlay tile 2022-06-30 14:35:35 -04:00
Bao Tran 8e9b141e55 display credit from layer json 2022-06-30 14:03:31 -04:00
Bao Tran 9d5395fcf9 add tileset credit to tileset 2022-06-30 12:51:46 -04:00
Joseph Kaile 0162e612d1 simply skips parsing copyright if its size is zero 2022-06-30 12:37:41 -04:00
Bao Tran 765582b2bb use assertion to check if projection exists 2022-06-30 10:57:48 -04:00
Bao Tran 54041815f2 fix compiler errors 2022-06-29 15:09:42 -04:00
Bao Tran c04f82dcf7 fix compiler errors 2022-06-29 13:26:22 -04:00
Bao Tran fdb0c6c319 fix compiler errors 2022-06-29 13:02:50 -04:00
Bao Tran 0ccede8864 remove raster overlay details 2022-06-29 12:34:45 -04:00
Bao Tran e84269741e assign raster overlay index 2022-06-29 11:48:23 -04:00
Bao Tran feb6cef7d6 remove raster overlay detail in tile load result 2022-06-29 11:03:49 -04:00
Nithin Pranesh 0f10d0d876 call destroyPool in destructor, init scratch vectors 2022-06-28 17:39:10 -04:00
Bao Tran de506d8cae check patent has overlay details before upsampling 2022-06-28 11:47:45 -04:00
Bao Tran 2492e2c8da Merge branch 'main' into raster-overlay-integration 2022-06-28 11:06:12 -04:00
Nithin Pranesh 643a8a0b3e remove stack-based distance vector, small traversal refactor 2022-06-27 17:41:59 -04:00
Bao Tran ac39a85f38 Merge branch 'tile-content-integration' into raster-overlay-integration 2022-06-27 15:29:15 -04:00
Bao Tran c4621ed767 take account of parent refine for OSM building 2022-06-27 15:28:52 -04:00
Nithin Pranesh 5106346fd7 add TileOcclusionState enum, add class descriptions 2022-06-27 14:58:17 -04:00
Bao Tran c690e83424 format 2022-06-27 13:58:50 -04:00
Bao Tran 49a7f36e28 merge raster overlay details together 2022-06-27 13:58:14 -04:00
Bao Tran 89e71c5303 separate method of calc raster overlay details 2022-06-27 13:04:42 -04:00
Bao Tran 813410019e add upsample to tile in quantized mesh 2022-06-24 14:41:13 -04:00
Nithin Pranesh 69057cc757 can't use children bounding volumes for occlusion for leaf tiles 2022-06-23 23:59:56 -04:00
Bao Tran c5c613294d format 2022-06-23 16:13:59 -04:00
Bao Tran fd9bb5eab2 call correct loader 2022-06-23 15:53:03 -04:00
Bao Tran 2ac1346b35 assign upsampler to tile 2022-06-23 15:03:33 -04:00
Bao Tran 1511b70663 impl upsampler 2022-06-23 14:47:11 -04:00
Bao Tran 3778a026ec add back upsample 2022-06-23 10:36:48 -04:00
Bao Tran bdc620a84e update sampler 2022-06-22 16:50:59 -04:00
Bao Tran 53eb447940 add sampler 2022-06-22 16:19:48 -04:00
Bao Tran af3f891084 fix raster overlay flickering 2022-06-22 12:31:36 -04:00
Bao Tran 9c146e2232 Hellooo Raster Overlay! 2022-06-22 11:20:45 -04:00
Nithin Pranesh 42b2127373 basic lod transitions working 2022-06-21 08:59:06 -04:00
Kevin Ring 80d913fa66 Add "Tiles Waiting for Occlusion Results" stat. 2022-06-21 10:57:58 +10:00
Kevin Ring ba704905b4 Merge remote-tracking branch 'origin/main' into occlusion-experiments 2022-06-21 10:25:18 +10:00
Bao Tran 5e901b478e map overlay to tile and generate tex coord for overlays 2022-06-16 14:53:39 -04:00
Bao Tran 51bece4fd3 add raster overlay collection to content manager 2022-06-15 17:11:32 -04:00
Bao Tran bf480c0436 add subdividing children for raster overlay 2022-06-15 13:19:00 -04:00
Bao Tran 5e12d68857 remove projection from tile content 2022-06-15 12:25:33 -04:00
Bao Tran 17e35bb9aa Merge branch 'layer-json-loader-bao' into raster-overlay-integration 2022-06-15 11:00:03 -04:00
Bao Tran 0035adc832 fix compiler errors 2022-06-14 17:24:48 -04:00
Bao Tran 2e65b54f8c fix compiler error 2022-06-14 16:14:30 -04:00
Bao Tran 16b21e8c7b fix compiler errors 2022-06-14 15:38:29 -04:00
Bao Tran b2f4d7c229 fix compiler error 2022-06-14 15:06:37 -04:00
Bao Tran 738751c893 format 2022-06-14 14:30:48 -04:00
Bao Tran 9420007357 use subtree to mark if subtree is loaded 2022-06-14 14:30:21 -04:00
Bao Tran ef53a3c83b update tile children in updateTileContent 2022-06-14 12:00:47 -04:00
Bao Tran 10e0254ad5 Revert "Revert "add loaded availability""
This reverts commit db3552551f.
2022-06-13 16:04:11 -04:00
Bao Tran db3552551f Revert "add loaded availability"
This reverts commit 3ee46203ed.
2022-06-13 15:14:55 -04:00
Bao Tran 3ee46203ed add loaded availability 2022-06-10 19:25:15 -04:00
Bao Tran aa4b0767ac Merge branch 'tile-content-integration-update' into layer-json-loader-bao 2022-06-10 10:10:49 -04:00
Bao Tran 89095e1676 run task returned by loader immediately instead of spawning a new worker thread 2022-06-09 14:51:57 -04:00
Bao Tran 3269719a1c revive tile initializer 2022-06-09 14:12:01 -04:00
Bao Tran 67a4d05553 add subtree in main thread 2022-06-09 12:48:57 -04:00
Bao Tran 70d2f8d501 Revert "Revert "load subtree and tell client to retry later""
This reverts commit b4689a230c.
2022-06-09 11:40:14 -04:00
Bao Tran b4689a230c Revert "load subtree and tell client to retry later"
This reverts commit 4883af62ce.
2022-06-09 11:08:40 -04:00
Bao Tran 4883af62ce load subtree and tell client to retry later 2022-06-08 20:16:16 -04:00
Nithin Pranesh 7a9917d33e streamline occlusion interface 2022-06-08 17:36:42 -04:00
Nithin Pranesh 693c4a92c0 avoid sequentially waiting for occlusion results from each child, request them all at once 2022-06-08 15:45:08 -04:00
Bao Tran 9122d26dba make sure it works with multi layer 2022-06-08 15:15:59 -04:00
Nithin Pranesh 83f3886db0 don't check occlusion if a tile was last refined and at least one child was last refined.
Also fixed super annoying bug where a tile wouln't refine bc some of it's children were occluded
but did not meet the SSE. The child would not load, causing the parent to never refine
2022-06-07 17:22:41 -04:00
Bao Tran 2966319f80 add updateTileContent method 2022-06-07 15:47:58 -04:00
Nithin Pranesh 983362d1db don't count tiles waiting for occluded as occluded 2022-06-07 11:42:29 -04:00
Bao Tran 8895ccd85c move tileInitializer to TileExternalContent 2022-06-07 10:20:26 -04:00
Nithin Pranesh 4e6a3d6d65 add option to delay refinement until occlusion is available 2022-06-06 17:54:41 -04:00
Bao Tran 0feb6258e2 clear tile initializer 2022-06-06 11:28:27 -04:00
Bao Tran 31b4e7552d remove empty files 2022-06-06 11:16:40 -04:00
Bao Tran 18743bd15d update small comments on assert 2022-06-06 10:50:37 -04:00
Bao Tran 9b8cf362d9 add raster overlay back to tileset content manager 2022-06-06 10:48:56 -04:00
Kevin Ring e0982f5ed1 Fix clang/GCC warnings. 2022-06-06 14:27:26 +10:00
Kevin Ring 98fd2266e0 Fix bounding volumes. 2022-06-06 14:02:50 +10:00
Kevin Ring 9239d291ff Create tile's children when loading content. 2022-06-04 16:41:04 +10:00
Bao Tran 62363bc968 resolve missing header 2022-06-03 14:50:46 -04:00
Bao Tran a393049623 format 2022-06-03 13:15:42 -04:00
Bao Tran 0a662a7c10 add back RasterOverlayMappedToTile 2022-06-03 13:15:16 -04:00
Kevin Ring c5188fdcd2 Terrain partially working, but not creating children correctly yet. 2022-06-03 22:49:29 +10:00
Kevin Ring 62fb498498 WIP loader for layer.json / quantized-mesh. 2022-06-03 16:42:19 +10:00
Bao Tran c67eca2bc9 add projection for tile content 2022-06-02 12:27:16 -04:00
Bao Tran 542dd1be1d format 2022-06-01 13:40:59 -04:00
Bao Tran 90382287c2 return nullopt projection for Cesium ion loader 2022-06-01 11:37:13 -04:00
Bao Tran 391cabc218 add projection to tile content 2022-06-01 11:30:21 -04:00
Kevin Ring f18ee60c43
Merge pull request #503 from CesiumGS/upsampling-first-overlay
Upsample using first overlay with more detail
2022-06-01 04:31:47 +00:00
Kevin Ring b728164cb2 Ignore layer.json "bounds" property. 2022-06-01 13:45:24 +10:00
Joseph Kaile 4dcef84b39 Merge branch 'main' into upsampling-first-overlay 2022-05-27 12:42:31 -04:00
Joseph Kaile 8b18f6bef4 removed comments 2022-05-27 12:41:10 -04:00
Joseph Kaile 3cb2ce3db3 fixed tests 2022-05-27 12:34:36 -04:00
Bao Tran 2723b41ba7 format 2022-05-26 14:40:57 -04:00
Bao Tran 65b83eb421 remove Exp_ prefix in file name 2022-05-26 14:39:47 -04:00
Bao Tran 6e9c11e239 privatize some classes 2022-05-26 14:07:05 -04:00
Bao Tran 11f0d2c598 order tile initialization 2022-05-26 12:50:42 -04:00
Bao Tran 157494d0c7 fix compiler errors 2022-05-26 12:24:17 -04:00
Bao Tran d37395eb12 format 2022-05-26 11:46:21 -04:00
Bao Tran 35ffc7971b pass tile directly to loader 2022-05-26 11:45:58 -04:00
Nithin Pranesh 480a654bbc apply recommended improvement, changes 2022-05-26 09:30:23 -04:00
Kevin Ring e65cf93295 Add a comment clarifying something that wasn't obvious to me in review. 2022-05-26 23:12:31 +10:00
Kevin Ring f92aeb0a87 Slightly cleaner/more efficient array initialization. 2022-05-26 17:10:58 +10:00
Bao Tran 4b1f856471 disallow tileContent to be null 2022-05-25 16:14:24 -04:00
Bao Tran 1b0b4e3a54 fix compiler errors 2022-05-25 11:37:29 -04:00
Bao Tran b6237eac50 fix libmorton lib warning 2022-05-25 11:24:01 -04:00
Bao Tran 363655531a fix compiler warning 2022-05-25 10:57:59 -04:00
Bao Tran 5aa2e01548 format 2022-05-25 10:35:19 -04:00
Bao Tran 843ee4a303 Merge branch 'main' into tile-content-integration 2022-05-25 10:34:15 -04:00
Bao Tran 009acf0866 fix compiler error 2022-05-24 16:46:48 -04:00
Bao Tran 8c1a44731e format 2022-05-24 16:00:45 -04:00
Bao Tran da164b78ec remove implicit info parameters 2022-05-24 15:42:34 -04:00
Bao Tran d121273582 add gltf utilities 2022-05-24 15:30:08 -04:00
Bao Tran 7741ea58af render failed tiles as empty 2022-05-24 14:42:53 -04:00
Bao Tran 19580633de fix batch table upgrader 2022-05-24 12:14:51 -04:00
Bao Tran ddf524eca4 it's purging time! 2022-05-24 11:34:27 -04:00
Bao Tran b5e224e7c0 log errors and warnings when resolving gltf 2022-05-24 11:17:21 -04:00
Bao Tran 817e961b01 fix typo 2022-05-24 11:00:16 -04:00
Bao Tran 218c5341f5 catch exception when loading tile 2022-05-24 10:55:58 -04:00
Bao Tran a6b89b3759 implicit octree tile should inherit transform from parent tile 2022-05-23 12:42:07 -04:00
Bao Tran eb2939dec5 implicit tile should inherit transform of parent tile 2022-05-23 12:33:13 -04:00
Nithin Pranesh 4720ce894a remove the computeCoverageRectangle function which is now unused 2022-05-23 09:30:29 -04:00
Nithin Pranesh 52e2016e39 excluding tiles outside polygons working 2022-05-19 00:13:53 -04:00
Joseph Kaile 060ddd57fd avoid unnecessary copying of model, just to make an optional [ci skip] 2022-05-18 15:14:54 -04:00
Bao Tran 9ecbc9839e use power of 2 instead of childCount for subtree 2022-05-18 13:07:36 -04:00
Bao Tran 962a186fcf reduce duplicate code when checking availability in subtree 2022-05-18 10:44:02 -04:00
Nithin Pranesh a01998c078 gcc / clang werror fix 2022-05-17 17:59:24 -04:00
Nithin Pranesh 7e89563069 option to flip RasterizedPolygonsOverlay/TileExcluder 2022-05-17 17:36:14 -04:00
Joseph Kaile 454e1cf030 change upsample gltf function to return std::optional<Model> if all primitives are clipped 2022-05-17 15:30:04 -04:00
Joseph Kaile c6d6adbb65 Revert "make sure that the bounds really do get computed when calling create texture coordinates"
This reverts commit 2c8f3bf394.
2022-05-17 15:01:29 -04:00
Bao Tran 657862994f implement octree loader 2022-05-17 13:15:45 -04:00
Joseph Kaile 2c8f3bf394 make sure that the bounds really do get computed when calling create texture coordinates 2022-05-16 16:48:03 -04:00
Joseph Kaile d0b0d61cbf replaced calls to Update with new function, 'isMoreDetailAvailable' 2022-05-16 15:21:43 -04:00
Bao Tran 6aef575ea1 make room for implicit octree 2022-05-16 13:43:53 -04:00
Bao Tran c356a77437 fix obb subdivision 2022-05-16 11:28:05 -04:00
Joseph Kaile 3a3f92bfc7 make sure that projection used for bbox calculation and upsample are the same 2022-05-13 19:10:41 -04:00
Joseph Kaile 26d46ad3cf Revert "subdivide children and upsample children using the first raster tile"
This reverts commit 037f2c806d.
2022-05-13 16:28:47 -04:00
Bao Tran b54ba30ae2 log errors for implicit loader 2022-05-12 17:39:22 -04:00
Joseph Kaile 037f2c806d subdivide children and upsample children using the first raster tile
with more detail available
2022-05-12 17:12:50 -04:00
Nithin Pranesh 22f67901fd fix nullptr crash when out of occlusion proxies 2022-05-12 16:50:36 -04:00
Nithin Pranesh c8f2d95b3d remove unnecessary move 2022-05-12 16:40:14 -04:00
Bao Tran e84367e4a0 move setParent to be private 2022-05-12 16:31:16 -04:00
Nithin Pranesh 30f5d676e9 fix broken test 2022-05-12 15:30:21 -04:00
Bao Tran 0313b600e7 reparent children when moving tile 2022-05-12 13:47:03 -04:00
Joseph Kaile cf1d6653ee add the corresponding rectangle when adding the new projection 2022-05-12 13:27:00 -04:00
Bao Tran 38f0e9ac2d fix level offset 2022-05-12 11:30:04 -04:00
Nithin Pranesh 0ec1340320 fix test for gcc / clang 2022-05-12 04:12:42 -04:00
Nithin Pranesh 149a90c8cc use unsigned for pool size 2022-05-12 03:47:07 -04:00
Nithin Pranesh 60e55c4304 use union of child BVs for culling, general cleanup of culling code 2022-05-12 03:10:42 -04:00
Bao Tran 970b2da7b9 add tile url to gltf extra 2022-05-11 17:11:00 -04:00
Bao Tran 5064c0ba49 fix region subdivision 2022-05-11 16:40:15 -04:00
Bao Tran ec94c57875 fix external subtree buffer. Add available subtree to tile's children 2022-05-11 15:30:40 -04:00
Bao Tran 3065cb3088 format 2022-05-11 14:34:57 -04:00
Bao Tran c16082fdcb make implicit tileset works with old version 2022-05-11 14:34:29 -04:00
Joseph Kaile f85258bad5 make sure parent region is never dereferenced when nullpointer 2022-05-10 17:53:03 -04:00
Bao Tran 26d8bfaae9 bug fix for subtree availability 2022-05-10 17:46:39 -04:00
Joseph Kaile 22382ca92a address pull request comments 2022-05-10 17:32:06 -04:00
Joseph Kaile 70d94bbfa4 move code to generate texture coordinates in upsample parent 2022-05-10 17:19:52 -04:00
Bao Tran a6bdd913ef add subtree initializer to tile 2022-05-10 12:58:52 -04:00
Bao Tran ea4e815010 subdiv OBB 2022-05-09 20:10:42 -04:00
Joseph Kaile 58af362564 pass in the already computed parent bounds, which was crucial for generating correct uvs 2022-05-09 17:28:27 -04:00
Nithin Pranesh f9558f86f4 stop ignoring occlusion info after 5 frames (previously we considered it stale) 2022-05-09 17:27:52 -04:00
Bao Tran ab2f549bb1 subdivide region and S2 2022-05-09 15:05:53 -04:00
Bao Tran d2d9a94ff3 populate subtree back to tile 2022-05-09 13:48:47 -04:00
Joseph Kaile 4489f5b900 upsample parent tile based on a selected overlay index 2022-05-09 13:32:48 -04:00
Joseph Kaile e1880746ce get texture coordinate index of implicit context projection 2022-05-09 12:30:27 -04:00
Joseph Kaile 11b06edc9a generate implicit context projection uvs on the parent tile 2022-05-09 12:08:09 -04:00
Bao Tran 63a953246b prepare to populate the subtree to tile 2022-05-09 11:31:32 -04:00
Bao Tran 0bedeb8bdf explicit empty content 2022-05-06 18:53:31 -04:00
Bao Tran 9b67f87184 check if tile is empty 2022-05-06 17:11:27 -04:00
Bao Tran ed8fe48a2d change order of parameters 2022-05-06 15:06:21 -04:00
Bao Tran 22cb311200 request tile content 2022-05-06 15:02:49 -04:00
Nithin Pranesh 051f3b166a instead of culling, don't refine 2022-05-05 15:01:26 -04:00
Bao Tran 98f5ff446a fix unused variable 2022-05-05 14:29:14 -04:00
Bao Tran 6c57b000c7 implement the remaining methods for SubtreeAvailability 2022-05-05 14:22:43 -04:00
Bao Tran 88eee57e0f parse subtree availability 2022-05-05 11:23:38 -04:00
Nithin Pranesh 04d9e675c3 Merge branch 'main' into occlusion-experiments 2022-05-04 17:52:13 -04:00
Nithin Pranesh 4454ce9db5 small changes 2022-05-04 17:51:03 -04:00
Bao Tran c3fc81f48c add subtree availability and parse both subtree json and binary format 2022-05-04 15:30:49 -04:00
Bao Tran beee13175c add comment to solve the case where morton index is overflow. Add libmorton 2022-05-03 13:45:45 -04:00
Bao Tran b04e9c6b35 remove entt from submodule 2022-05-03 10:42:59 -04:00
Kevin Ring 46722d4b6e Don't kick external tileset children. 2022-05-03 14:55:38 +10:00
Bao Tran fe14094ba3 replace maximum levels with available levels 2022-05-02 15:43:09 -04:00
Bao Tran ccb98f6f0c parse implicit quadtree 2022-05-02 13:58:07 -04:00
Kevin Ring e58ec5b234 Remove pointless line of code. 2022-05-02 10:15:21 +10:00
Kevin Ring 0a4321af56
Merge branch 'main' into batch-table-hierarchy 2022-05-02 10:11:22 +10:00
Kevin Ring 82bd7b92c3
Merge pull request #485 from CesiumGS/layered-terrain2
Support for multiple layers of quantized-mesh terrain
2022-05-02 10:10:42 +10:00
Kevin Ring 8fc3b9ab10 Fix race condition in external tileset loading. 2022-04-30 11:10:31 +10:00
Joseph Kaile 51caf12e11 apply code improvements 2022-04-29 19:41:03 -04:00
Bao Tran ea4f0fa6ce check implicit ext is obj 2022-04-29 10:26:06 -04:00
Kevin Ring 140a195077 Slightly clearer context variable. 2022-04-29 21:04:57 +10:00
Kevin Ring fb850f6069 availabilityLevels uint32_t to match level. Other cleanup. 2022-04-29 20:43:07 +10:00
Kevin Ring 29efa3a633 Fix clang warnings. 2022-04-29 20:25:36 +10:00
Kevin Ring 04e02aadab More cleanup. 2022-04-29 18:53:51 +10:00
Kevin Ring 440bf1f5f0 Cleanup. 2022-04-29 14:23:09 +10:00
Kevin Ring 382b4ff105 Simplify tracking of tiles loaded/loading for availability. 2022-04-29 13:47:48 +10:00
Bao Tran ad4e7c89fb use tileset json loader directly as parent loader 2022-04-28 19:45:23 -04:00
Bao Tran e5025eb135 make room for implicit quadtree 2022-04-28 15:40:14 -04:00
Bao Tran c0f87687f7 add missing headers 2022-04-28 13:07:26 -04:00
Bao Tran afb3b75dd5 don't unload external tiles 2022-04-28 12:43:13 -04:00
Bao Tran 138d57968c remove entt subdirectory 2022-04-28 12:34:21 -04:00
Bao Tran 0e19cfae31 refine API 2022-04-28 11:42:52 -04:00
Joseph Kaile 94d025aca2 call loadAvailability in main thread 2022-04-28 11:09:58 -04:00
Joseph Kaile bf7691fe12 fix if statement 2022-04-28 11:09:21 -04:00
Kevin Ring daa373d76c Fix VS2017 compile error. 2022-04-28 10:26:45 +10:00
Kevin Ring e29d19c7e7 Add another test. 2022-04-28 10:10:45 +10:00
Kevin Ring 6f84bb3a52 Fix clang compile errors. 2022-04-28 09:46:11 +10:00
Kevin Ring 08d098f985 Add tests, fix a bug. 2022-04-28 09:20:46 +10:00
Joseph Kaile 88e49b4d99 fix for not chaining future together 2022-04-27 17:24:36 -04:00
Joseph Kaile 18255b33fc remove extraneous call from debugging 2022-04-27 17:01:48 -04:00
Joseph Kaile 52b0ace612 simplify and run format 2022-04-27 16:28:27 -04:00
Joseph Kaile 0b3692f694 implement future caching 2022-04-27 16:23:48 -04:00
Joseph Kaile e3fecf01bb dont set the state to done until the availabilty is loaded 2022-04-27 15:36:21 -04:00
Joseph Kaile 9edb1e04e0 notify tile done loading after getting availability 2022-04-27 13:59:06 -04:00
Joseph Kaile 8eeab63eee load availability before setting tile state to done 2022-04-27 12:30:43 -04:00
Bao Tran 277b7e2b61 format 2022-04-27 11:26:04 -04:00
Bao Tran 8ebc3c4479 throttle tile loading and don't unload external tile 2022-04-27 11:25:31 -04:00
Kevin Ring eb983f103f Add a test. 2022-04-27 22:59:17 +10:00
Kevin Ring 8d8a44105c Fix another clang error. 2022-04-27 22:25:43 +10:00
Kevin Ring cd71c1fc1b Warn about unsupported parentCounts. 2022-04-27 22:23:16 +10:00
Kevin Ring 52fb42e49c Warn about binary properties, CHANGES.md, formatting. 2022-04-27 22:12:23 +10:00
Kevin Ring c177f94087 Add some doc, bit of cleanup. 2022-04-27 21:09:37 +10:00
Kevin Ring befe724e25 Fix clang warnings. 2022-04-27 18:44:50 +10:00
Kevin Ring 56d00dce9b Move BatchTableHierarchyPropertyValues to a separate file. 2022-04-27 18:30:02 +10:00
Kevin Ring 18b586c8f7 Improve batch table hierarchy performance. 2022-04-27 18:11:20 +10:00
Joseph Kaile e006e7a4a7 fix issue where project crashed if url was not able to load 2022-04-26 16:55:53 -04:00
Joseph Kaile 35cc54e1da only create implicit children if tile hasn't been unloaded 2022-04-26 17:51:15 -04:00
Joseph Kaile b51ae1e5e4 Merge branch 'main' into layered-terrain2 2022-04-26 17:48:50 -04:00
Bao Tran e320c2831b pass request headers to tileset content manager 2022-04-26 16:48:48 -04:00
Bao Tran 7fbf7fdedf more explicit Load result state 2022-04-26 15:48:54 -04:00
Bao Tran 280f21a915 set tile to be unconditionally refined when external 2022-04-26 15:19:17 -04:00
Kevin Ring 71b1952e28 Add support for 3DTILES_batch_table_hierarchy.
It's working, but very slow at the moment.
2022-04-26 23:35:52 +10:00
Bao Tran b91d865b60 mark tile to be failed if received no response 2022-04-25 19:20:31 -04:00
Bao Tran da24aff0c9 remove user data storage 2022-04-25 17:35:36 -04:00
Joseph Kaile d76a20bb53 fix linux error 2022-04-25 17:19:33 -04:00
Bao Tran ea38470a15 delete unneeded code 2022-04-25 17:15:09 -04:00
Joseph Kaile 19dea016ad fix linux error 2022-04-25 17:00:55 -04:00
Joseph Kaile 8ff948b241 fix linux errors 2022-04-25 16:12:01 -04:00
Joseph Kaile 5789fe4143 fix linux compile errors 2022-04-25 15:49:56 -04:00
Joseph Kaile f46b773210 improve comments 2022-04-25 01:48:51 -04:00
Joseph Kaile b57b0cbeba fix include styles 2022-04-25 01:26:04 -04:00
Joseph Kaile 652e761a81 change layer json functions to return futures 2022-04-25 01:16:32 -04:00
Joseph Kaile d5e856eb22 moving from context to implicit context 2022-04-22 16:24:19 -04:00
Joseph Kaile a8098266b8 move create quantized mesh children back to create implicit children if needed 2022-04-22 15:30:33 -04:00
Bao Tran ca830cab1a begin integrate cesium ion and tileset json loader 2022-04-22 15:30:05 -04:00
Joseph Kaile 490a1a9c9f make recursive call create implicit children if needed 2022-04-22 14:58:44 -04:00
Joseph Kaile f96184dade renaming 2022-04-22 14:40:23 -04:00
Joseph Kaile 828459c892 delete availabilty load record after it has been processed 2022-04-22 14:25:21 -04:00
Bao Tran 38b2213846 format 2022-04-22 11:54:27 -04:00
Bao Tran ffb4907f49 resolve external url and post process gltf is now in tileset content manager 2022-04-22 11:49:26 -04:00
Bao Tran 1fb0e0f0ea create tileset content manager and let it handle tile state instead 2022-04-21 17:24:32 -04:00
Joseph Kaile 408556f6ca Moved request availability tile to Tileset 2022-04-21 17:13:08 -04:00
Joseph Kaile f4bedee0d7 Revert "only skip upsampling if the tile is actually loading an availabilty tile"
This reverts commit b9a630f9ae.
2022-04-21 15:26:51 -04:00
Joseph Kaile b9a630f9ae only skip upsampling if the tile is actually loading an availabilty tile 2022-04-21 15:16:09 -04:00
Bao Tran 5878bcab57 ad callbacks to inform request headers already change 2022-04-20 19:49:25 -04:00
Bao Tran ffe00c24f5 add ion tileset loader 2022-04-20 19:12:44 -04:00
Nithin Pranesh 48793400e3 fix pure virtual methods in interface, other small fixes 2022-04-20 18:26:02 -04:00
Kevin Ring 8d76d3194f Update Tile from Content before calling prepare. 2022-04-20 15:04:55 +10:00
Nithin Pranesh 70d6f3d1b5 add calls to rendererProxy::reset when tile assignment changes 2022-04-19 12:56:26 -04:00
Nithin Pranesh d8de4cde58 add TileOcclusionRendererProxy interface as well as pool for it 2022-04-18 20:26:25 -04:00
Bao Tran 8e1f5601c5 let tileset loader to create render resources 2022-04-18 16:05:27 -04:00
Joseph Kaile 7e21527351 add cache of shared futures to avoid duplicate requests for same availability tile 2022-04-18 14:02:28 -04:00
Bao Tran 34ed1a4d81 impl other TilesetJsonLoader method 2022-04-18 13:24:31 -04:00
Bao Tran 22cae133ec handle load error 2022-04-18 12:38:01 -04:00
Joseph Kaile 749d50d459 last pointer renaming 2022-04-18 11:44:10 -04:00
Kevin Ring f6a45cc0a3 Ignore error of unconditional refine tiles. 2022-04-18 09:38:41 +10:00
Kevin Ring f843b345ab Typo, formatting. 2022-04-17 22:31:38 +10:00
Kevin Ring 0997d42783 Cleanup, update CHANGES.md. 2022-04-17 17:35:30 +10:00
Kevin Ring 0ba4011244 Remove unnecessary code. 2022-04-16 23:30:48 +10:00
Kevin Ring 41541ea518 Formatting. 2022-04-16 23:21:29 +10:00
Kevin Ring 4bf873bfaf Improve Forbid Holes, overlays on tiles w/o geometry. 2022-04-16 23:19:01 +10:00
Bao Tran 8dd87366a3 format 2022-04-15 17:04:14 -04:00