Commit Graph

609 Commits

Author SHA1 Message Date
Kevin Ring 3fe36a7c7b Fix GCC build problems. 2021-01-20 17:30:01 +11:00
Kevin Ring 8fdc7518b9 Fix Clang problems. 2021-01-20 17:25:00 +11:00
Kevin Ring 5d069f204d Fix test failures. 2021-01-20 15:03:19 +11:00
Kevin Ring 614b59db21 Remove GltfAccessor and GltfWriter. 2021-01-20 00:15:57 +11:00
Kevin Ring 522fc6f84f
Fix typo in url 2021-01-19 23:00:17 +11:00
Marco Hutter 6460f7ca60 Slightly less ugly structure for error case 2021-01-17 14:25:26 +01:00
Kevin Ring 52dbaf2690 Merge remote-tracking branch 'origin/master' into gltf 2021-01-17 22:17:40 +11:00
Kevin Ring 11ea3103b0 Optional properties, thorough initialization. 2021-01-17 00:18:00 +11:00
Kevin Ring 32cbbc501b Fix misleading comment. 2021-01-15 22:46:30 +11:00
Kevin Ring 5dd136b26b Add very basic support for CMPT tiles. 2021-01-15 22:44:10 +11:00
Kevin Ring ddd813d2da JSON open `{` isn't necessarily the first character. 2021-01-15 16:30:29 +11:00
Kevin Ring 24382bf20a More sensible structure. 2021-01-15 16:17:06 +11:00
Kevin Ring b0fd41fd45 Handle unknown tile content better.
Don't assume anything unknown is JSON.

