a545b26bf2
seperate code that parses quantized mesh into a seperate function
2020-12-10 12:44:22 -05:00
f663a6e6b1
clean up code to make it nicer
2020-12-10 10:05:27 -05:00
04f16baa44
Merge remote-tracking branch 'origin/master' into spdlog-integration
2020-12-10 16:05:26 +01:00
c40226f845
push the skirt out a little bit
2020-12-09 20:38:20 -05:00
9debaa6c08
Changed placeholder Bing credit.
2020-12-09 19:49:48 -05:00
d3a9213283
WIP Changed bing placeholder text
2020-12-09 17:39:15 -05:00
9dd50c7f27
WIP add skirt for gltf
2020-12-09 12:50:35 -05:00
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
7a0f1907af
WIP transition to cgltf.
2020-12-08 14:02:09 +11:00
89b88f14ed
Marked classes final
...
All classes marked final except for RasterOverlay, RasterOverlayTileProvider, ITaskProcessor, IPrepareRendererResources, and IAsset*.
2020-12-07 10:45:47 -05:00
c285e6c38a
Add constexpr and noexcept to Cesium3DTiles types.
2020-12-04 10:31:21 +11:00
fc1de6a29f
Try again at fixing this warning.
2020-12-03 16:44:53 +11:00
9107682e89
Fix warning.
2020-12-03 16:30:16 +11:00
1af982185b
Protect GCC pragma from being seen by MSVC.
2020-12-03 15:56:37 +11:00
fc0e171c03
Fix problems compiling with clang.
2020-12-03 10:23:17 +11:00
9a351caf8d
Require Future::then and catch to be called on an rvalue ref.
2020-12-02 23:07:42 +11:00
08708b4e02
Merge remote-tracking branch 'origin/spdlog-integration' into promises-plus-spdlog
2020-12-02 18:19:58 +11:00
6a3b9d5e7b
Move async bits to CesiumAsync library.
2020-12-02 16:34:41 +11:00
8462c4c1ca
Add forward reference.
2020-12-02 15:04:47 +11:00
7dd2de5af7
Clean up AsyncSystem
2020-12-01 21:41:31 +11:00
5dc8d5ed86
And another warning.
2020-12-01 18:32:18 +11:00
9e8741b04d
Yet another Linux warning.
2020-12-01 18:29:49 +11:00
8fcdee7903
Fix another warning on Linux.
2020-12-01 18:28:32 +11:00
18708df003
Fix some warnings on Linux.
2020-12-01 18:26:28 +11:00
991a85a7a5
Add ability to catch async errors.
2020-12-01 18:13:55 +11:00
c5370444f1
Use updated method name.
2020-12-01 16:20:09 +11:00
d4a3decb33
Use AsyncSystem for initial tileset requests.
2020-12-01 15:55:37 +11:00
2eabcfb1b1
Use AsyncSystem for upsampling.
2020-11-30 22:12:19 +11:00
b1314ba7df
Use AsyncSystem for Tile content loading.
2020-11-30 21:39:20 +11:00
4bb7f63883
Doc and other cleanup.
2020-11-30 15:33:33 +11:00
909e2ce6a1
Merge remote-tracking branch 'origin/master' into promises
2020-11-30 11:11:31 +11:00
6643e827dc
Refresh tokens in external tilesets, too.
2020-11-28 16:50:02 +11:00
d1fd6c4447
Improve stability.
2020-11-28 16:44:56 +11:00
b10a50dc0b
Pass logger as shared pointer
...
To be reviewed in terms of ABI compatibility
2020-11-27 12:59:41 +01:00
913ad095bd
Preparing actual unreal integration.
...
Macros are bad. Period.
2020-11-26 17:34:01 +01:00
90d972d089
Fixes for errors from Linux build
2020-11-25 18:16:08 +01:00
08a7ecf68b
Added basic interface for external loggers
2020-11-25 17:51:46 +01:00
3d8017c239
Updated logging header paths
2020-11-25 14:15:47 +01:00
307d9f6614
Moved logging header to right directory.
2020-11-25 14:13:55 +01:00
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
7f284ab837
Basics working again after changing everything.
2020-11-25 17:25:00 +11:00
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
766e412a31
Removed comments that are obsolete
...
According to draft PR feedback
2020-11-24 14:26:54 +01:00
2d0aafa94f
Merge remote-tracking branch 'origin/master' into spdlog-integration
2020-11-24 14:19:41 +01:00
786f574376
WIP async/promise-like system.
2020-11-24 21:22:46 +11:00
d5f1078699
Use string formatting in log messages
2020-11-23 16:11:37 +01:00
b34fa3a359
Hold shared_ptrs to externals.
2020-11-23 17:22:53 +11:00
9045f7c954
First examples of possible logging and error handling
2020-11-19 18:14:56 +01:00
44129f8427
Load tiles in order of priority.
...
Using the priority metric from CesiumJS's terrain engine.
2020-11-19 22:39:32 +11:00
359b43cef5
Fix warning on linux.
2020-11-19 21:54:06 +11:00
169c9f5ac1
Remove commented-out line of code.
2020-11-19 21:46:14 +11:00
0b85d44b88
Faster and more accurate accounting of tile data size.
2020-11-19 21:39:15 +11:00
8dba8c0447
Restrict cache to a number of bytes instead of a number of tiles.
2020-11-19 18:00:36 +11:00
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
e056b441bc
Add spdlog to build.
2020-11-18 20:20:08 +11:00
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
1fe8bded5b
Merge pull request #48 from CesiumGS/basic-doxygen-fixes-part-4
...
Documentation for TileMapServiceRasterOverlayOptions
2020-11-17 12:54:41 +11:00
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
ea7ac2d6c4
Wait for raster loading before destroying tileset.
2020-11-17 11:17:02 +11:00
7444fa0f50
Documentation for TileMapServiceRasterOverlayOptions
...
Essentially taken from TileMapServiceImageryProvider
of CesiumJS
2020-11-16 16:41:48 +01:00
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
b6746cc460
Do not append empty queries to URLs
2020-11-14 19:06:53 +01:00
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
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
f914418aab
Fix another warning.
2020-11-12 18:33:03 +11:00
d7621c2ad8
Fix warning.
2020-11-12 18:22:16 +11:00
6b7023b1b5
Support for adding and removing overlays.
2020-11-12 17:37:57 +11:00
e1e8782f00
Added last documentation. Minor fixes.
2020-11-11 16:25:35 +01:00
e3f4c8419f
Documentation for TileContext. Minor fixes.
2020-11-11 15:43:08 +01:00
0c6e5628e5
Documentation for Gltf and Raster parts
2020-11-10 19:14:05 +01:00
1375575813
WIP raster overlay improvements.
2020-11-11 00:34:20 +11:00
eb96865d8a
Remove explicit creation of overlay tile providers.
2020-11-10 17:04:19 +11:00
14ce79f387
More firmly attach RasterOverlayCollection to a Tileset.
2020-11-10 16:51:38 +11:00
a251a22660
Show the tile(s) directly underneath the camera.
2020-11-10 09:40:46 +11:00
0e2e60b8b3
Avoid shadowed locals.
2020-11-09 15:38:53 +11:00
88d5e8acdd
Refresh expired Cesium ion tokens.
2020-11-09 15:30:26 +11:00
0b54538ad8
Merge pull request #34 from CesiumGS/minor-code-fixes
...
Minor code fixes
2020-11-05 17:13:20 +11:00
a98cac518e
Updates from review
2020-11-04 14:40:08 +01:00
b503702685
Don't let dodgy longitude at the poles affect bounding box.
2020-11-04 21:34:49 +11:00
7260ddca4d
Merge remote-tracking branch 'origin/master' into upsample-bounding-volumes
2020-11-04 15:14:43 +11:00
ad28cd3ef2
Merge remote-tracking branch 'origin/master' into minor-code-fixes
2020-11-04 13:11:45 +11:00
20af9ee5cc
Compute tighter bounding volumes for upsampled tiles.
2020-11-04 13:11:01 +11:00
377769c3ce
Corrected comment for loadContent
2020-11-04 00:13:51 +01:00
808b0cfd6a
Minor code fixes.
...
Details summarized in PR.
2020-11-03 23:13:00 +01:00
ecab20fe03
Documentation fixes from review comments
2020-11-03 18:31:27 +01:00
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
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
3ee83b6451
Fix Tile member initialization order.
2020-11-02 23:03:49 +11:00
0a00cabba2
Eliminate a dodgy public field in Tile.
2020-11-02 22:43:16 +11:00
af21783947
Don't put fogDensity in ViewUpdateResult.
2020-11-02 21:57:04 +11:00
e2117fd158
Fog-based culling.
2020-11-02 16:25:43 +11:00
8ee683a39e
Documentation fixes, pedantic mode.
2020-11-01 16:46:54 +01:00
599f2be5fb
Documentation, mainly for Tile
...
Many functions are not supposed to be called by clients.
2020-10-31 19:15:43 +01:00
bb26cbf75a
Added missing parameter documentation
2020-10-31 17:44:16 +01:00
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
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
d1aa0debee
Documentation, minor extensions and cleanups
2020-10-30 18:49:21 +01:00
35bc6a2a2c
Documentation, mainly for tile and tile content
2020-10-30 17:13:04 +01:00
08f2467064
Improve distance calc to bounding regions, add selection stats.
2020-10-31 00:05:10 +11:00
69193affbb
Improve quality of generated upsampled glTF.
2020-10-30 10:57:12 +11:00
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
2f2cdd1074
Use glm funcs, avoid public cutouts field.
2020-10-29 10:25:51 +11:00
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
5d5b80ecb9
Make Rectangle a struct because it has public fields.
2020-10-28 16:01:55 +11:00
a2dd5ca325
Merge remote-tracking branch 'origin/master' into cleanup
2020-10-28 15:57:50 +11:00
7d60a886ea
Update Cesium3DTiles/include/Cesium3DTiles/Camera.h
2020-10-28 15:53:18 +11:00
4294bbcf74
Update Cesium3DTiles/include/Cesium3DTiles/BingMapsRasterOverlay.h
2020-10-28 15:53:06 +11:00
37161098f4
Update Cesium3DTiles/include/Cesium3DTiles/BingMapsRasterOverlay.h
2020-10-28 15:52:57 +11:00
c8fd4ee7a5
Add comments for TileID.
2020-10-27 17:23:28 +11:00
84193feb29
Remove unused code.
2020-10-27 16:25:43 +11:00
d6fcfc0e04
Documentation for BoundingVolume
2020-10-26 23:50:34 +01:00
b72787029d
Documentation for namespaces
...
Without them, typedefs of these namespaces did not
appear in the documentation
2020-10-26 23:50:21 +01:00
d424c601b3
Documentation for basic classes and TileSelectionState
2020-10-26 23:06:29 +01:00
d9a72d1fd0
Documentation for Camera
2020-10-26 19:49:52 +01:00
2d32708ee8
Documentation for WGS84 and Bing overlay
2020-10-26 19:49:36 +01:00
140248c27f
Documentation for BingMapsRasterOverlay
2020-10-26 19:14:09 +01:00
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
8b3d517d92
Fix linux warning.
2020-10-22 22:39:06 +11:00
b224f18ade
Hacky way to create cutouts in tilesets with raster overlays.
2020-10-22 22:26:57 +11:00
adb506899b
Remove unused variable.
2020-10-21 20:16:04 +11:00
e8a98f229b
Unload load tiles in the coverage area.
2020-10-21 18:06:54 +11:00
bb609188ad
Add support for TileMapService imagery.
2020-10-21 17:52:42 +11:00
b8fb87fa9e
Fix generated texture coordinates near the anti-meridian.
2020-10-16 17:43:32 +11:00
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
0cf28b0299
Mark unloadable images as failed.
2020-10-15 18:28:01 +11:00
b35c8beb45
Add n=z to Bing requests if it's not already there.
2020-10-15 02:09:44 +11:00
8f34c59aac
Pass raster rectangle to detach.
2020-10-15 00:49:32 +11:00
2b34772f0e
Fix linux compile errors.
2020-10-14 21:55:30 +11:00
c27a5f0099
Remove unimplemented declaration.
2020-10-14 21:43:48 +11:00
61b23ca17a
Ready vs loading imagery, use ancestors when rasters fail to load.
2020-10-14 21:40:54 +11:00
3b74c3d8c3
Fix BVs, load parent prior to upsampling.
2020-10-14 16:10:31 +11:00
1e5d831f67
Use correct indices for second clip triangle.
2020-10-14 11:41:58 +11:00
18c907997e
Fix upsampled texture coordinates.
2020-10-14 11:07:51 +11:00
e38bb705d9
Upsampling nearly working.
2020-10-13 21:57:25 +11:00
5649c562d0
Further WIP upsampling.
2020-10-13 10:16:21 +11:00
f941688df3
Merge remote-tracking branch 'origin/master' into upsample
2020-10-12 11:30:46 +11:00
9d69262a74
Don't delete a request from a worker thread.
2020-10-12 11:17:58 +11:00
ea48e277b9
Decode raster overlay images on a separate thread.
2020-10-12 11:12:45 +11:00
7c8eb7ac5a
WIP upsampling of geometry for more detailed rasters.
2020-10-09 09:12:59 +11:00
2f600fe488
Ensure pNewTileContext is destroyed after childTiles.
2020-10-06 23:55:43 +11:00
226e56a108
Create a new context for external tilesets.
2020-10-06 23:15:33 +11:00
79b42e01ba
Fix GLB magic value.
2020-10-06 18:02:49 +11:00
f1655ef269
Use rectangle from layer.json.
2020-10-06 17:46:39 +11:00
ac13c9ebfc
Don't request quantized-mesh tiles that don't exist.
2020-10-06 17:20:41 +11:00
15efa06b5c
Add TileContext.
2020-10-06 11:31:07 +11:00
7267ae9251
Merge remote-tracking branch 'origin/master' into availability
2020-10-02 17:57:51 +10:00
19ca31ccff
WIP tile availability.
2020-10-02 10:55:58 +10:00
8caeec1f47
Better place to look for the generated draco header.
2020-10-01 23:40:46 +10:00
3868b168c9
Make generated draco header file available.
2020-10-01 23:24:23 +10:00
8782333ef1
Improvements to CMake build.
2020-10-01 22:46:16 +10:00
93b84cac0b
Remove unused code.
2020-09-25 21:55:08 +10:00
d71531c167
Create placeholders for raster tile providers that aren't ready yet.
2020-09-25 21:51:44 +10:00
46a73eb878
Add non-const getOptions method.
2020-09-23 23:31:11 +10:00
8298232d13
The last of the linux warnings.
2020-09-23 23:05:08 +10:00
ba5f1479a6
Another linux warning.
2020-09-23 22:41:37 +10:00
7b9a5fc7a3
Fix linux warning.
2020-09-23 22:29:39 +10:00
bdd1e1d5de
Cleaner content loading.
2020-09-23 22:04:41 +10:00
d853ba23b6
Unload raster tiles when tiles are unloaded.
2020-09-23 16:07:17 +10:00
08f79bd5b0
Correctly resolve content URLs in external tilesets.
2020-09-18 23:01:36 +10:00
0c91445792
Support RTC_CENTER in b3dm.
2020-09-17 20:41:48 +10:00
2cf29ea4dd
Fix external tilesets.
2020-09-16 22:22:54 +10:00
0fbc69e99d
Some WIP refactoring for cleaner loading
2020-09-16 19:27:41 +10:00
fc730ffc1b
Fix typo in comment.
2020-09-16 12:45:52 +10:00
fe15b640b8
Fix GCC warnings.
2020-09-15 16:32:43 +10:00
30db7a1823
Support Bing from ion.
2020-09-15 16:09:12 +10:00
d6ac229a83
Fix some bugs.
...
* Don't use an imagery level less than 0, cause when we cast that to an
unsigned int it's all bad.
* Add missing geometric error for eastern hemisphere terrain tile.
* Don't reload tileset.json and do weird things when a tile has no
content.
2020-09-14 17:36:18 +10:00
b7121fc436
Remove redundant texture coordinates from quantized mesh tiles.
2020-09-14 11:37:01 +10:00
8b66e7dc83
Fix bad coordinates cause by dangling reference.
2020-09-14 11:33:03 +10:00
7b4118a443
Much improved CWT+Bing rendering.
2020-09-10 23:37:40 +10:00
6f4a6b51f0
Generate texture coordinates.
2020-09-09 17:17:48 +10:00
6c4972be34
Move overlay logic out of Tile.
2020-09-08 16:09:52 +10:00
1eef132656
Add missing file.
2020-09-07 23:22:35 +10:00
548f3ed76d
Move IPrepareRendererResources to a separate file.
2020-09-07 23:19:53 +10:00
eda784ba90
Flesh out raster loading interface.
2020-09-07 17:51:53 +10:00
30b3e0eb52
Include web mercator coordinates in quantized mesh tiles.
2020-09-07 15:58:21 +10:00
077959f4c6
Minor cleanup.
2020-09-07 15:27:54 +10:00
6aff3f94ad
Working raster overlays.
2020-09-04 17:01:05 +10:00
b4237c1305
Add texture coordinates to quantized-mesh tiles.
2020-09-02 20:59:57 +10:00
d027751f19
Progress toward raster mapping.
2020-09-02 18:03:25 +10:00
ffc560e7cc
WIP raster overlay system.
2020-08-28 17:25:23 +10:00
9ca08620ad
Terrain normals, ion auth via header instead of URL.
2020-08-25 16:36:17 +10:00
ad1698f87b
Update min/max heights when terrain tiles are loaded.
2020-08-24 21:06:31 +10:00
f50aaae886
Add BoundingRegionWithLooseFittingHeights, better use of std::variant
2020-08-24 17:38:04 +10:00
d18aad7ca2
Less hacky support for implicit tiling.
2020-08-24 16:04:58 +10:00
37714acc26
Fix Linux compile error.
2020-08-21 20:37:23 +10:00
e655b6915d
CWT globe rendering starting to work.
2020-08-21 17:18:37 +10:00
2070215b6c
Create a glTF from a quantized-mesh-1.0 terrain tile.
2020-08-20 21:46:55 +10:00
a1a5d49968
WIP terrain rendering.
2020-08-20 10:37:43 +10:00
90b30b67bd
Fix incorrect use of glm::normalize.
2020-08-19 10:03:31 +10:00
c216d57289
BoundingRegion docs.
2020-08-18 12:13:18 +10:00
b7bb648f24
Add CesiumGeoreference actor.
2020-08-11 16:33:16 +10:00
c3994a77f9
WIP
2020-08-10 11:35:40 +10:00
08787410ca
Improve additive refinement handling.
2020-07-29 22:23:16 +10:00
ba012dae42
Fix refinement logic.
...
Empty tiles are renderable, but external tilesets are not.
2020-07-29 20:35:32 +10:00
e2d8872707
Basic support for additive refinement.
2020-07-29 15:04:34 +10:00
23fc6bb914
Get collision working a little.
2020-07-27 22:40:43 +10:00
9a418da82e
Replace some tabs with spaces.
...
Not sure how that happened.
2020-07-27 15:29:55 +10:00
b40dd24508
Load initial tileset.json in a background thread.
2020-07-27 15:21:57 +10:00
6b41eab3e8
Remove unused file.
2020-07-27 14:00:07 +10:00
3b138ec145
Put everything in the right namespace.
2020-07-24 22:59:53 +10:00
6d4beea85d
Better physical org of files.
2020-07-24 21:15:46 +10:00
unknown
Marco Hutter
Nithin Pranesh
Kevin Ring
Marco Hutter