0d7d7d0414
Add Mesh and Primitve to POC.
2021-01-04 13:36:34 +11:00
1428b555ce
add test for upsampled skirts
2021-01-03 17:01:21 -05:00
edcf99fad1
add test for upsampling tile without skirt
2021-01-02 23:04:45 -05:00
a72c111c0f
Another experiment.
2021-01-03 00:15:47 +11:00
c29069f613
Some very broken experiments.
2021-01-02 22:23:04 +11:00
e8eb102663
Merge remote-tracking branch 'origin/master' into gltf
2020-12-29 14:04:18 +11:00
767b5d3a6d
WIP glTF
2020-12-27 23:11:01 +11:00
c19d74d1f1
Merge pull request #81 from CesiumGS/tileset-credits
...
Content Attribution
2020-12-27 23:09:17 +11:00
628efb3cfc
Moved HtmlAndLastFrameNumber struct into private section.
2020-12-24 00:41:16 -05:00
909b1397c6
fix implicit conversion again
2020-12-23 18:50:23 -05:00
2e24f04b7a
fix implicit conversion again
2020-12-23 18:40:45 -05:00
3109df262f
fix implicit conversion again
2020-12-23 18:30:22 -05:00
381a7d74ce
fix type implicit conversion and unused function
2020-12-23 17:07:14 -05:00
00e22b68de
explicitly create std::string from raw string for tinygltf::Value
2020-12-23 16:40:11 -05:00
9a3b16f7af
indentations to spaces
2020-12-23 16:11:10 -05:00
c1c1408160
add option to expose private src for other libraries. Add tests for SkirtMeshMetadata
2020-12-23 15:57:08 -05:00
aa81efdaac
base64 encoded Bing logo credit
2020-12-23 15:27:26 -05:00
db292ea44c
Bing credits fixes / improvements + json safe read
2020-12-23 14:13:28 -05:00
86144b1c0f
Tileset suggestions
2020-12-23 12:07:08 -05:00
389ee0be49
CreditSystem include <algorithm>
2020-12-23 12:01:05 -05:00
ad6d1ce045
CreditSystem suggestions
2020-12-23 11:40:10 -05:00
0fb213b85f
Extraneous includes, forward declarations, Credit is now struct
2020-12-23 09:44:53 -05:00
ea803db2be
Made function static, no "this" in worker thread
2020-12-23 15:11:08 +01:00
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
Kevin Ring
unknown
Nithin Pranesh
Marco Hutter