Also don't crash due to a missing TileContext when JSON parsing fails.
2021-01-15 15:53:46 +11:00
Kevin Ring 51a33ab63f Revert "Fix crash when adding a new raster overlay."
This reverts commit 7975f95795.
2021-01-15 14:47:24 +11:00
Kevin Ring 7975f95795 Fix crash when adding a new raster overlay. 2021-01-15 14:43:31 +11:00
Marco Hutter 7ff8c61f1a An attempt to handle errors when creating tile providers... 2021-01-14 22:05:05 +01:00
Marco Hutter 2e5d631a38 Added error message for exception 2021-01-14 22:04:35 +01:00
Marco Hutter d6754a8683 Added warning for unknown magic/content types 2021-01-14 22:04:11 +01:00
Marco Hutter f6e902928c Added warnings for legacy B3DM 2021-01-14 22:02:01 +01:00
Marco Hutter 4e210229ed Removed obsolete TODOs for error handling 2021-01-14 22:01:06 +01:00
Nithin Pranesh a954d38b17 !disableCulling -> enableCulling 2021-01-14 14:59:02 -05:00
Nithin Pranesh 5e36308572 Merge branch 'master' into optional-frustum-cull 2021-01-14 10:39:34 -05:00
Nithin Pranesh 38c5b02c55 Slight simplification of distance calculation 2021-01-14 09:38:01 -05:00
Kevin Ring 6d9e83447b Merge remote-tracking branch 'origin/master' into gltf 2021-01-14 23:46:26 +11:00
Kevin Ring 1f62c98e4e Fix two small behavior changes. 2021-01-14 21:34:32 +11:00
Kevin Ring 82574ac030 More tileset tweaks. 2021-01-14 20:52:50 +11:00
Kevin Ring 2d880fee71 Clean up a few things. 2021-01-14 18:32:32 +11:00
Kevin Ring b39229e02e Merge remote-tracking branch 'origin/master' into tileset-helper-functions-again 2021-01-14 17:52:34 +11:00
Kevin Ring edb8fe209b Add extras, reactivate support for RTC_CENTER. 2021-01-14 17:44:19 +11:00
unknown 4718e483f6 create connection for each transaction. Use shared_ptr for completed request 2021-01-13 21:32:27 -05:00
Nithin Pranesh 8b4af30717 culled sse, preload siblings fix, semantics improvement 2021-01-13 15:50:33 -05:00
Nithin Pranesh ca40059b41 WIP optional SSE for culled tiles 2021-01-13 10:57:05 -05:00
Nithin Pranesh ab519062b3 Exposed disableFogCulling in TilesetOptions 2021-01-12 16:17:49 -05:00
Kevin Ring 6a6d2d94de Draco loading. 2021-01-12 21:40:35 +11:00
Nithin Pranesh 2a2450b486 Exposed the tilesVisitedOutsideFrustum count in ViewUpdateResult 2021-01-11 15:13:51 -05:00
Nithin Pranesh 5989fa6473 Fixed disableFrustumCulling default and description 2021-01-11 11:50:36 -05:00
unknown b6eb48dbc9 Merge branch 'master' into disk-cache 2021-01-08 16:53:40 -05:00
Kevin Ring 32f0c371ea Raster image loading. 2021-01-08 23:10:27 +11:00
Kevin Ring 2ec456e6ac Fix test compiler error. 2021-01-08 14:21:58 +11:00
Kevin Ring 08d173d573 Use CesiumGltf instead of tinygltf. 2021-01-08 14:09:08 +11:00
Nithin Pranesh 96fcdf1eef Removed TODO comment 2021-01-07 12:29:41 -05:00
Nithin Pranesh abe7f4fb1f Added option to disable frustum cull
Screen-space error computations and refinement are disabled outside the frustum.
2021-01-07 11:58:14 -05:00
Kevin Ring 9b1af2bde6
Merge pull request #97 from CesiumGS/upsample-skirt
Create skirt for upsampled tile
2021-01-07 12:17:30 +11:00
unknown 073b924a5d use geodetic normal of the edge vertex to drop the skirt 2021-01-06 19:55:28 -05:00
unknown 20fa194553 remove EdgeVertex constructor and use list initialization instead 2021-01-06 12:04:13 -05:00
unknown ab4e346d9a format space 2021-01-06 11:53:26 -05:00
unknown a29aa6d5ce use struct instead of std::pair for Edge vertex 2021-01-06 11:50:10 -05:00
unknown 4295cf43cd use reference for EdgeIndices 2021-01-06 11:36:55 -05:00
unknown 523b0c05fa use geodetic normal to drop the skirt 2021-01-06 11:28:32 -05:00
unknown f319b63d45 Merge branch 'upsample-skirt' of https://github.com/CesiumGS/cesium-native into upsample-skirt 2021-01-06 11:10:44 -05:00
unknown 56fffe9ca3 use IsNumber() to check for int or double for gltf value 2021-01-06 11:10:37 -05:00
unknown 7711f71eb8 use const for IAssetRequest interface 2021-01-06 10:53:00 -05:00
Kevin Ring b654781b10 Merge remote-tracking branch 'origin/master' into upsample-skirt 2021-01-05 15:01:58 +11:00
Kevin Ring b3cd2f17f2
Fix typo: _CESIUM_OVERLAY -> _CESIUMOVERLAY
I noticed this typo while reviewing #97. If we ever had more than one set of raster overlay texture coordinates, they'd be incorrectly copied to the upsampled children.
2021-01-05 14:18:39 +11:00
Kevin Ring ae16a4888f Separate files for glTF reader PoC. 2021-01-04 17:41:37 +11:00
unknown 1428b555ce add test for upsampled skirts 2021-01-03 17:01:21 -05:00
unknown edcf99fad1 add test for upsampling tile without skirt 2021-01-02 23:04:45 -05:00
Kevin Ring c29069f613 Some very broken experiments. 2021-01-02 22:23:04 +11:00
Kevin Ring e8eb102663 Merge remote-tracking branch 'origin/master' into gltf 2020-12-29 14:04:18 +11:00
Kevin Ring c19d74d1f1
Merge pull request #81 from CesiumGS/tileset-credits
Content Attribution
2020-12-27 23:09:17 +11:00
Nithin Pranesh 628efb3cfc Moved HtmlAndLastFrameNumber struct into private section. 2020-12-24 00:41:16 -05:00
unknown 909b1397c6 fix implicit conversion again 2020-12-23 18:50:23 -05:00
unknown 2e24f04b7a fix implicit conversion again 2020-12-23 18:40:45 -05:00
unknown 3109df262f fix implicit conversion again 2020-12-23 18:30:22 -05:00
unknown 381a7d74ce fix type implicit conversion and unused function 2020-12-23 17:07:14 -05:00
unknown 00e22b68de explicitly create std::string from raw string for tinygltf::Value 2020-12-23 16:40:11 -05:00
unknown 9a3b16f7af indentations to spaces 2020-12-23 16:11:10 -05:00
unknown c1c1408160 add option to expose private src for other libraries. Add tests for SkirtMeshMetadata 2020-12-23 15:57:08 -05:00
Nithin Pranesh aa81efdaac base64 encoded Bing logo credit 2020-12-23 15:27:26 -05:00
Nithin Pranesh db292ea44c Bing credits fixes / improvements + json safe read 2020-12-23 14:13:28 -05:00
Nithin Pranesh 86144b1c0f Tileset suggestions 2020-12-23 12:07:08 -05:00
Nithin Pranesh 389ee0be49 CreditSystem include <algorithm> 2020-12-23 12:01:05 -05:00
Nithin Pranesh ad6d1ce045 CreditSystem suggestions 2020-12-23 11:40:10 -05:00
Nithin Pranesh 0fb213b85f Extraneous includes, forward declarations, Credit is now struct 2020-12-23 09:44:53 -05:00
Marco Hutter ea803db2be Made function static, no "this" in worker thread 2020-12-23 15:11:08 +01:00
Nithin Pranesh 861f1317d2 Minor Bing JSON reading tweak 2020-12-23 00:55:46 -05:00
Nithin Pranesh fa3ceb0ddd Fixed potentially unsafe JSON reads for Bing credits. 2020-12-23 00:20:48 -05:00
Kevin Ring 306886b950 Merge remote-tracking branch 'origin/master' into gltf 2020-12-23 14:55:52 +11:00
unknown dfc5f938e0 add option to CMakeList to expose private header for testing 2020-12-22 18:39:56 -05:00
Nithin Pranesh 83249c0654 Removed unused lambda capture 2020-12-22 18:11:57 -05:00
unknown c4ccdbab57 fix function signature 2020-12-22 17:41:00 -05:00
Nithin Pranesh 36d93d5221 Moved CreditSystem pointers from RasterOverlay to RasterOverlayTileProvider. 2020-12-22 17:38:51 -05:00
unknown b4b18e3230 remove longitude and latitude offset for upsampled skirt 2020-12-22 17:09:15 -05:00
unknown be25d1222b move functions that deserialize skirt mesh extras to separate file 2020-12-22 14:39:11 -05:00
Nithin Pranesh e57a0f00f3 Small recommended changes
Removed redundant shared_ptr in Tileset. Added more detailed documentation for the CreditSystem in TilesetExternals. Removed vestigial include in ViewUpdateResult.
2020-12-22 14:20:35 -05:00
Nithin Pranesh 4644410063 Fix -Werrors in CreditSystem 2020-12-22 13:50:34 -05:00
unknown 38431fb237 calculate skirt height for upsampled tile 2020-12-22 13:19:30 -05:00
Nithin Pranesh 6d86b898df Use vectors instead of sets/maps
According to discussions, linear scans in this context will be cheaper than per-frame heap allocation using sets. Credit is simplified into a typedef now.
2020-12-22 13:16:48 -05:00
Marco Hutter c5104cec06 Removed helper function that is unused after merge 2020-12-22 16:05:54 +01:00
Marco Hutter 6fe66c1911 Merge remote-tracking branch 'origin/master' into tileset-helper-functions-again
# Conflicts:
#	Cesium3DTiles/src/Tileset.cpp
2020-12-22 16:04:12 +01:00
Marco Hutter 4012e8d95b Some member initializations
At least pointers should not remain uninitialized.
2020-12-22 14:59:46 +01:00
Marco Hutter 8fc5433c8e Minor helper functions
Mainly using the JsonHelpers, and adding a new one
2020-12-22 14:59:15 +01:00
Marco Hutter 86ee4c64ac Removed cast that upset clang
Maybe, one day, they will be able to agree on what
is right and what is wrong.
2020-12-22 14:06:00 +01:00
Kevin Ring d8b586e280 Add some logging, pass by const ref. 2020-12-22 12:57:16 +11:00
Kevin Ring 7fd397734d Fix gcc compiler warning. 2020-12-22 12:33:58 +11:00
Kevin Ring fcbfc4e176 Merge remote-tracking branch 'origin/master' into skirt 2020-12-22 12:25:22 +11:00
Nithin Pranesh 7ef66bb523 Merge branch 'master' into tileset-credits 2020-12-21 20:16:36 -05:00
Kevin Ring c8ececa0f6 Use multithreaded allocator with tinygltf/RapidJSON. 2020-12-22 12:04:30 +11:00
Marco Hutter e67ca6dedc An attempt to repeat the previous changes
This had originally been a sequence of commented commits
in the ""tileset-helper-functions" branch, but the changes
from logging and rapidjson made the other branch unmergeable.
2020-12-21 22:21:00 +01:00
unknown 7bdf6f27ec fix mismatch type 2020-12-21 13:53:41 -05:00
unknown 931ae39c47 add skirt for upsample tile 2020-12-21 13:41:21 -05:00
Nithin Pranesh bc434f81bf WIP convert to rapidjson 2020-12-21 10:40:00 -05:00
Nithin Pranesh 951cc35ef3
Merge branch 'master' into tileset-credits 2020-12-21 08:15:29 -05:00
Kevin Ring 587be7b287 Remove debug code. 2020-12-21 23:00:09 +11:00
Kevin Ring 83e4955d1e Remove some debug code. 2020-12-21 22:34:53 +11:00
Kevin Ring 61ba624f90 Merge remote-tracking branch 'origin/master' into rapidjson 2020-12-21 22:20:09 +11:00
Kevin Ring 360204f639 Merge remote-tracking branch 'origin/master' into spdlog-integration 2020-12-21 17:50:28 +11:00
Kevin Ring 251d2d46f6 Finish replacing nlohmann with RapidJSON. 2020-12-21 17:41:56 +11:00
Kevin Ring f4c932dab6 Use RapidJSON instead of nlohmann for tinygltf and tileset.json. 2020-12-21 16:15:51 +11:00
Nithin Pranesh 1a27693199 Per frame credits aggregation moved to CreditSystem 2020-12-20 22:01:08 -05:00
Nithin Pranesh f6ff51a0d1 Fixed -Werror unused value 2020-12-20 18:08:07 -05:00
Nithin Pranesh fdd9183334 Added missing documentation 2020-12-20 17:38:49 -05:00
Nithin Pranesh 1ca85e9274 Credit operator overloads for set functions. 2020-12-20 17:07:22 -05:00
Nithin Pranesh cbba00fd9c Made Credit into struct 2020-12-20 16:08:02 -05:00
Nithin Pranesh 54f0884c1c Refactored from Credit to CreditSystem 2020-12-20 15:46:59 -05:00
Nithin Pranesh bf883da228 WIP Credit System 2020-12-18 13:34:44 -05:00
Kevin Ring 817b7ed7ea Merge remote-tracking branch 'origin/master' into gltf 2020-12-18 17:28:06 +11:00
Kevin Ring 195bb8f71b Fix problems when using libc++. 2020-12-18 14:29:12 +11:00
unknown e0de5a9189 format space to tab 2020-12-17 17:06:07 -05:00
Nithin Pranesh 1f327a0519 Export vector of Credits
Instead of preformatted string.
2020-12-17 16:26:36 -05:00
Nithin Pranesh 941a763a54 per-RasterOverlay credit
RasterOverlay now has a virtual getCredit function. Bing and TMS now implement this function. IonRasterOverlay implements this function by in turn calling getCredit on whichever type of RasterOverlay it creates. To do this, IonRasterOverlay now has to save the pointer to whichever type of RasterOverlay it creates.
2020-12-17 15:24:10 -05:00
unknown 0867e28783 convert indices type to size_t to prevent overflow 2020-12-17 15:23:55 -05:00
unknown 7c3f7a4544 add test to check normal for skirt 2020-12-17 15:09:39 -05:00
unknown 0f3b753066 test normal with more significant number 2020-12-17 13:29:00 -05:00
unknown 41c6147656 add test to make sure normals are generated correctly 2020-12-17 13:20:54 -05:00
unknown 6d2979e018 auto generate normal when oct-normal doesn't exist 2020-12-17 11:39:24 -05:00
Kevin Ring f8b623b062 spdlog.h -> spdlog-cesium.h 2020-12-17 18:31:28 +11:00
Kevin Ring 3f28cb1775 Cleanup TilesetExternals. 2020-12-17 17:25:54 +11:00
Kevin Ring 8dff0312cc Fix Linux warnings. 2020-12-17 16:53:46 +11:00
Kevin Ring 2087b76956 Remove spdlog warning disablement (probably temporarily). 2020-12-17 16:37:17 +11:00
Kevin Ring 63109a5fbb Use passed-in spdlog logger. 2020-12-17 16:30:33 +11:00
unknown 7299bb7417 refactor the calculation of quadtree maximum error into function 2020-12-16 15:37:45 -05:00
unknown 6bd4ad4db4 tab to spaces 2020-12-16 14:15:29 -05:00
unknown 3a56ae0434 add test for bad quantized mesh input 2020-12-16 13:53:00 -05:00
Nithin Pranesh 81a21c7eae Some fixes + move Bing credit coverage
Made some const correctness and reference passing fixes. Moved Bing specific functionality out of Credit. WIP per-RasterOverlay credit as opposed to the already completed Bing per-Tile credits. TODO move static functionality from Credit into a new CreditSystem.
2020-12-16 12:43:02 -05:00
Marco Hutter 3efd0a8113 An attempt to move spdlog to the interface 2020-12-16 18:22:58 +01:00
unknown da37ead0da check data boundary when parsing quantized mesh 2020-12-16 11:43:59 -05:00
Marco Hutter 4e77c372a8 Intermediate step of moving spdlog into interface 2020-12-16 17:23:06 +01:00
unknown e14d09a343 remove unused variable and fix const correctness 2020-12-16 10:41:53 -05:00
Nithin Pranesh 0920fbd3ee Fixed -Werrors on Linux 2020-12-15 16:32:00 -05:00
Nithin Pranesh 0717247cef Credit class + Bing tile credits
Created Credit class to represent attributions, their coverage areas, and automatically reject redundant credits. Added json credits extraction for Bing imagery. Made small additions to the raster tile and raster tile provider codes as needed to surface per-tile content attributions.
2020-12-15 15:02:33 -05:00
unknown 54b723ef7c fix type conversion 2020-12-14 16:16:28 -05:00
unknown ada651d639 add test that will turn 16 bit indices to 32 bit for quantized mesh 2020-12-14 16:08:58 -05:00
unknown 6a1df6b9f6 fix wrong type in Quantized mesh 2020-12-14 15:09:22 -05:00
unknown e5e545138d fix test for quantized mesh to have correct type conversion 2020-12-14 14:54:01 -05:00
unknown 1daec151e6 more type fix 2020-12-14 14:34:48 -05:00
unknown 64e5079410 fix type conversion error 2020-12-14 14:22:09 -05:00
unknown 84501919fd Merge branch 'master' into skirt 2020-12-14 13:49:13 -05:00
unknown 777b29e11d tab to spaces 2020-12-14 12:35:37 -05:00
unknown 3f97f8522f add test for oct-encoded normal and rearrange func in QuantizedMesh 2020-12-14 12:29:17 -05:00
Marco Hutter bdbf34fd8c Decoupling Logging functions and macros
Moved macros to internal header fow now. They might
be removed in the future.
2020-12-14 17:06:57 +01:00
unknown b4f60a4c9d explicit cast 2020-12-13 21:05:25 -05:00
unknown 6774b0d7a8 remove unused variable in QuantizedMesh 2020-12-13 20:47:07 -05:00
unknown b8dc2f727b format space 2020-12-13 20:29:01 -05:00
unknown 7c602f6bf5 add test for uint16_t and uint32_t quantized mesh 2020-12-13 19:48:04 -05:00
Marco Hutter bec35ebfdb Use spdlog wrapper header in Logging.cpp as well 2020-12-11 14:56:03 +01:00
Marco Hutter 28efdd80d7 Moving spdlog include to wrapper header
To ignore certain warnings/errors on GCC, and to
define the compile-time log level
2020-12-11 14:39:48 +01:00
Nithin Pranesh 268762584a WIP Per-tile credits surfacing
Need to replace placeholder credits with actual credits extracted from JSON.
2020-12-10 14:59:27 -05:00
unknown a545b26bf2 seperate code that parses quantized mesh into a seperate function 2020-12-10 12:44:22 -05:00
unknown f663a6e6b1 clean up code to make it nicer 2020-12-10 10:05:27 -05:00
Marco Hutter 04f16baa44 Merge remote-tracking branch 'origin/master' into spdlog-integration 2020-12-10 16:05:26 +01:00
unknown c40226f845 push the skirt out a little bit 2020-12-09 20:38:20 -05:00
Nithin Pranesh 9debaa6c08 Changed placeholder Bing credit. 2020-12-09 19:49:48 -05:00
Nithin Pranesh d3a9213283 WIP Changed bing placeholder text 2020-12-09 17:39:15 -05:00
unknown 9dd50c7f27 WIP add skirt for gltf 2020-12-09 12:50:35 -05:00
Nithin Pranesh 9b71cd9040 WIP Credit Attribution
Currently has placeholder credits in place for the two types of raster overlays. Currently uses dynamically aggregated strings list which is inefficient. Once a POC test can be done on the UI side, we should think about using a pre-loaded master list of credits and index into it on the fly.
2020-12-08 16:45:23 -05:00
Kevin Ring 7a0f1907af WIP transition to cgltf. 2020-12-08 14:02:09 +11:00
Nithin Pranesh 89b88f14ed Marked classes final
All classes marked final except for RasterOverlay, RasterOverlayTileProvider, ITaskProcessor, IPrepareRendererResources, and IAsset*.
2020-12-07 10:45:47 -05:00
Kevin Ring c285e6c38a Add constexpr and noexcept to Cesium3DTiles types. 2020-12-04 10:31:21 +11:00
Kevin Ring fc1de6a29f Try again at fixing this warning. 2020-12-03 16:44:53 +11:00
Kevin Ring 9107682e89 Fix warning. 2020-12-03 16:30:16 +11:00
Kevin Ring 1af982185b Protect GCC pragma from being seen by MSVC. 2020-12-03 15:56:37 +11:00
Kevin Ring fc0e171c03 Fix problems compiling with clang. 2020-12-03 10:23:17 +11:00
Kevin Ring 9a351caf8d Require Future::then and catch to be called on an rvalue ref. 2020-12-02 23:07:42 +11:00
Kevin Ring 08708b4e02 Merge remote-tracking branch 'origin/spdlog-integration' into promises-plus-spdlog 2020-12-02 18:19:58 +11:00
Kevin Ring 6a3b9d5e7b Move async bits to CesiumAsync library. 2020-12-02 16:34:41 +11:00
Kevin Ring 8462c4c1ca Add forward reference. 2020-12-02 15:04:47 +11:00
Kevin Ring 7dd2de5af7 Clean up AsyncSystem 2020-12-01 21:41:31 +11:00
Kevin Ring 5dc8d5ed86 And another warning. 2020-12-01 18:32:18 +11:00
Kevin Ring 9e8741b04d Yet another Linux warning. 2020-12-01 18:29:49 +11:00
Kevin Ring 8fcdee7903 Fix another warning on Linux. 2020-12-01 18:28:32 +11:00
Kevin Ring 18708df003 Fix some warnings on Linux. 2020-12-01 18:26:28 +11:00
Kevin Ring 991a85a7a5 Add ability to catch async errors. 2020-12-01 18:13:55 +11:00
Kevin Ring c5370444f1 Use updated method name. 2020-12-01 16:20:09 +11:00
Kevin Ring d4a3decb33 Use AsyncSystem for initial tileset requests. 2020-12-01 15:55:37 +11:00
Kevin Ring 2eabcfb1b1 Use AsyncSystem for upsampling. 2020-11-30 22:12:19 +11:00
Kevin Ring b1314ba7df Use AsyncSystem for Tile content loading. 2020-11-30 21:39:20 +11:00
Kevin Ring 4bb7f63883 Doc and other cleanup. 2020-11-30 15:33:33 +11:00
Kevin Ring 909e2ce6a1 Merge remote-tracking branch 'origin/master' into promises 2020-11-30 11:11:31 +11:00
Kevin Ring 6643e827dc Refresh tokens in external tilesets, too. 2020-11-28 16:50:02 +11:00
Kevin Ring d1fd6c4447 Improve stability. 2020-11-28 16:44:56 +11:00
Marco Hutter b10a50dc0b Pass logger as shared pointer
To be reviewed in terms of ABI compatibility
2020-11-27 12:59:41 +01:00
Marco Hutter 913ad095bd Preparing actual unreal integration.
Macros are bad. Period.
2020-11-26 17:34:01 +01:00
Marco Hutter 90d972d089 Fixes for errors from Linux build 2020-11-25 18:16:08 +01:00
Marco Hutter 08a7ecf68b Added basic interface for external loggers 2020-11-25 17:51:46 +01:00
Marco Hutter 3d8017c239 Updated logging header paths 2020-11-25 14:15:47 +01:00
Marco Hutter 307d9f6614 Moved logging header to right directory. 2020-11-25 14:13:55 +01:00
Marco Hutter 43b46a6887 Moved logging header to include (maybe temporarily)
Mainly intended for first tests, and for figuring out the
best way to register "external" loggers.
2020-11-25 14:11:18 +01:00
Kevin Ring 7f284ab837 Basics working again after changing everything. 2020-11-25 17:25:00 +11:00
Marco Hutter e682a9e29f Giving up on printf formatting
See changes in Tileset.h for a glimpse of the reasons.
2020-11-24 16:21:00 +01:00
Marco Hutter 766e412a31 Removed comments that are obsolete
According to draft PR feedback
2020-11-24 14:26:54 +01:00
Marco Hutter 2d0aafa94f Merge remote-tracking branch 'origin/master' into spdlog-integration 2020-11-24 14:19:41 +01:00
Kevin Ring 786f574376 WIP async/promise-like system. 2020-11-24 21:22:46 +11:00
Marco Hutter d5f1078699 Use string formatting in log messages 2020-11-23 16:11:37 +01:00
Kevin Ring b34fa3a359 Hold shared_ptrs to externals. 2020-11-23 17:22:53 +11:00
Marco Hutter 9045f7c954 First examples of possible logging and error handling 2020-11-19 18:14:56 +01:00
Kevin Ring 44129f8427 Load tiles in order of priority.
Using the priority metric from CesiumJS's terrain engine.
2020-11-19 22:39:32 +11:00
Kevin Ring 359b43cef5 Fix warning on linux. 2020-11-19 21:54:06 +11:00
Kevin Ring 169c9f5ac1 Remove commented-out line of code. 2020-11-19 21:46:14 +11:00
Kevin Ring 0b85d44b88 Faster and more accurate accounting of tile data size. 2020-11-19 21:39:15 +11:00
Kevin Ring 8dba8c0447 Restrict cache to a number of bytes instead of a number of tiles. 2020-11-19 18:00:36 +11:00
Kevin Ring 4733d9e433 Add value_type typedef to GltfAccessor.
Bringing it to par with the version in cesium-unreal.
2020-11-18 21:24:06 +11:00
Kevin Ring e056b441bc Add spdlog to build. 2020-11-18 20:20:08 +11:00
Marco Hutter afe99fcc68 Make sure that unloadContent is only executed once.
The main change is that unloadContent is no longer called
from the Tileset destructor (because it is already called
from the Tile destructor), and that it returns immediately
if the tile already is unloaded.

