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
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