Commit Graph

701 Commits

Author SHA1 Message Date
Bao Tran 4a123d0e1c fix string offset buffer 2021-06-07 01:07:42 -04:00
Kevin Ring 9a46baa591 Basic tracing of tile loads. 2021-06-07 15:05:09 +10:00
Bao Tran ab56949efa fix string offset array 2021-06-07 00:20:29 -04:00
Bao Tran 5ef1e6b2db upgrade json array of string 2021-06-06 23:11:46 -04:00
Bao Tran 7c494ccf0e format 2021-06-02 18:36:50 -04:00
Bao Tran fea9b83286 add boolean test 2021-06-02 18:36:27 -04:00
Bao Tran 174bb7593d add test to view json string 2021-06-02 15:58:01 -04:00
Bao Tran 87182d228f fix signed conversion 2021-06-01 20:05:20 -04:00
Bao Tran d128efea18 test json value of meta property 2021-06-01 19:55:48 -04:00
Bao Tran 20e4a935f3 organize test data 2021-06-01 19:43:49 -04:00
Bao Tran a4a4068e78 add test for upgrading batch table 2021-06-01 19:37:46 -04:00
Bao Tran 5a2b91e853 WIP PropertyView 2021-05-25 16:39:20 -04:00
Bao Tran 2d2c010b53 setup Metadata API 2021-05-21 13:55:09 -04:00
Bao Tran 0903da7d60 WIP: convert json type to string 2021-05-20 16:25:10 -04:00
Bao Tran b6e365a04f add basic test for binary batch table 2021-05-18 21:25:39 -04:00
Bao Tran 4c7a431416 re-arrange buffer for b3dm batch table buffer to match EXT_feature_table 2021-05-18 15:52:22 -04:00
Bao Tran 04affd551a convert b3dm binary batch table to EXT_feature_metadata 2021-05-18 12:01:01 -04:00
Kevin Ring 6942603a1e Set bufferView.byteLength property. 2021-05-17 22:39:09 +10:00
Kevin Ring 30f22898b1 Feature metadata working well for simple case. 2021-05-17 12:30:09 +10:00
Kevin Ring 8f85fd8bbe WIP conversion of b3dm batch table to EXT_feature_metadata. 2021-05-14 22:28:31 +10:00
Kevin Ring 15be10ed1b Merge remote-tracking branch 'origin/main' into feature-metadata-extension 2021-05-13 21:22:28 +10:00
Bao Tran a868801cf7 format 2021-05-12 15:49:26 -04:00
Bao Tran bbe8a7fee1 explicitly destroy raster provider 2021-05-12 15:29:30 -04:00
Kevin Ring 0b1f5bb429 WIP conversion of b3dm batch table to EXT_feature_metadata. 2021-05-10 17:49:44 +10:00
Marco Hutter c8f961c689 Merge remote-tracking branch 'origin/main' into log-tile-ids
# Conflicts:
#	CHANGES.md
2021-05-05 13:47:34 +02:00
Marco Hutter b579401d0f Moved helper function to anonymous namespace 2021-05-05 13:28:50 +02:00
Nithin Pranesh 23d6e1925a apply fixes from review 2021-05-04 11:08:02 -04:00
Kevin Ring 28ccced087 Merge remote-tracking branch 'origin/main' into bing-session-cache2 2021-05-03 22:08:03 +10:00
Kevin Ring f9aba251e1 Don't request the water mask if it's not needed. 2021-05-03 18:09:34 +10:00
Kevin Ring 2b10dff799 Add TileContentLoadInput.cpp, remove Tileset.h from the header. 2021-05-03 15:55:30 +10:00
Kevin Ring d3ede24e27 Merge remote-tracking branch 'origin/main' into watermask 2021-05-03 15:42:54 +10:00
Nithin Pranesh 60472f2223 removed debug print, formatted, CHANGES.md 2021-04-30 16:27:50 -04:00
Nithin Pranesh 077ed0203d initial commit, not working 2021-04-30 16:11:46 -04:00
Nithin Pranesh 1e9a413545 Removed completed TODO comment 2021-04-30 14:01:22 -04:00
Nithin Pranesh f1429f672e added TilesetContentOptions within TilesetOptions 2021-04-30 11:52:16 -04:00
Marco Hutter 51e43bbd49 Comment fixes for clang formatting 2021-04-29 17:06:34 +02:00
Marco Hutter 7f92f95d16 Moved credit creation into main thread 2021-04-28 22:38:49 +02:00
Marco Hutter eab2b854f1 Addressed PR comments 2021-04-28 20:56:37 +02:00
Nithin Pranesh 24e15417ff Added watermask extension correctly 2021-04-28 09:54:19 -04:00
Nithin Pranesh c81c787c52 get rid of custom texcoords code, add geographic projection for texcoords 2021-04-27 13:10:28 -04:00
Nithin Pranesh f028b0876c format 2021-04-26 21:04:04 -04:00
Nithin Pranesh 10932738eb reimplement texture coordinates (is this proper geographic projected?) 2021-04-26 21:00:40 -04:00
Marco Hutter bfaa855dae Fixed wrong integer type.
Yes, this time, it was my fault.
And how's your development going?
2021-04-26 21:51:28 +02:00
Marco Hutter 3d2562c96f The usual whack-a-mole of integer types 2021-04-26 21:41:06 +02:00
Marco Hutter ad3f0450d8 Added tile ID strings in warning and error messages
Addresses https://github.com/CesiumGS/cesium-native/issues/179
2021-04-26 18:00:02 +02:00
Marco Hutter 82207a9b50 Added function for creating tile ID strings 2021-04-26 17:59:13 +02:00
Nithin Pranesh b2be53d22e refactor to use new JsonValue functions 2021-04-26 00:26:45 -04:00
Nithin Pranesh d49ff889fa Merge branch 'main' into watermask 2021-04-25 22:46:10 -04:00
Nithin Pranesh c03863ab5b optional water mask in TilesetOptions + format 2021-04-25 22:14:10 -04:00
Nithin Pranesh dfa64fbec7 default to land texture 2021-04-25 21:53:11 -04:00
Nithin Pranesh 67f67cb383 remove changes that weren't necessary 2021-04-24 10:05:32 -04:00
Nithin Pranesh f8664f93c2 remove redundant texcoords 2021-04-22 00:39:43 -04:00
Kevin Ring e5d7f18691
Merge pull request #224 from CesiumGS/ancestor-sse
Add tile to load only if it meets sse and ancestor doesn't
2021-04-22 10:30:23 +10:00
Kevin Ring 6bec736eeb
Merge pull request #223 from CesiumGS/raster-ready
Let tile be renderable if all rasters have ready tiles
2021-04-22 10:29:04 +10:00
Bao Tran 1a49455796 add tile to load if it meets sse and ancestor doesn't meet sse 2021-04-21 15:38:48 -04:00
Bao Tran 8d99b1b72c check raster ready at the end 2021-04-21 13:57:49 -04:00
Bao Tran 701625843b check if all rasters are ready 2021-04-20 14:59:00 -04:00
Nithin Pranesh b7bdf07e6a some cleanup 2021-04-20 09:53:50 -04:00
Samuel Vargas f50505305f
Fix antiquated naming for variables 2021-04-19 13:12:04 -04:00
Nithin Pranesh b98ea262d5 watermask for upsampled tiles 2021-04-19 09:42:39 -04:00
Kevin Ring 06a18348ca Merge remote-tracking branch 'origin/main' into error-add-refine 2021-04-19 15:17:02 +10:00
Bao Tran 98ec8159dd format 2021-04-18 23:12:02 -04:00
Bao Tran e776175009 fix test 2021-04-18 23:11:41 -04:00
Bao Tran ff45ec74c9 return nullptr for tile content if failed to load 2021-04-18 23:08:15 -04:00
Bao Tran d6419b40e0 format 2021-04-18 21:36:15 -04:00
Bao Tran 41b9781109 add test for error Add refinement tileset 2021-04-18 18:27:45 -04:00
Bao Tran 4b0c378220 don't kick descendant out for ADD refinement 2021-04-18 17:15:47 -04:00
Kevin Ring 999c382cc1 Merge remote-tracking branch 'origin/main' into gltf-extensions 2021-04-16 16:07:23 +10:00
Kevin Ring 8aab8bbec2 Don't construct so many GltfReaders.
Also switch to constexpr char* for extension and type names to avoid
static initializer ordering problems.
2021-04-16 12:52:29 +10:00
Samuel Vargas 8070d85023
Merge remote-tracking branch 'origin/main' into gltf-writer 2021-04-15 13:49:04 -04:00
Kevin Ring 02e3be9b03 Merge remote-tracking branch 'origin/main' into gltf-extensions 2021-04-15 21:54:03 +10:00
Kevin Ring 6bb1ac703d Merge remote-tracking branch 'origin/main' into clang-tidy-first-pass 2021-04-15 16:25:45 +10:00
Kevin Ring f58621ee49 Merge remote-tracking branch 'origin/main' into scale-geometric-error 2021-04-15 16:23:17 +10:00
Kevin Ring 940d8fc8f2 Merge remote-tracking branch 'origin/main' into gltf-extensions 2021-04-15 09:58:01 +10:00
Kevin Ring 45f44fa034 Reader -> GltfReader. 2021-04-15 00:37:37 +10:00
Nithin Pranesh 1727e4a23b format 2021-04-13 17:24:31 -04:00
Nithin Pranesh 236a9008b9 basic watermask functionality 2021-04-13 16:00:16 -04:00
Kevin Ring 88795c0045 Move JsonValue to CesiumUtility. 2021-04-13 23:24:53 +10:00
Jordi Torres 6333b1cb0a First pass of clang tidy
Mainly caching else after return, not using empty() instead of size() == 0, missing const references to avoid copies and removing redundant initializations
2021-04-12 13:22:03 +02:00
Marco Hutter 868094a7ba Converted axis to enum 2021-04-08 17:54:35 +02:00
Marco Hutter 1d686e2fe8 Do not pass tileset into worker thread 2021-04-08 15:48:22 +02:00
Kevin Ring 48f2d3b5c2 Remove unused files, other cleanup. 2021-04-08 21:59:42 +10:00
Nithin Pranesh 98a6f77744 Initial progress! (nothing works) 2021-04-07 21:45:11 -04:00
Marco Hutter fbf77d2d24 Removed unused variable. 2021-04-07 20:47:28 +02:00
Marco Hutter 30c8ad06dc Parse the gltfUpAxis from the tileset 2021-04-07 19:56:50 +02:00
Bao Tran fa94f2442d Merge branch 'main' into allow-zero 2021-04-07 10:30:33 -04:00
Kevin Ring f33f7b1dd5 Make CesiumGltf::Reader a proper class, mange its own extensions. 2021-04-07 23:41:37 +10:00
Bao Tran 162f818109 format 2021-04-06 16:44:46 -04:00
Bao Tran 1a339908ae capture options and enable move again 2021-04-06 16:31:40 -04:00
Bao Tran 888dd6948a scale geometric error with tile transform 2021-04-06 15:39:01 -04:00
Samuel Vargas f9e489f67f
Merge remote-tracking branch 'origin/main' into gltf-writer
Accidentally merged with antiquated `master` branch before
2021-04-06 14:16:55 -04:00
Samuel Vargas c411f42efc
Add explicit ptr for pMeshCenter 2021-04-06 13:40:11 -04:00
Samuel Vargas b03dac82af
Add trailing newline to misc files [ skip ci ] 2021-04-06 13:07:48 -04:00
Bao Tran 9538dd7236 remove incorrect move 2021-04-05 10:23:28 -04:00
baothientran 5ae62bac2c
Merge pull request #192 from CesiumGS/quantized-mesh-material
Assign a better material for quantized-mesh tiles.
2021-04-05 10:09:13 -04:00
Marco Hutter 7425d5a89a Updated and extended error messages 2021-04-02 21:14:43 +02:00
Kevin Ring 005a32e792 Formatting. 2021-04-02 12:12:49 +11:00
Kevin Ring 0884fdba27 Don't always report zero-length images as errors. 2021-04-02 12:10:30 +11:00
Kevin Ring 37c06cd25f Formatting. 2021-04-01 22:53:20 +11:00
Kevin Ring 0825eb6d41 Assign a better material for quantized-mesh tiles. 2021-04-01 18:44:06 +11:00
Bao Tran ec950e046d format 2021-03-25 15:51:02 -04:00
Bao Tran d93a76cd01 add tracing for expensive content loader 2021-03-25 15:50:34 -04:00
Bao Tran 6d06a3ddc2 place tracer on upsample terrain function that takes significant time 2021-03-24 17:07:58 -04:00
Bao Tran cfdfb02d03 add tracer for upsample terrain 2021-03-24 16:22:12 -04:00
Bao Tran 5d65432c6b Merge branch 'main' into imagery-debug 2021-03-23 19:04:42 -04:00
Bao Tran 5648af65df remove debug code 2021-03-23 19:03:39 -04:00
Bao Tran 16afe2047c remove debug code 2021-03-23 19:02:43 -04:00
Bao Tran a04ad86f2a add const to getID() 2021-03-23 18:43:53 -04:00
Kevin Ring bfdad704da
Merge pull request #181 from CesiumGS/doc-terrain-note
Add a note about SSE for terrain.
2021-03-24 09:23:29 +11:00
Kevin Ring 4f6ab3413d Fix formatting. 2021-03-24 09:09:55 +11:00
Bao Tran 28c7ad04c8 add some debug method 2021-03-23 15:15:39 -04:00
Kevin Ring 6f677633e9 Add a note about SSE for terrain. 2021-03-23 10:58:50 +11:00
Bao Tran 9413b2f440 Merge branch 'main' into offline-loading 2021-03-22 10:36:13 -04:00
Bao Tran 1b24981f4f copy url when capturing it in the lambda 2021-03-21 23:26:59 -04:00
Bao Tran 42f0c2b89a parse response status code 0 if it is a file uri 2021-03-21 22:24:53 -04:00
Kevin Ring d99bb55a3d
Merge pull request #155 from CesiumGS/handle-images-404
Handle the case that images are not found
2021-03-20 15:08:06 +11:00
Nithin Pranesh 64ded494f4 Fix per-tile credits not being passed through raster loading 2021-03-18 15:34:08 -04:00
Bao Tran 1b7ff38db8 format 2021-03-17 15:01:08 -04:00
Bao Tran bf5218d9f2 remove raster cutout 2021-03-17 14:22:40 -04:00
baothientran e98b7b7839
Merge pull request #167 from CesiumGS/holes
Upsample incomplete implicitly-tiled quads.
2021-03-17 10:25:45 -04:00
Marco Hutter e824e89b0a Formatting 2021-03-17 14:49:27 +01:00
Kevin Ring 4a72fae7f7 Use correct layer.json version property name. 2021-03-17 22:34:04 +11:00
Kevin Ring e1bcbcb37b Upsample incomplete quads. 2021-03-17 22:01:27 +11:00
baothientran caee54e2e2
Merge pull request #164 from CesiumGS/tile-context-race-simpler
Fix a race condition with TileContext
2021-03-16 20:11:11 -04:00
Kevin Ring 92312deb78 Correctly detaches rasters when removing an overlay. 2021-03-16 18:24:51 +11:00
Marco Hutter a713a64601 Add URL to error messages 2021-03-15 17:59:08 +01:00
Kevin Ring fd1f4f5d13 Fix test failure and formatting. 2021-03-15 22:13:40 +11:00
Kevin Ring ed263443f0 Fix external tileset content. 2021-03-15 15:39:00 +11:00
Kevin Ring c4e7406e22 Remove context property from TileContentLoadInput.
But ExternalTilesetContent is mostly disabled right now.
2021-03-15 14:08:18 +11:00
Kevin Ring 15e4e56d1c Don't resolve tile URL unnecessarily early. 2021-03-12 17:20:38 +11:00
Samuel Vargas 94c77dd89e
Merge tag 'post-clang-format' into gltf-writer-clang-format
The commit that ran clang-format on the entire codebase and made no other changes.
2021-03-09 16:36:39 -05:00
Samuel Vargas 2678459aea
Merge tag 'pre-clang-format' into gltf-writer-clang-format
The last commit before we ran clang-format on the entire codebase
2021-03-09 16:31:49 -05:00
Marco Hutter e4d9a1ced9 Merge tag 'post-clang-format' into handle-images-404-merge-own
The commit that ran clang-format on the entire codebase and made no other changes.
2021-03-09 19:34:15 +01:00
Marco Hutter 890e46b930 Merge tag 'pre-clang-format' into handle-images-404-merge-own
The last commit before we ran clang-format on the entire codebase
2021-03-09 19:30:34 +01:00
Shehzan Mohammed 8a2957d32f Run clang format 2021-03-08 20:39:46 -05:00
Shehzan Mohammed ef8bf72710 Fix missing header files 2021-03-08 20:30:50 -05:00
Marco Hutter c721f01541 Finally, no more sstream 2021-03-08 14:59:33 +01:00
unknown 26b62c68a4 prevent crash when changing imagery 2021-03-07 17:34:14 -05:00
Marco Hutter b4564edb00 Handle the case that images are 404 2021-03-07 19:47:20 +01:00
Samuel Vargas 506f76c34b
Use std::byte for image.cesium.pixelData 2021-03-05 10:04:10 -05:00
Samuel Vargas a582c7c32f
Remove unused exception variable to prevent MSVC from screaming 2021-03-05 09:59:31 -05:00
Samuel Vargas f1076ea0ee
Rename getNumberOrDefault to getSafeNumberOrDefault 2021-03-05 07:41:17 -05:00
Samuel Vargas c4f6025420
Add integer support to JsonValue
This also fixes a narrowing conversion bug. Previously if
a type that was larger than 2^53 was stored in a JsonValue
it would be silently casted into a double, causing an unexpected
precision loss. This changes JsonValue to use the largest signed,
unsigned, or floating point value available to support both types
of Numbers.

Also updates GSL version because they added a narrowing cast
function and we use that for safe type casting.
2021-03-05 07:41:15 -05:00
Kevin Ring 589a0098fc
Merge pull request #145 from CesiumGS/install
Add ability to CMake install cesium-native
2021-03-05 16:03:29 +11:00
Kevin Ring c5e398275b Exclude extern directory.
But still (mostly?) install the right stuff.
2021-03-05 08:09:53 +11:00
Marco Hutter f1078aeb4c Use bytes for raw data 2021-03-04 17:22:38 +01:00
Shehzan Mohammed 755f16674b Merge branch 'vs2017' into install 2021-03-03 21:14:36 -05:00
Kevin Ring c4da7eefd2 Fix build in VS2017. 2021-03-04 13:08:14 +11:00
Shehzan Mohammed 3faff010d7 Installing thirdparty deps working on linux 2021-03-03 20:47:31 -05:00
Kevin Ring bec2f0ca4c Don't mark libraries private (for now) 2021-03-04 10:46:56 +11:00