Also added noexcept for functions that are called from
the Tileset or Tile destructor.
2020-11-17 22:10:05 +01:00
Kevin Ring 1fe8bded5b
Merge pull request #48 from CesiumGS/basic-doxygen-fixes-part-4
Documentation for TileMapServiceRasterOverlayOptions
2020-11-17 12:54:41 +11:00
Kevin Ring 6badfe6a1c
Merge pull request #50 from CesiumGS/wait-for-rasters
Wait for raster loading before destroying tileset.
2020-11-17 11:30:49 +11:00
Kevin Ring ea7ac2d6c4 Wait for raster loading before destroying tileset. 2020-11-17 11:17:02 +11:00
Marco Hutter 7444fa0f50 Documentation for TileMapServiceRasterOverlayOptions
Essentially taken from TileMapServiceImageryProvider
of CesiumJS
2020-11-16 16:41:48 +01:00
Kevin Ring 81e46271dc
Merge pull request #46 from CesiumGS/avoid-empty-queries
Do not append empty queries to URLs
2020-11-16 11:01:12 +11:00
Marco Hutter b6746cc460 Do not append empty queries to URLs 2020-11-14 19:06:53 +01:00
Marco Hutter 83f62964ef Repeated adding documentation from previous commits.
Had to resolve some merge conflicts by just taking the
updated files and re-inserting the docs...
2020-11-13 17:09:06 +01:00
Marco Hutter f70daa5b03 Merge remote-tracking branch 'origin/master' into basic-doxygen-fixes-part-3
# Conflicts:
#	Cesium3DTiles/include/Cesium3DTiles/RasterMappedTo3DTile.h
#	Cesium3DTiles/include/Cesium3DTiles/RasterOverlay.h
#	Cesium3DTiles/include/Cesium3DTiles/RasterOverlayCollection.h
#	Cesium3DTiles/include/Cesium3DTiles/RasterOverlayTile.h
#	Cesium3DTiles/include/Cesium3DTiles/RasterOverlayTileProvider.h
#	Cesium3DTiles/include/Cesium3DTiles/Tile.h
2020-11-13 16:33:13 +01:00
Kevin Ring f914418aab Fix another warning. 2020-11-12 18:33:03 +11:00
Kevin Ring d7621c2ad8 Fix warning. 2020-11-12 18:22:16 +11:00
Kevin Ring 6b7023b1b5 Support for adding and removing overlays. 2020-11-12 17:37:57 +11:00
Marco Hutter e1e8782f00 Added last documentation. Minor fixes. 2020-11-11 16:25:35 +01:00
Marco Hutter e3f4c8419f Documentation for TileContext. Minor fixes. 2020-11-11 15:43:08 +01:00
Marco Hutter 0c6e5628e5 Documentation for Gltf and Raster parts 2020-11-10 19:14:05 +01:00
Kevin Ring 1375575813 WIP raster overlay improvements. 2020-11-11 00:34:20 +11:00
Kevin Ring eb96865d8a Remove explicit creation of overlay tile providers. 2020-11-10 17:04:19 +11:00
Kevin Ring 14ce79f387 More firmly attach RasterOverlayCollection to a Tileset. 2020-11-10 16:51:38 +11:00
Kevin Ring a251a22660 Show the tile(s) directly underneath the camera. 2020-11-10 09:40:46 +11:00
Kevin Ring 0e2e60b8b3 Avoid shadowed locals. 2020-11-09 15:38:53 +11:00
Kevin Ring 88d5e8acdd Refresh expired Cesium ion tokens. 2020-11-09 15:30:26 +11:00
Kevin Ring 0b54538ad8
Merge pull request #34 from CesiumGS/minor-code-fixes
Minor code fixes
2020-11-05 17:13:20 +11:00
Marco Hutter a98cac518e Updates from review 2020-11-04 14:40:08 +01:00
Kevin Ring b503702685 Don't let dodgy longitude at the poles affect bounding box. 2020-11-04 21:34:49 +11:00
Kevin Ring 7260ddca4d Merge remote-tracking branch 'origin/master' into upsample-bounding-volumes 2020-11-04 15:14:43 +11:00
Kevin Ring ad28cd3ef2 Merge remote-tracking branch 'origin/master' into minor-code-fixes 2020-11-04 13:11:45 +11:00
Kevin Ring 20af9ee5cc Compute tighter bounding volumes for upsampled tiles. 2020-11-04 13:11:01 +11:00
Marco Hutter 377769c3ce Corrected comment for loadContent 2020-11-04 00:13:51 +01:00
Marco Hutter 808b0cfd6a Minor code fixes.
Details summarized in PR.
2020-11-03 23:13:00 +01:00
Marco Hutter ecab20fe03 Documentation fixes from review comments 2020-11-03 18:31:27 +01:00
Marco Hutter 40dc4bd883
Apply basic suggestions from code review
This contains the changes that could be applied directly (typos and 
minor wording changes). Further suggestions will be addressed 
with a separate commit.

