Commit Graph

701 Commits

Author SHA1 Message Date
Kevin Ring 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
Kevin Ring 2f2cdd1074 Use glm funcs, avoid public cutouts field. 2020-10-29 10:25:51 +11:00
Marco Hutter 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
Kevin Ring 5d5b80ecb9 Make Rectangle a struct because it has public fields. 2020-10-28 16:01:55 +11:00
Kevin Ring a2dd5ca325 Merge remote-tracking branch 'origin/master' into cleanup 2020-10-28 15:57:50 +11:00
Kevin Ring 7d60a886ea
Update Cesium3DTiles/include/Cesium3DTiles/Camera.h 2020-10-28 15:53:18 +11:00
Kevin Ring 4294bbcf74
Update Cesium3DTiles/include/Cesium3DTiles/BingMapsRasterOverlay.h 2020-10-28 15:53:06 +11:00
Kevin Ring 37161098f4
Update Cesium3DTiles/include/Cesium3DTiles/BingMapsRasterOverlay.h 2020-10-28 15:52:57 +11:00
Kevin Ring c8fd4ee7a5 Add comments for TileID. 2020-10-27 17:23:28 +11:00
Kevin Ring 84193feb29 Remove unused code. 2020-10-27 16:25:43 +11:00
Marco Hutter d6fcfc0e04 Documentation for BoundingVolume 2020-10-26 23:50:34 +01:00
Marco Hutter b72787029d Documentation for namespaces
Without them, typedefs of these namespaces did not
appear in the documentation
2020-10-26 23:50:21 +01:00
Marco Hutter d424c601b3 Documentation for basic classes and TileSelectionState 2020-10-26 23:06:29 +01:00
Marco Hutter d9a72d1fd0 Documentation for Camera 2020-10-26 19:49:52 +01:00
Marco Hutter 2d32708ee8 Documentation for WGS84 and Bing overlay 2020-10-26 19:49:36 +01:00
Marco Hutter 140248c27f Documentation for BingMapsRasterOverlay 2020-10-26 19:14:09 +01:00
Marco Hutter 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
Kevin Ring 8b3d517d92 Fix linux warning. 2020-10-22 22:39:06 +11:00
Kevin Ring b224f18ade Hacky way to create cutouts in tilesets with raster overlays. 2020-10-22 22:26:57 +11:00
Kevin Ring adb506899b Remove unused variable. 2020-10-21 20:16:04 +11:00
Kevin Ring e8a98f229b Unload load tiles in the coverage area. 2020-10-21 18:06:54 +11:00
Kevin Ring bb609188ad Add support for TileMapService imagery. 2020-10-21 17:52:42 +11:00
Kevin Ring b8fb87fa9e Fix generated texture coordinates near the anti-meridian. 2020-10-16 17:43:32 +11:00
Kevin Ring 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
Kevin Ring 0cf28b0299 Mark unloadable images as failed. 2020-10-15 18:28:01 +11:00
Kevin Ring b35c8beb45 Add n=z to Bing requests if it's not already there. 2020-10-15 02:09:44 +11:00
Kevin Ring 8f34c59aac Pass raster rectangle to detach. 2020-10-15 00:49:32 +11:00
Kevin Ring 2b34772f0e Fix linux compile errors. 2020-10-14 21:55:30 +11:00
Kevin Ring c27a5f0099 Remove unimplemented declaration. 2020-10-14 21:43:48 +11:00
Kevin Ring 61b23ca17a Ready vs loading imagery, use ancestors when rasters fail to load. 2020-10-14 21:40:54 +11:00
Kevin Ring 3b74c3d8c3 Fix BVs, load parent prior to upsampling. 2020-10-14 16:10:31 +11:00
Kevin Ring 1e5d831f67 Use correct indices for second clip triangle. 2020-10-14 11:41:58 +11:00
Kevin Ring 18c907997e Fix upsampled texture coordinates. 2020-10-14 11:07:51 +11:00
Kevin Ring e38bb705d9 Upsampling nearly working. 2020-10-13 21:57:25 +11:00
Kevin Ring 5649c562d0 Further WIP upsampling. 2020-10-13 10:16:21 +11:00
Kevin Ring f941688df3 Merge remote-tracking branch 'origin/master' into upsample 2020-10-12 11:30:46 +11:00
Kevin Ring 9d69262a74 Don't delete a request from a worker thread. 2020-10-12 11:17:58 +11:00
Kevin Ring ea48e277b9 Decode raster overlay images on a separate thread. 2020-10-12 11:12:45 +11:00
Kevin Ring 7c8eb7ac5a WIP upsampling of geometry for more detailed rasters. 2020-10-09 09:12:59 +11:00
Kevin Ring 2f600fe488 Ensure pNewTileContext is destroyed after childTiles. 2020-10-06 23:55:43 +11:00
Kevin Ring 226e56a108 Create a new context for external tilesets. 2020-10-06 23:15:33 +11:00
Kevin Ring 79b42e01ba Fix GLB magic value. 2020-10-06 18:02:49 +11:00
Kevin Ring f1655ef269 Use rectangle from layer.json. 2020-10-06 17:46:39 +11:00
Kevin Ring ac13c9ebfc Don't request quantized-mesh tiles that don't exist. 2020-10-06 17:20:41 +11:00
Kevin Ring 15efa06b5c Add TileContext. 2020-10-06 11:31:07 +11:00
Kevin Ring 7267ae9251 Merge remote-tracking branch 'origin/master' into availability 2020-10-02 17:57:51 +10:00
Kevin Ring 19ca31ccff WIP tile availability. 2020-10-02 10:55:58 +10:00
Kevin Ring 8caeec1f47 Better place to look for the generated draco header. 2020-10-01 23:40:46 +10:00
Kevin Ring 3868b168c9 Make generated draco header file available. 2020-10-01 23:24:23 +10:00
Kevin Ring 8782333ef1 Improvements to CMake build. 2020-10-01 22:46:16 +10:00
Kevin Ring 93b84cac0b Remove unused code. 2020-09-25 21:55:08 +10:00
Kevin Ring d71531c167 Create placeholders for raster tile providers that aren't ready yet. 2020-09-25 21:51:44 +10:00
Kevin Ring 46a73eb878 Add non-const getOptions method. 2020-09-23 23:31:11 +10:00
Kevin Ring 8298232d13 The last of the linux warnings. 2020-09-23 23:05:08 +10:00
Kevin Ring ba5f1479a6 Another linux warning. 2020-09-23 22:41:37 +10:00
Kevin Ring 7b9a5fc7a3 Fix linux warning. 2020-09-23 22:29:39 +10:00
Kevin Ring bdd1e1d5de Cleaner content loading. 2020-09-23 22:04:41 +10:00
Kevin Ring d853ba23b6 Unload raster tiles when tiles are unloaded. 2020-09-23 16:07:17 +10:00
Kevin Ring 08f79bd5b0 Correctly resolve content URLs in external tilesets. 2020-09-18 23:01:36 +10:00
Kevin Ring 0c91445792 Support RTC_CENTER in b3dm. 2020-09-17 20:41:48 +10:00
Kevin Ring 2cf29ea4dd Fix external tilesets. 2020-09-16 22:22:54 +10:00
Kevin Ring 0fbc69e99d Some WIP refactoring for cleaner loading 2020-09-16 19:27:41 +10:00
Kevin Ring fc730ffc1b Fix typo in comment. 2020-09-16 12:45:52 +10:00
Kevin Ring fe15b640b8 Fix GCC warnings. 2020-09-15 16:32:43 +10:00
Kevin Ring 30db7a1823 Support Bing from ion. 2020-09-15 16:09:12 +10:00
Kevin Ring 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
Kevin Ring b7121fc436 Remove redundant texture coordinates from quantized mesh tiles. 2020-09-14 11:37:01 +10:00
Kevin Ring 8b66e7dc83 Fix bad coordinates cause by dangling reference. 2020-09-14 11:33:03 +10:00
Kevin Ring 7b4118a443 Much improved CWT+Bing rendering. 2020-09-10 23:37:40 +10:00
Kevin Ring 6f4a6b51f0 Generate texture coordinates. 2020-09-09 17:17:48 +10:00
Kevin Ring 6c4972be34 Move overlay logic out of Tile. 2020-09-08 16:09:52 +10:00
Kevin Ring 1eef132656 Add missing file. 2020-09-07 23:22:35 +10:00
Kevin Ring 548f3ed76d Move IPrepareRendererResources to a separate file. 2020-09-07 23:19:53 +10:00
Kevin Ring eda784ba90 Flesh out raster loading interface. 2020-09-07 17:51:53 +10:00
Kevin Ring 30b3e0eb52 Include web mercator coordinates in quantized mesh tiles. 2020-09-07 15:58:21 +10:00
Kevin Ring 077959f4c6 Minor cleanup. 2020-09-07 15:27:54 +10:00
Kevin Ring 6aff3f94ad Working raster overlays. 2020-09-04 17:01:05 +10:00
Kevin Ring b4237c1305 Add texture coordinates to quantized-mesh tiles. 2020-09-02 20:59:57 +10:00
Kevin Ring d027751f19 Progress toward raster mapping. 2020-09-02 18:03:25 +10:00
Kevin Ring ffc560e7cc WIP raster overlay system. 2020-08-28 17:25:23 +10:00
Kevin Ring 9ca08620ad Terrain normals, ion auth via header instead of URL. 2020-08-25 16:36:17 +10:00
Kevin Ring ad1698f87b Update min/max heights when terrain tiles are loaded. 2020-08-24 21:06:31 +10:00
Kevin Ring f50aaae886 Add BoundingRegionWithLooseFittingHeights, better use of std::variant 2020-08-24 17:38:04 +10:00
Kevin Ring d18aad7ca2 Less hacky support for implicit tiling. 2020-08-24 16:04:58 +10:00
Kevin Ring 37714acc26 Fix Linux compile error. 2020-08-21 20:37:23 +10:00
Kevin Ring e655b6915d CWT globe rendering starting to work. 2020-08-21 17:18:37 +10:00
Kevin Ring 2070215b6c Create a glTF from a quantized-mesh-1.0 terrain tile. 2020-08-20 21:46:55 +10:00
Kevin Ring a1a5d49968 WIP terrain rendering. 2020-08-20 10:37:43 +10:00
Kevin Ring 90b30b67bd Fix incorrect use of glm::normalize. 2020-08-19 10:03:31 +10:00
Kevin Ring c216d57289 BoundingRegion docs. 2020-08-18 12:13:18 +10:00
Kevin Ring b7bb648f24 Add CesiumGeoreference actor. 2020-08-11 16:33:16 +10:00
Kevin Ring c3994a77f9 WIP 2020-08-10 11:35:40 +10:00
Kevin Ring 08787410ca Improve additive refinement handling. 2020-07-29 22:23:16 +10:00
Kevin Ring ba012dae42 Fix refinement logic.
Empty tiles are renderable, but external tilesets are not.
2020-07-29 20:35:32 +10:00
Kevin Ring e2d8872707 Basic support for additive refinement. 2020-07-29 15:04:34 +10:00
Kevin Ring 23fc6bb914 Get collision working a little. 2020-07-27 22:40:43 +10:00
Kevin Ring 9a418da82e Replace some tabs with spaces.
Not sure how that happened.
2020-07-27 15:29:55 +10:00
Kevin Ring b40dd24508 Load initial tileset.json in a background thread. 2020-07-27 15:21:57 +10:00
Kevin Ring 6b41eab3e8 Remove unused file. 2020-07-27 14:00:07 +10:00
Kevin Ring 3b138ec145 Put everything in the right namespace. 2020-07-24 22:59:53 +10:00
Kevin Ring 6d4beea85d Better physical org of files. 2020-07-24 21:15:46 +10:00