4e45bab460
Use angle brackets to #include catch2.
2021-07-04 22:57:11 +10:00
e1eb2d1f84
Merge branch 'main' into feature-metadata-extension
2021-07-02 10:50:43 -04:00
192920e218
Normalize all the line endings.
2021-07-01 16:34:08 +10:00
46c01f0d10
Merge remote-tracking branch 'origin/main' into load-tracing
2021-06-30 09:17:27 +10:00
a74941bf53
Refactor schedulers.
2021-06-27 22:37:32 +10:00
d6bd025b21
fix: use int32_t rather than uint32_t
...
ref https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#es106-dont-try-to-avoid-negative-values-by-using-unsigned
2021-06-26 23:00:20 +08:00
6186545827
Fix test compilation problems.
2021-06-26 22:36:54 +10:00
839e3b3f06
Avoid VS2019 internal compiler error.
...
Apparently caused by a trailing comma in a lambda capture.
2021-06-26 22:26:51 +10:00
deab1268a2
fix: const T& for get method
...
ref https://stackoverflow.com/questions/63972019/understanding-const-at-top-level-which-may-reduce-code-readability-without-i
2021-06-26 15:35:20 +08:00
e832bd2102
fix: use uint32_t instand of int32_t as count of tiles
2021-06-26 15:33:12 +08:00
38a1faea12
Better names for tracing macros.
2021-06-26 00:11:52 +10:00
322ec936fb
Formatting.
2021-06-25 21:12:28 +10:00
8b7832ba83
WIP overhaul of macros for tracing across threads.
2021-06-25 21:11:40 +10:00
30390baba8
Formatting.
2021-06-24 17:26:21 +10:00
3b5d1545e7
Give TilesetExternals an AsyncSystem rather than an ITaskProcessor.
2021-06-24 17:25:00 +10:00
669bdefeec
Fix clang warnings.
2021-06-22 21:00:28 +10:00
6ece726757
Fix problems when tracing is disabled.
2021-06-22 17:19:33 +10:00
0fa144f516
Make "immediately" the default for continuations.
2021-06-22 15:31:30 +10:00
09b4e393de
More cleanup of tracing macros.
2021-06-22 12:26:07 +10:00
44a69d4cda
Clean up tracing API.
2021-06-21 17:33:59 +10:00
3091533ef6
change PropertyView to MetadataPropertyView
2021-06-20 15:58:08 -04:00
3846381cc9
change names of property type trait
2021-06-20 15:56:06 -04:00
c64fea091e
test property trait and format
2021-06-20 15:51:53 -04:00
3243f9c4ed
test property type
2021-06-20 15:14:34 -04:00
c0faaf18dc
change file name for batch table to EXT_feature_metadata
2021-06-20 14:51:15 -04:00
951cb7a23e
pass rapidjson::Document for batch table json to metadata upgrader
2021-06-20 14:47:36 -04:00
661db543d2
replace operator[] with get() for PropertyView
2021-06-20 01:40:27 -04:00
2498950aea
use FeatureTableView for batch table upgrader test
2021-06-19 22:55:14 -04:00
5b88b652b7
Make ContinuationFutureType actually a Future.
2021-06-16 15:22:29 +10:00
5f82892528
Don't dispatch worker thread tasks unnecessarily.
2021-06-15 13:57:23 +10:00
3363cee7e8
change MetadataPropertyView to PropertyView
2021-06-14 18:35:36 -04:00
bc8dd36951
impl FeatureTableView
2021-06-14 18:30:01 -04:00
2f93260a93
Support .then of Future<void>, and more tracing.
2021-06-10 15:46:49 +10:00
90b1a7f041
add some check for offset buffers
2021-06-09 13:20:24 -04:00
0b4618914c
Better request tracing.
2021-06-09 11:28:06 +10:00
b5d54f07a9
Better macro names.
2021-06-09 10:21:35 +10:00
45f24d5177
Generalize thread overhead tracing.
2021-06-09 10:00:14 +10:00
774730381e
fix property view when accessing fixed array of boolean
2021-06-08 18:53:11 -04:00
4ee41a8bf5
fix property view for array of boolean
2021-06-08 18:17:11 -04:00
a17e670473
use ceil to allocate buffer for boolean
2021-06-08 16:48:40 -04:00
3f37b23b92
add bool array conversion
2021-06-08 16:11:17 -04:00
3ecbbaa19e
minor change in the function name
2021-06-08 12:04:54 -04:00
15fcfbf7a2
fix compiler error
2021-06-08 11:41:49 -04:00
1bf2a7f707
fix compiler warning
2021-06-08 10:18:50 -04:00
6f109b05c9
Trace overlay loading.
2021-06-08 16:22:55 +10:00
0648cb07d2
Allocate unique IDs for tileset loading slots.
2021-06-08 15:23:36 +10:00
8082caf6a7
test dynamic array of number and string
2021-06-07 19:38:19 -04:00
1febc730b9
make array test more generic
2021-06-07 17:37:51 -04:00
7d47f56515
add test for fixed array of string
2021-06-07 16:01:44 -04:00
2a1d03c314
test upgrading to fixed array of number
2021-06-07 15:34:04 -04:00
66be9cd63d
fix compatible types when converting nested array
2021-06-07 14:01:45 -04:00
ca9cc41064
Improved load tracing.
2021-06-07 22:57:45 +10:00
58d7ffd36f
Enlist threads into async processes.
2021-06-07 18:37:50 +10:00
b40028c2c8
Use our profiler instead of minitrace.
2021-06-07 16:36:11 +10:00
491531147d
Merge remote-tracking branch 'origin/profiler' into load-tracing
2021-06-07 16:35:19 +10:00
4517baac46
format
2021-06-07 02:23:05 -04:00
b1bcfd46c8
fix dynamic array of string
2021-06-07 02:20:40 -04:00
4a123d0e1c
fix string offset buffer
2021-06-07 01:07:42 -04:00
9a46baa591
Basic tracing of tile loads.
2021-06-07 15:05:09 +10:00
ab56949efa
fix string offset array
2021-06-07 00:20:29 -04:00
5ef1e6b2db
upgrade json array of string
2021-06-06 23:11:46 -04:00
7c494ccf0e
format
2021-06-02 18:36:50 -04:00
fea9b83286
add boolean test
2021-06-02 18:36:27 -04:00
174bb7593d
add test to view json string
2021-06-02 15:58:01 -04:00
87182d228f
fix signed conversion
2021-06-01 20:05:20 -04:00
d128efea18
test json value of meta property
2021-06-01 19:55:48 -04:00
20e4a935f3
organize test data
2021-06-01 19:43:49 -04:00
a4a4068e78
add test for upgrading batch table
2021-06-01 19:37:46 -04:00
5a2b91e853
WIP PropertyView
2021-05-25 16:39:20 -04:00
2d2c010b53
setup Metadata API
2021-05-21 13:55:09 -04:00
0903da7d60
WIP: convert json type to string
2021-05-20 16:25:10 -04:00
b6e365a04f
add basic test for binary batch table
2021-05-18 21:25:39 -04:00
4c7a431416
re-arrange buffer for b3dm batch table buffer to match EXT_feature_table
2021-05-18 15:52:22 -04:00
04affd551a
convert b3dm binary batch table to EXT_feature_metadata
2021-05-18 12:01:01 -04:00
6942603a1e
Set bufferView.byteLength property.
2021-05-17 22:39:09 +10:00
30f22898b1
Feature metadata working well for simple case.
2021-05-17 12:30:09 +10:00
8f85fd8bbe
WIP conversion of b3dm batch table to EXT_feature_metadata.
2021-05-14 22:28:31 +10:00
15be10ed1b
Merge remote-tracking branch 'origin/main' into feature-metadata-extension
2021-05-13 21:22:28 +10:00
a868801cf7
format
2021-05-12 15:49:26 -04:00
bbe8a7fee1
explicitly destroy raster provider
2021-05-12 15:29:30 -04:00
0b1f5bb429
WIP conversion of b3dm batch table to EXT_feature_metadata.
2021-05-10 17:49:44 +10:00
c8f961c689
Merge remote-tracking branch 'origin/main' into log-tile-ids
...
# Conflicts:
# CHANGES.md
2021-05-05 13:47:34 +02:00
b579401d0f
Moved helper function to anonymous namespace
2021-05-05 13:28:50 +02:00
23d6e1925a
apply fixes from review
2021-05-04 11:08:02 -04:00
28ccced087
Merge remote-tracking branch 'origin/main' into bing-session-cache2
2021-05-03 22:08:03 +10:00
f9aba251e1
Don't request the water mask if it's not needed.
2021-05-03 18:09:34 +10:00
2b10dff799
Add TileContentLoadInput.cpp, remove Tileset.h from the header.
2021-05-03 15:55:30 +10:00
d3ede24e27
Merge remote-tracking branch 'origin/main' into watermask
2021-05-03 15:42:54 +10:00
60472f2223
removed debug print, formatted, CHANGES.md
2021-04-30 16:27:50 -04:00
077ed0203d
initial commit, not working
2021-04-30 16:11:46 -04:00
1e9a413545
Removed completed TODO comment
2021-04-30 14:01:22 -04:00
f1429f672e
added TilesetContentOptions within TilesetOptions
2021-04-30 11:52:16 -04:00
51e43bbd49
Comment fixes for clang formatting
2021-04-29 17:06:34 +02:00
7f92f95d16
Moved credit creation into main thread
2021-04-28 22:38:49 +02:00
eab2b854f1
Addressed PR comments
2021-04-28 20:56:37 +02:00
24e15417ff
Added watermask extension correctly
2021-04-28 09:54:19 -04:00
c81c787c52
get rid of custom texcoords code, add geographic projection for texcoords
2021-04-27 13:10:28 -04:00
f028b0876c
format
2021-04-26 21:04:04 -04:00
10932738eb
reimplement texture coordinates (is this proper geographic projected?)
2021-04-26 21:00:40 -04:00
bfaa855dae
Fixed wrong integer type.
...
Yes, this time, it was my fault.
And how's your development going?
2021-04-26 21:51:28 +02:00
3d2562c96f
The usual whack-a-mole of integer types
2021-04-26 21:41:06 +02:00
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
82207a9b50
Added function for creating tile ID strings
2021-04-26 17:59:13 +02:00
b2be53d22e
refactor to use new JsonValue functions
2021-04-26 00:26:45 -04:00
d49ff889fa
Merge branch 'main' into watermask
2021-04-25 22:46:10 -04:00
c03863ab5b
optional water mask in TilesetOptions + format
2021-04-25 22:14:10 -04:00
dfa64fbec7
default to land texture
2021-04-25 21:53:11 -04:00
67f67cb383
remove changes that weren't necessary
2021-04-24 10:05:32 -04:00
f8664f93c2
remove redundant texcoords
2021-04-22 00:39:43 -04:00
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
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
1a49455796
add tile to load if it meets sse and ancestor doesn't meet sse
2021-04-21 15:38:48 -04:00
8d99b1b72c
check raster ready at the end
2021-04-21 13:57:49 -04:00
701625843b
check if all rasters are ready
2021-04-20 14:59:00 -04:00
b7bdf07e6a
some cleanup
2021-04-20 09:53:50 -04:00
f50505305f
Fix antiquated naming for variables
2021-04-19 13:12:04 -04:00
b98ea262d5
watermask for upsampled tiles
2021-04-19 09:42:39 -04:00
06a18348ca
Merge remote-tracking branch 'origin/main' into error-add-refine
2021-04-19 15:17:02 +10:00
98ec8159dd
format
2021-04-18 23:12:02 -04:00
e776175009
fix test
2021-04-18 23:11:41 -04:00
ff45ec74c9
return nullptr for tile content if failed to load
2021-04-18 23:08:15 -04:00
d6419b40e0
format
2021-04-18 21:36:15 -04:00
41b9781109
add test for error Add refinement tileset
2021-04-18 18:27:45 -04:00
4b0c378220
don't kick descendant out for ADD refinement
2021-04-18 17:15:47 -04:00
999c382cc1
Merge remote-tracking branch 'origin/main' into gltf-extensions
2021-04-16 16:07:23 +10:00
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
8070d85023
Merge remote-tracking branch 'origin/main' into gltf-writer
2021-04-15 13:49:04 -04:00
02e3be9b03
Merge remote-tracking branch 'origin/main' into gltf-extensions
2021-04-15 21:54:03 +10:00
6bb1ac703d
Merge remote-tracking branch 'origin/main' into clang-tidy-first-pass
2021-04-15 16:25:45 +10:00
f58621ee49
Merge remote-tracking branch 'origin/main' into scale-geometric-error
2021-04-15 16:23:17 +10:00
940d8fc8f2
Merge remote-tracking branch 'origin/main' into gltf-extensions
2021-04-15 09:58:01 +10:00
45f44fa034
Reader -> GltfReader.
2021-04-15 00:37:37 +10:00
1727e4a23b
format
2021-04-13 17:24:31 -04:00
236a9008b9
basic watermask functionality
2021-04-13 16:00:16 -04:00
88795c0045
Move JsonValue to CesiumUtility.
2021-04-13 23:24:53 +10:00
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
868094a7ba
Converted axis to enum
2021-04-08 17:54:35 +02:00
1d686e2fe8
Do not pass tileset into worker thread
2021-04-08 15:48:22 +02:00
48f2d3b5c2
Remove unused files, other cleanup.
2021-04-08 21:59:42 +10:00
98a6f77744
Initial progress! (nothing works)
2021-04-07 21:45:11 -04:00
fbf77d2d24
Removed unused variable.
2021-04-07 20:47:28 +02:00
30c8ad06dc
Parse the gltfUpAxis from the tileset
2021-04-07 19:56:50 +02:00
fa94f2442d
Merge branch 'main' into allow-zero
2021-04-07 10:30:33 -04:00
f33f7b1dd5
Make CesiumGltf::Reader a proper class, mange its own extensions.
2021-04-07 23:41:37 +10:00
162f818109
format
2021-04-06 16:44:46 -04:00
1a339908ae
capture options and enable move again
2021-04-06 16:31:40 -04:00
888dd6948a
scale geometric error with tile transform
2021-04-06 15:39:01 -04:00
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
c411f42efc
Add explicit ptr for pMeshCenter
2021-04-06 13:40:11 -04:00
b03dac82af
Add trailing newline to misc files [ skip ci ]
2021-04-06 13:07:48 -04:00
Kevin Ring
Bao Tran
knowmore
Marco Hutter
Nithin Pranesh
Samuel Vargas
Jordi Torres