Co-authored-by: Kevin Ring <kevin@kotachrome.com>
2020-11-03 15:17:25 +01:00
Marco Hutter 13167efaed Merge remote-tracking branch 'origin/master' into basic-doxygen-fixes-part-2
# Conflicts:
#	Cesium3DTiles/include/Cesium3DTiles/ViewUpdateResult.h
2020-11-02 20:16:48 +01:00
Kevin Ring 3ee83b6451 Fix Tile member initialization order. 2020-11-02 23:03:49 +11:00
Kevin Ring 0a00cabba2 Eliminate a dodgy public field in Tile. 2020-11-02 22:43:16 +11:00
Kevin Ring af21783947 Don't put fogDensity in ViewUpdateResult. 2020-11-02 21:57:04 +11:00
Kevin Ring e2117fd158 Fog-based culling. 2020-11-02 16:25:43 +11:00
Marco Hutter 8ee683a39e Documentation fixes, pedantic mode. 2020-11-01 16:46:54 +01:00
Marco Hutter 599f2be5fb Documentation, mainly for Tile
Many functions are not supposed to be called by clients.
2020-10-31 19:15:43 +01:00
Marco Hutter bb26cbf75a Added missing parameter documentation 2020-10-31 17:44:16 +01:00
Marco Hutter b88026112f Documentation for basic classes. Minor fixes.
Documentation for some of the basic classes in CesiumGeospatial
(partially taken from CesiumJS).

