Commit Graph

551 Commits

Author SHA1 Message Date
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 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 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
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
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
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
Marco Hutter f1078aeb4c Use bytes for raw data 2021-03-04 17:22:38 +01:00
Kevin Ring c4da7eefd2 Fix build in VS2017. 2021-03-04 13:08:14 +11:00
Kevin Ring 4d31c3ef62
Merge pull request #139 from CesiumGS/ion-ui-oauth2
Add CesiumIonClient library
2021-03-02 17:55:44 +11:00
Kevin Ring 5440524287
Merge pull request #140 from CesiumGS/offline-update-view
Add updateViewOffline method to wait for all tiles to finish loading
2021-03-02 15:24:45 +11:00
unknown 76652baa56 add doc for updateViewOffline and properly determine if tiles are not rendered 2021-03-01 14:43:05 -05:00
unknown a32ae4b9c6 Merge branch 'master' into selection-test 2021-03-01 09:53:06 -05:00
unknown 5ff36f52cc Merge branch 'master' into offline-update-view 2021-02-26 15:41:04 -05:00
Kevin Ring a69628b785 Merge remote-tracking branch 'origin/master' into ion-ui 2021-02-24 12:59:44 +11:00
Kevin Ring d6d57eb881 Merge remote-tracking branch 'origin/master' into disk-cache 2021-02-23 23:15:48 +11:00
Kevin Ring 1644a3b2f6 Don't pass reference to local. 2021-02-23 22:56:40 +11:00
Marco Hutter 39e03313a8 Do not capture this for lambda 2021-02-22 16:20:03 +01:00
Marco Hutter b836d9232d No move semantics for span, fixed
Something's wonky with my IDE.
2021-02-22 15:40:30 +01:00
Marco Hutter aeb585220d No move semantics for span 2021-02-22 15:39:33 +01:00
Marco Hutter 15e6cd0f30 Signature update to match change from GitHub commit 2021-02-22 15:35:58 +01:00
Marco Hutter 7e54bafd1d
Use reference to pointer where possible
Co-authored-by: Kevin Ring <kevin@kotachrome.com>
2021-02-22 14:49:33 +01:00
Kevin Ring 313136445b Make requestAsset return a Future. 2021-02-21 23:13:42 +11:00
Kevin Ring fbbe928b68 Merge remote-tracking branch 'origin/master' into disk-cache 2021-02-19 11:54:26 +11:00
Marco Hutter 741f2c1478 An attempt to clarify and simplify the input 2021-02-18 22:38:35 +01:00
Marco Hutter d852e5a2bb Added error messages for tile content loading
Fewer TODOs...
2021-02-18 22:05:09 +01:00
Marco Hutter 2bf174d6f6 Merge remote-tracking branch 'origin/master' into loader-interface
# Conflicts:
#	Cesium3DTiles/include/Cesium3DTiles/TileContentFactory.h
2021-02-18 21:56:45 +01:00
Marco Hutter 2f47dee0e3 Cleanups for loader interface
Most members of TileContentLoadInput no longer references.
Minor comment updates.
2021-02-18 21:50:29 +01:00
unknown 8153de6f89 add updateViewOffline function to wait for all tiles finishing loading 2021-02-18 10:47:56 -05:00
Kevin Ring 5c0caa966b Merge remote-tracking branch 'origin/master' into selection-test 2021-02-17 13:47:44 +11:00
Kevin Ring b82931d875 Don't crash if TMS server doesn't return a response. 2021-02-16 21:05:23 +11:00
Kevin Ring f8aa3d19df Only allow raster overlays on terrain (for now). 2021-02-15 21:32:43 +11:00
Kevin Ring ce3197df2e Merge remote-tracking branch 'origin/off-by-one' into ion-ui 2021-02-15 08:54:59 +11:00
Kevin Ring 7280d65ed4 Fix off-by-one error and likely memory leak. 2021-02-15 08:50:10 +11:00
unknown 49c734a970 prevent distance squared from going to negative 2021-02-12 13:29:22 -05:00
unknown 4a87a0e8e9 add tests for external tileset 2021-02-10 15:49:14 -05:00
Kevin Ring d10bd2a16d Move JsonHelps to CesiumUtility, at ion "me" service. 2021-02-09 22:50:18 +11:00
Marco Hutter 40002daaa3 Initial draft of tile content loader interface 2021-02-08 18:58:58 +01:00
Kevin Ring f7caafa626 Add CesiumIonClient library.
Also move Uri to CesiumUtility, and add a `post` method to
`IAssetAccessor`.
2021-02-08 21:59:53 +11:00
Kevin Ring 9b810bf02e Initialize LoadResult fields. 2021-02-05 15:55:17 +11:00
Kevin Ring d1940b24b2 Remove debug code.
And hopefully fix Linux build problems.
2021-02-05 15:23:41 +11:00
Kevin Ring 9aa328ac78 Integrate overlay loading into tile loading process. 2021-02-04 17:06:52 +11:00
Kevin Ring 3e238cec80 Don't load too many raster overlays simultaneously. 2021-02-04 16:38:09 +11:00
Kevin Ring 54439677e8 Merge remote-tracking branch 'origin/master' into disk-cache-reporting 2021-02-03 17:35:11 +11:00
Marco Hutter 22c7883f24 Merge remote-tracking branch 'origin/master' into camera-refactoring 2021-02-02 15:41:05 +01:00
Kevin Ring 6bfccf27cb
Merge pull request #120 from CesiumGS/ion-tileset-credits
Parse and collect Ion tileset credits
2021-02-02 23:32:43 +11:00
unknown 59a927d6f4 Merge branch 'master' into disk-cache 2021-02-02 00:11:45 -05:00
Nithin Pranesh f160fce6a8 per-tileset credits now being parsed from json and shown 2021-02-01 23:45:12 -05:00
Kevin Ring db7b5226f6 Merge remote-tracking branch 'origin/master' into disk-cache 2021-02-02 15:07:05 +11:00
Nithin Pranesh 2255bfc75f Merge branch 'master' into ion-tileset-credits 2021-02-01 22:23:36 -05:00
Nithin Pranesh c54874e797 WIP fixed missing tileset credits 2021-02-01 22:17:18 -05:00
Kevin Ring c3d35cfc39
Merge pull request #106 from CesiumGS/gltf
Replace tinygltf
2021-02-02 11:17:19 +11:00
Marco Hutter 37706adc76 Moved CullingVolume to CesiumGeometry
Also removed const of members
2021-02-01 16:12:26 +01:00
Marco Hutter 139ab082a0 Draft of a function to create a ViewState 2021-01-31 20:07:20 +01:00
baothientran 49a7393a78
Merge pull request #103 from CesiumGS/composite
Add very basic support for composite (CMPT) tiles
2021-01-28 16:33:50 -05:00
Marco Hutter fe6640f54c Omit suffix for radians 2021-01-28 16:20:11 +01:00
Marco Hutter f28ea86648 No underscores for public members 2021-01-28 15:38:46 +01:00
Marco Hutter ac52b0a361 Renamed Frustum to CullingVolume 2021-01-27 21:05:51 +01:00
Kevin Ring d61295c713 Merge remote-tracking branch 'origin/gltf' into cmpt 2021-01-27 16:06:47 +11:00
Kevin Ring 7b47c7eaf3 Merge remote-tracking branch 'origin/master' into gltf 2021-01-27 15:14:56 +11:00
Marco Hutter 731b0a8515 Refactored Camera into ViewState
Renamed the structure from Camera to ViewState. Removed properties
that had not been used and functions that had not been called. Made
it as const as possible (as it is not supposed to be modified
during traversal). Extracted Frustum structure from the four
planes.
2021-01-26 22:10:44 +01:00
Kevin Ring 3d743096d7
Merge pull request #99 from CesiumGS/optional-frustum-cull
Added option to disable frustum / fog culling
2021-01-26 23:04:35 +11:00
Kevin Ring 4eff25045a Fix crash caused by runaway refinement. 2021-01-25 17:41:32 +11:00