72b07bc8d2
WIP glTF wrapper
2020-12-23 21:23:53 +11:00
861f1317d2
Minor Bing JSON reading tweak
2020-12-23 00:55:46 -05:00
fa3ceb0ddd
Fixed potentially unsafe JSON reads for Bing credits.
2020-12-23 00:20:48 -05:00
306886b950
Merge remote-tracking branch 'origin/master' into gltf
2020-12-23 14:55:52 +11:00
dfc5f938e0
add option to CMakeList to expose private header for testing
2020-12-22 18:39:56 -05:00
83249c0654
Removed unused lambda capture
2020-12-22 18:11:57 -05:00
c4ccdbab57
fix function signature
2020-12-22 17:41:00 -05:00
36d93d5221
Moved CreditSystem pointers from RasterOverlay to RasterOverlayTileProvider.
2020-12-22 17:38:51 -05:00
b4b18e3230
remove longitude and latitude offset for upsampled skirt
2020-12-22 17:09:15 -05:00
be25d1222b
move functions that deserialize skirt mesh extras to separate file
2020-12-22 14:39:11 -05:00
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
4644410063
Fix -Werrors in CreditSystem
2020-12-22 13:50:34 -05:00
38431fb237
calculate skirt height for upsampled tile
2020-12-22 13:19:30 -05:00
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
c5104cec06
Removed helper function that is unused after merge
2020-12-22 16:05:54 +01:00
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
4012e8d95b
Some member initializations
...
At least pointers should not remain uninitialized.
2020-12-22 14:59:46 +01:00
8fc5433c8e
Minor helper functions
...
Mainly using the JsonHelpers, and adding a new one
2020-12-22 14:59:15 +01:00
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
2b68457e40
Merge pull request #79 from CesiumGS/skirt
...
Add skirts for terrain
2020-12-22 13:04:31 +11:00
d8b586e280
Add some logging, pass by const ref.
2020-12-22 12:57:16 +11:00
7fd397734d
Fix gcc compiler warning.
2020-12-22 12:33:58 +11:00
fcbfc4e176
Merge remote-tracking branch 'origin/master' into skirt
2020-12-22 12:25:22 +11:00
7ef66bb523
Merge branch 'master' into tileset-credits
2020-12-21 20:16:36 -05:00
d2f0e8e6c6
Merge pull request #95 from CesiumGS/no-assertions
...
Use CRT allocator with tinygltf/RapidJSON.
2020-12-22 12:11:17 +11:00
c8ececa0f6
Use multithreaded allocator with tinygltf/RapidJSON.
2020-12-22 12:04:30 +11:00
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
7bdf6f27ec
fix mismatch type
2020-12-21 13:53:41 -05:00
931ae39c47
add skirt for upsample tile
2020-12-21 13:41:21 -05:00
bc434f81bf
WIP convert to rapidjson
2020-12-21 10:40:00 -05:00
951cc35ef3
Merge branch 'master' into tileset-credits
2020-12-21 08:15:29 -05:00
587be7b287
Remove debug code.
2020-12-21 23:00:09 +11:00
06260f02b8
Merge pull request #84 from CesiumGS/rapidjson
...
Use RapidJSON instead of nlohmann JSON
2020-12-21 22:48:15 +11:00
83e4955d1e
Remove some debug code.
2020-12-21 22:34:53 +11:00
61ba624f90
Merge remote-tracking branch 'origin/master' into rapidjson
2020-12-21 22:20:09 +11:00
c87133c494
Merge pull request #56 from CesiumGS/spdlog-integration
...
Spdlog integration
2020-12-21 22:08:16 +11:00
360204f639
Merge remote-tracking branch 'origin/master' into spdlog-integration
2020-12-21 17:50:28 +11:00
251d2d46f6
Finish replacing nlohmann with RapidJSON.
2020-12-21 17:41:56 +11:00
f4c932dab6
Use RapidJSON instead of nlohmann for tinygltf and tileset.json.
2020-12-21 16:15:51 +11:00
1a27693199
Per frame credits aggregation moved to CreditSystem
2020-12-20 22:01:08 -05:00
f6ff51a0d1
Fixed -Werror unused value
2020-12-20 18:08:07 -05:00
fdd9183334
Added missing documentation
2020-12-20 17:38:49 -05:00
1ca85e9274
Credit operator overloads for set functions.
2020-12-20 17:07:22 -05:00
cbba00fd9c
Made Credit into struct
2020-12-20 16:08:02 -05:00
54f0884c1c
Refactored from Credit to CreditSystem
2020-12-20 15:46:59 -05:00
6cb6cddac0
Add simdjson.
2020-12-19 22:26:09 +11:00
bf883da228
WIP Credit System
2020-12-18 13:34:44 -05:00
817b7ed7ea
Merge remote-tracking branch 'origin/master' into gltf
2020-12-18 17:28:06 +11:00
b24b4e2058
Merge pull request #83 from CesiumGS/unreal-on-linux
...
Small changes for Cesium for Unreal on Linux
2020-12-18 17:24:17 +11:00
195bb8f71b
Fix problems when using libc++.
2020-12-18 14:29:12 +11:00
Kevin Ring
Nithin Pranesh
unknown
Marco Hutter