Basic documentation for Tile IDs.

Minor fixes for links and formatting.
2020-10-31 17:38:12 +01:00
Marco Hutter c1440647f6 Merge remote-tracking branch 'origin/master' into basic-doxygen-fixes-part-2
# Conflicts:
#	Cesium3DTiles/include/Cesium3DTiles/Tile.h
2020-10-31 15:02:08 +01:00
Marco Hutter d1aa0debee Documentation, minor extensions and cleanups 2020-10-30 18:49:21 +01:00
Marco Hutter 35bc6a2a2c Documentation, mainly for tile and tile content 2020-10-30 17:13:04 +01:00
Kevin Ring 08f2467064 Improve distance calc to bounding regions, add selection stats. 2020-10-31 00:05:10 +11:00
Kevin Ring 69193affbb Improve quality of generated upsampled glTF. 2020-10-30 10:57:12 +11:00
Kevin Ring b9e69bf767 Fix a crash while upsampling.
This is a race condition that can manifest different ways. The
fundamental problem was that we were allowing a parent tile to be
unloaded while a child tile was being upsampled from it.
2020-10-29 13:07:36 +11:00
Kevin Ring 2f2cdd1074 Use glm funcs, avoid public cutouts field. 2020-10-29 10:25:51 +11:00
Marco Hutter 6a777929c1 Smaller doxygen fixes and extensions
Mainly minor fixes, mainly done while browsing over the
code while reading more about the usage and implementation
2020-10-28 19:37:42 +01:00
Kevin Ring 5d5b80ecb9 Make Rectangle a struct because it has public fields. 2020-10-28 16:01:55 +11:00
Kevin Ring a2dd5ca325 Merge remote-tracking branch 'origin/master' into cleanup 2020-10-28 15:57:50 +11:00
Kevin Ring 7d60a886ea
Update Cesium3DTiles/include/Cesium3DTiles/Camera.h 2020-10-28 15:53:18 +11:00
Kevin Ring 4294bbcf74
Update Cesium3DTiles/include/Cesium3DTiles/BingMapsRasterOverlay.h 2020-10-28 15:53:06 +11:00
Kevin Ring 37161098f4
Update Cesium3DTiles/include/Cesium3DTiles/BingMapsRasterOverlay.h 2020-10-28 15:52:57 +11:00
Kevin Ring c8fd4ee7a5 Add comments for TileID. 2020-10-27 17:23:28 +11:00
Kevin Ring 84193feb29 Remove unused code. 2020-10-27 16:25:43 +11:00
Marco Hutter d6fcfc0e04 Documentation for BoundingVolume 2020-10-26 23:50:34 +01:00
Marco Hutter b72787029d Documentation for namespaces
Without them, typedefs of these namespaces did not
appear in the documentation
2020-10-26 23:50:21 +01:00
Marco Hutter d424c601b3 Documentation for basic classes and TileSelectionState 2020-10-26 23:06:29 +01:00
Marco Hutter d9a72d1fd0 Documentation for Camera 2020-10-26 19:49:52 +01:00
Marco Hutter 2d32708ee8 Documentation for WGS84 and Bing overlay 2020-10-26 19:49:36 +01:00
Marco Hutter 140248c27f Documentation for BingMapsRasterOverlay 2020-10-26 19:14:09 +01:00
Marco Hutter 2b4cdc95ac First, basic doxygen fixes
Mainly fixing broken links from invalid "see" references,
missing classes, and basic elements that had been undocumented
2020-10-26 19:07:18 +01:00
Kevin Ring 8b3d517d92 Fix linux warning. 2020-10-22 22:39:06 +11:00
Kevin Ring b224f18ade Hacky way to create cutouts in tilesets with raster overlays. 2020-10-22 22:26:57 +11:00
Kevin Ring adb506899b Remove unused variable. 2020-10-21 20:16:04 +11:00
Kevin Ring e8a98f229b Unload load tiles in the coverage area. 2020-10-21 18:06:54 +11:00
Kevin Ring bb609188ad Add support for TileMapService imagery. 2020-10-21 17:52:42 +11:00
Kevin Ring b8fb87fa9e Fix generated texture coordinates near the anti-meridian. 2020-10-16 17:43:32 +11:00
Kevin Ring df76882422 Unload tiles prior to running the Tileset default constructor.
This avoids destruction order dependency between Tiles (which reference
RasterOverlayTiles) and RasterOverlayTileProviders owned by the Tileset.
2020-10-16 15:34:30 +11:00
Kevin Ring 0cf28b0299 Mark unloadable images as failed. 2020-10-15 18:28:01 +11:00
Kevin Ring b35c8beb45 Add n=z to Bing requests if it's not already there. 2020-10-15 02:09:44 +11:00
Kevin Ring 8f34c59aac Pass raster rectangle to detach. 2020-10-15 00:49:32 +11:00
Kevin Ring 2b34772f0e Fix linux compile errors. 2020-10-14 21:55:30 +11:00
Kevin Ring c27a5f0099 Remove unimplemented declaration. 2020-10-14 21:43:48 +11:00
Kevin Ring 61b23ca17a Ready vs loading imagery, use ancestors when rasters fail to load. 2020-10-14 21:40:54 +11:00
Kevin Ring 3b74c3d8c3 Fix BVs, load parent prior to upsampling. 2020-10-14 16:10:31 +11:00
Kevin Ring 1e5d831f67 Use correct indices for second clip triangle. 2020-10-14 11:41:58 +11:00
Kevin Ring 18c907997e Fix upsampled texture coordinates. 2020-10-14 11:07:51 +11:00
Kevin Ring e38bb705d9 Upsampling nearly working. 2020-10-13 21:57:25 +11:00
Kevin Ring 5649c562d0 Further WIP upsampling. 2020-10-13 10:16:21 +11:00
Kevin Ring f941688df3 Merge remote-tracking branch 'origin/master' into upsample 2020-10-12 11:30:46 +11:00
Kevin Ring 9d69262a74 Don't delete a request from a worker thread. 2020-10-12 11:17:58 +11:00
Kevin Ring ea48e277b9 Decode raster overlay images on a separate thread. 2020-10-12 11:12:45 +11:00
Kevin Ring 7c8eb7ac5a WIP upsampling of geometry for more detailed rasters. 2020-10-09 09:12:59 +11:00
Kevin Ring 2f600fe488 Ensure pNewTileContext is destroyed after childTiles. 2020-10-06 23:55:43 +11:00
Kevin Ring 226e56a108 Create a new context for external tilesets. 2020-10-06 23:15:33 +11:00
Kevin Ring 79b42e01ba Fix GLB magic value. 2020-10-06 18:02:49 +11:00