Commit Graph

609 Commits

Author SHA1 Message Date
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
Kevin Ring 34bbd2aa31 WIP cmake install. 2021-03-04 09:48:09 +11:00
Samuel Vargas 5d03477551
Rearchitecture cesium-native's CMake structure
This is necessary to support using cesium-native as submodule in
in asset-pipeline

- `draco` and `sqlite3` are guarded with if target blocks to allow
  asset-pipeline to provide their own version of the targets.
- Tests are now a dedicated target that clients don't have to build
- Test sources / headers are now a target property instead of using the $<BUILD_INTERFACE... hack
- Added common include variables in extern/CMakeLists.txt
- Defined `RAPIDJSON_HAS_CXX11_RVALUE_REFS` for move support for RapidJson
- Private include directories are automatically extracted via CMake magic
  for use in catch tests
- Globbing is now wrapped in a dedicated function that allows one to use
  CONFIGURE_DEPENDS depending on their preferences (defaults to OFF)
  to retain the old behavior.
2021-03-02 14:28:04 -05:00
Kevin Ring 8d2e5f3743 Add missing post method. 2021-03-02 18:06: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 c5ee939c2d format space 2021-03-01 11:13:18 -05:00
unknown 86ca793fb5 return empty class for IPrepareRendererResource 2021-03-01 11:09:51 -05:00
unknown 8d0c6a35c0 impl new mock interface for request accessor 2021-03-01 10:44:55 -05:00
unknown a32ae4b9c6 Merge branch 'master' into selection-test 2021-03-01 09:53:06 -05:00
unknown f0bc863b1d Merge branch 'selection-test' of https://github.com/CesiumGS/cesium-native into selection-test 2021-02-26 18:30:57 -05:00
unknown 2b93e11f37 address review pr 2021-02-26 18:22:27 -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 f0414fb674 Removed const for fields
Also, this tab vs. spaces thing...
2021-02-22 15:08:18 +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 82a02f5295
Merge branch 'master' into doxygen-cleanups 2021-02-17 16:51:46 +11:00
Kevin Ring 5c0caa966b Merge remote-tracking branch 'origin/master' into selection-test 2021-02-17 13:47:44 +11:00
Marco Hutter 7ce97c2aa2
Update Cesium3DTiles/test/TestCreditSystem.cpp
Co-authored-by: Nithin Pranesh <nithinpra7@gmail.com>
2021-02-16 15:37:23 +01:00
Kevin Ring b82931d875 Don't crash if TMS server doesn't return a response. 2021-02-16 21:05:23 +11:00
Marco Hutter 70a353f81d Basic credit system test 2021-02-16 01:12:37 +01:00
Marco Hutter 67dce23a30 Doxygen fixes 2021-02-15 17:14:49 +01: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 e4b8b12a95 fix compiler warning 2021-02-10 19:13:20 -05:00
unknown 09e10a3033 remove TODO comment 2021-02-10 19:05:53 -05:00
unknown afe7eb69ff fix compiler warning 2021-02-10 19:03:14 -05:00
unknown 59c45604f1 register content type 2021-02-10 18:18:49 -05:00
unknown 4a87a0e8e9 add tests for external tileset 2021-02-10 15:49:14 -05:00
unknown 3e29cc684f add tree anotation for 3D tile 2021-02-09 22:32:47 -05:00
unknown bbca6fa7d8 add simples async system 2021-02-09 22:27:08 -05:00
unknown f139ca92a6 auto generating test data macro 2021-02-09 17:09:57 -05:00
Kevin Ring d10bd2a16d Move JsonHelps to CesiumUtility, at ion "me" service. 2021-02-09 22:50:18 +11:00
unknown d7dca0f66d add test for ancestor meet sse 2021-02-08 16:45:20 -05:00
Marco Hutter 40002daaa3 Initial draft of tile content loader interface 2021-02-08 18:58:58 +01:00
unknown 7b15dc5b37 add tests for selection algorithm 2021-02-08 10:54:03 -05: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
unknown 0749afaff6 add more mock classes for asset requests 2021-02-06 16:25:06 -05: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
unknown 61dfa20b9c WIP impl mock for external tileset 2021-02-04 16:47:12 -05: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
Marco Hutter 6c691358fa Re-introduced getters for ViewState properties 2021-01-31 19:55:27 +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 bd0aa1d2bf Fixed wrong include path
I think this shouldn't have compiled in the previus form.
Have to keep an eye on that...
2021-01-28 16:55:20 +01: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 c4cf298104 Removed unused functions from ViewState 2021-01-27 21:22:45 +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
Marco Hutter 0999ac2dfc Basic comments for TraversalDetails and FrameState 2021-01-26 20:47:30 +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
Kevin Ring 06fe04dd16 Preserve precision in upsampled tile rectangles. 2021-01-22 18:49:37 +11:00
Kevin Ring dff2d63b2f Add name to glTF model to aid debugging. 2021-01-21 23:40:47 +11:00
Kevin Ring 7a2b097525 Support multiple b3dms in a cmpt. 2021-01-21 18:45:09 +11:00
Nithin Pranesh fb3d8369e8 More accurate variable name
for the count of tiles that have been visited this frame that would have otherwise been culled.
2021-01-20 22:56:49 -05:00
Kevin Ring 133b72c4c5 Merge remote-tracking branch 'origin/composite' into cmpt 2021-01-21 14:33:22 +11:00
Kevin Ring c3fd8fbce7 Merge remote-tracking branch 'origin/unknown-content' into composite 2021-01-21 10:36:57 +11:00
Kevin Ring 918ca02af5 Merge remote-tracking branch 'origin/master' into unknown-content 2021-01-21 10:27:02 +11:00
Kevin Ring d75c55e705 Merge remote-tracking branch 'origin/master' into gltf 2021-01-20 20:43:26 +11:00
Kevin Ring 56feb198df List of errors and warnings instead of a single string for each. 2021-01-20 19:32:14 +11:00
Kevin Ring b8bfe33388 More signed/unsigned warnings. 2021-01-20 17:58:02 +11:00