Commit Graph

275 Commits

Author SHA1 Message Date
Kevin Ring 1a100de53e More renaming for consistency. 2022-01-25 19:36:10 +11:00
Kevin Ring a5e3f11846 Impl->CesiumImpl, TWO_PI->TwoPi. 2022-01-25 11:55:43 +11:00
Sean Lilley 2cdcb92e20 Namespace cleanup 2021-12-02 18:34:22 -05:00
Kevin Ring abda4f02e0 Merge remote-tracking branch 'origin/main' into bad-upsample-tex-coords 2021-11-23 21:41:30 +11:00
Kevin Ring 096701fa17 More cleanup. 2021-11-23 21:09:45 +11:00
Kevin Ring 3707b402bd Much more accurate subdivision for raster overlays. 2021-11-23 16:38:44 +11:00
Kevin Ring 787dfec106 Add GlobeRectangle::expandToIncludePosition, improve stability. 2021-11-22 23:20:45 +11:00
Nithin Pranesh a7765dfbc0 Merge branch 'implicit-tiling' into implicit-s2 2021-11-17 01:41:39 -05:00
Nithin Pranesh ee5b04041e Merge branch 'main' into implicit-tiling 2021-11-13 12:51:16 -05:00
Nithin Pranesh 5868f553b3 Merge branch 'main' into overlays-on-3dtiles 2021-11-12 15:21:01 -05:00
Kevin Ring 5281717f36 Fix GCC warning. 2021-11-12 16:57:33 +11:00
Kevin Ring cd2d1f8628 Remove unused function. 2021-11-12 16:52:21 +11:00
Kevin Ring 1b4a995189 Add missing header. 2021-11-12 16:45:46 +11:00
Kevin Ring e89bac66f6 Add ability to convert S2 cell to a GlobeRectangle. 2021-11-12 16:33:32 +11:00
Nithin Pranesh 5111f277a9 Merge branch 'implicit-tiling' into implicit-s2 2021-11-11 20:59:51 -05:00
Nithin Pranesh e54e087674 Merge branch 'external-buffers-images2' into implicit-tiling 2021-11-11 20:43:28 -05:00
Nithin Pranesh 8a73cd8f20 few fixes from cherry picking 2021-11-11 20:09:08 -05:00
Nithin Pranesh b549f8f929 another gcc/clang fix 2021-11-11 19:58:34 -05:00
Nithin Pranesh bd3915d3ff format + fix gcc/clang issues 2021-11-11 19:58:10 -05:00
Kevin Ring 9e61c6dfaa Kinda-working S2 base globe. 2021-11-11 19:57:28 -05:00
Kevin Ring f1e35d6470 WIP computation of bounding region from S2 cell. 2021-11-11 19:55:02 -05:00
Kevin Ring 29778d6648 Merge remote-tracking branch 'origin/main' into overlays-on-3dtiles 2021-11-10 13:29:30 +11:00
Nithin Pranesh 3b6319156d another gcc/clang fix 2021-11-09 10:53:42 -05:00
Nithin Pranesh e6a9e5b682 format + fix gcc/clang issues 2021-11-09 10:16:23 -05:00
Kevin Ring 651316bdee Kinda-working S2 base globe. 2021-11-09 23:37:08 +11:00
Kevin Ring 7fc386b5c9 WIP computation of bounding region from S2 cell. 2021-11-09 18:13:32 +11:00
Kevin Ring d321132302 Merge remote-tracking branch 'origin/s2' into implicit-s2 2021-11-09 17:11:24 +11:00
Kevin Ring 56ef19db94 Don't use a GlobeRectangle for something that may not be rectangular.
At least in longitude/latitude space.
2021-11-09 17:09:08 +11:00
Nithin Pranesh f22a9c0f18 missed merge conflict 2021-11-08 21:56:07 -05:00
Nithin Pranesh 3a6a840217 Merge remote-tracking branch 'origin/s2' into implicit-s2 2021-11-08 21:44:49 -05:00
Nithin Pranesh c77c15144f add s2cell to boundingRegion conversion 2021-11-08 21:13:52 -05:00
Nithin Pranesh a3cb3c4e2c attempt to integrate implicit tiling with s2 2021-11-08 20:44:36 -05:00
Kevin Ring 3d4d82b38e Add some doc. 2021-11-09 12:35:55 +11:00
Nithin Pranesh 40ad113a86 Merge remote-tracking branch 'origin/s2' into implicit-s2 2021-11-08 11:50:45 -05:00
Kevin Ring b226f45a08 Formatting. 2021-11-05 18:16:44 +11:00
Kevin Ring 0e0d4f3faf More tests ported from CesiumJS. 2021-11-05 18:05:43 +11:00
Kevin Ring d2f0cf33fa Merge remote-tracking branch 'origin/main' into s2 2021-11-05 16:34:49 +11:00
Kevin Ring d8a7e885d2 Fix some Linux build problems.
But it doesn't work yet.
2021-11-05 16:18:05 +11:00
Kevin Ring 9f1c1b27d2 More tests. 2021-11-05 15:40:30 +11:00
Kevin Ring 75382109ac Add some tests, fix a bug. 2021-11-05 14:49:11 +11:00
Kevin Ring fc38278b82 Return distance squared, not distance. 2021-11-05 13:22:49 +11:00
Kevin Ring 3023062fdc Implement S2CellBoundingVolume::computeDistanceSquaredToPosition. 2021-11-05 13:21:49 +11:00
Nithin Pranesh 134db78716 Merge branch 'main' into implicit-tiling 2021-11-04 21:47:30 -04:00
Kevin Ring 92f0d71b51 WIP support for S2 bounding volumes. 2021-11-04 23:58:58 +11:00
Ian Lilley 944e85f9d5 added new GLM defines 2021-11-01 10:29:11 -04:00
Kevin Ring 0fcce25221 Better handling for rectangles wrapping globe. And tests. 2021-10-28 13:37:21 +11:00
Kevin Ring 0d692c7c44 Doc, minor cleanup. 2021-10-28 12:35:55 +11:00
Nithin Pranesh 7fdd9afbb5 Merge branch 'main' into implicit-tiling 2021-10-25 16:18:31 -04:00
Sean Lilley 52283f3359 Fix includes 2021-10-11 17:28:44 -04:00
Nithin Pranesh 07eb06718a format 2021-10-05 01:22:32 -04:00
Nithin Pranesh c05591858e Merge branch 'main' into implicit-tiling 2021-10-05 00:23:28 -04:00
Nithin Pranesh fb2e0374d0 started hooking up quadtree subtree availability
compiling again now, regular quantized mesh working again
2021-10-03 20:55:27 -04:00
Nithin Pranesh e171dadb6a tiling schemes look correct now and some upgrades in Tile.cpp, availability next 2021-09-29 17:12:59 -04:00
Marco Hutter 9855400417 Use proper relative paths in all public headers 2021-09-28 17:23:07 +02:00
Marco Hutter 27fdd26e27 Merge remote-tracking branch 'origin/main' into include-style-fixes
# Conflicts:
#	Cesium3DTilesSelection/include/Cesium3DTilesSelection/GltfContent.h
#	Cesium3DTilesSelection/src/Batched3DModelContent.cpp
#	Cesium3DTilesSelection/src/CompositeContent.cpp
#	Cesium3DTilesSelection/src/ExternalTilesetContent.cpp
#	Cesium3DTilesSelection/src/GltfContent.cpp
#	Cesium3DTilesSelection/src/QuantizedMeshContent.cpp
#	Cesium3DTilesSelection/src/Tile.cpp
#	Cesium3DTilesSelection/src/TileContentFactory.cpp
#	Cesium3DTilesSelection/src/calcQuadtreeMaxGeometricError.h
2021-09-28 14:38:33 +02:00
Marco Hutter 0e827f7afd Updated includes based on clang-format with Regroup
This MAINLY inserted some blank lines between
the blocks.
2021-09-26 17:46:27 +02:00
Marco Hutter 0f946aca3b Include style fixes for CesiumGeospatial 2021-09-19 15:22:58 +02:00
Marco Hutter 46c9c7ec7d Formatting after adding const 2021-09-15 15:38:06 +02:00
Marco Hutter de8145ab9e Added missing const keyword
C26496: The variable ... is assigned only once, mark it as const
2021-09-15 15:37:29 +02:00
Marco Hutter 5949134156 Fixed noexcept specifiers
It's hard to make them consisten for the JSON part...
2021-09-15 00:54:54 +02:00
Marco Hutter 97a2757e39 Added missing noexcept specifiers
Reported as "C26440 Function ... can be declared noexcept"
2021-09-14 16:12:50 +02:00
Kevin Ring 92c79297ab Introduce ITileExcluder, simplify CartographicPolygon. 2021-08-31 22:31:58 +10:00
Kevin Ring 7e14236094 Doc improvement. 2021-08-31 17:17:44 +10:00
Kevin Ring 62622a370f CartographicSelection -> CartographicPolygon, move to CesiumGeospatial 2021-08-30 22:41:02 +10:00
Kevin Ring beffe9a783 Remove unnecessary changes. 2021-08-30 14:02:08 +10:00
Kevin Ring b1dae79a17 Merge remote-tracking branch 'origin/rectangle-union' into clipping-2.5d-kring 2021-08-23 19:30:50 +10:00
Kevin Ring 2911275357 Rename GlobeRectangle::intersect to computeIntersection. 2021-08-23 19:24:55 +10:00
Kevin Ring c0b7b130fb Rename intersect to computeIntersection. 2021-08-23 19:22:08 +10:00
Kevin Ring a393919bda Merge remote-tracking branch 'origin/async-system-tests' into clipping-2.5d-kring 2021-07-15 10:16:18 +10:00
Nithin Pranesh 0823adbf55 format Projection.h 2021-07-07 12:33:44 -04:00
Kevin Ring 4e45bab460 Use angle brackets to #include catch2. 2021-07-04 22:57:11 +10:00
Nithin Pranesh 173a3dfd74 cleaned up projections accumulation from overlays for uv generation 2021-07-01 15:28:13 -04:00
knowmore 5b9f6d3b17 fix: spelling mistake ellipsoid 2021-06-10 09:49:10 +08:00
Marco Hutter 51e43bbd49 Comment fixes for clang formatting 2021-04-29 17:06:34 +02:00
Jordi Torres 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
Shehzan Mohammed 8a2957d32f Run clang format 2021-03-08 20:39:46 -05:00
Shehzan Mohammed b97f03d514 Fix Cmake typos 2021-03-04 16:52:06 -05:00
Shehzan Mohammed 755f16674b Merge branch 'vs2017' into install 2021-03-03 21:14:36 -05:00
Kevin Ring c4da7eefd2 Fix build in VS2017. 2021-03-04 13:08:14 +11:00
Shehzan Mohammed 3faff010d7 Installing thirdparty deps working on linux 2021-03-03 20:47:31 -05:00
Kevin Ring 34bbd2aa31 WIP cmake install. 2021-03-04 09:48:09 +11:00
Samuel Vargas 5d03477551
Rearchitecture cesium-native's CMake structure
This is necessary to support using cesium-native as submodule in
in asset-pipeline

- `draco` and `sqlite3` are guarded with if target blocks to allow
  asset-pipeline to provide their own version of the targets.
- Tests are now a dedicated target that clients don't have to build
- Test sources / headers are now a target property instead of using the $<BUILD_INTERFACE... hack
- Added common include variables in extern/CMakeLists.txt
- Defined `RAPIDJSON_HAS_CXX11_RVALUE_REFS` for move support for RapidJson
- Private include directories are automatically extracted via CMake magic
  for use in catch tests
- Globbing is now wrapped in a dedicated function that allows one to use
  CONFIGURE_DEPENDS depending on their preferences (defaults to OFF)
  to retain the old behavior.
2021-03-02 14:28:04 -05:00
Marco Hutter 67dce23a30 Doxygen fixes 2021-02-15 17:14:49 +01:00
Marco Hutter d7cef7aba3 Use distance to bounding box if cartographic cannot be computed 2021-02-02 18:51:03 +01:00
Kevin Ring b654781b10 Merge remote-tracking branch 'origin/master' into upsample-skirt 2021-01-05 15:01:58 +11: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 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 e2a3f0d2db Add constexpr and noexcept in a bunch of places. 2020-12-03 23:18:32 +11:00
Marco Hutter e1e8782f00 Added last documentation. Minor fixes. 2020-11-11 16:25:35 +01:00
Kevin Ring 0b54538ad8
Merge pull request #34 from CesiumGS/minor-code-fixes
Minor code fixes
2020-11-05 17:13:20 +11:00
Kevin Ring a6ec90270b Use BoundingBox for distance to degenerate BoundingRegion. 2020-11-05 16:46:00 +11:00
Marco Hutter a98cac518e Updates from review 2020-11-04 14:40:08 +01:00
Kevin Ring 7260ddca4d Merge remote-tracking branch 'origin/master' into upsample-bounding-volumes 2020-11-04 15:14:43 +11:00
Kevin Ring 20af9ee5cc Compute tighter bounding volumes for upsampled tiles. 2020-11-04 13:11:01 +11:00
Marco Hutter 808b0cfd6a Minor code fixes.
Details summarized in PR.
2020-11-03 23:13:00 +01:00
Marco Hutter ecab20fe03 Documentation fixes from review comments 2020-11-03 18:31:27 +01:00
Marco Hutter 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
Marco Hutter 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
Marco Hutter 8ee683a39e Documentation fixes, pedantic mode. 2020-11-01 16:46:54 +01:00
Kevin Ring 327255fd1b Use the bounding box distance if farther than the region distance. 2020-11-01 17:27:14 +11:00
Marco Hutter 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
Kevin Ring 08f2467064 Improve distance calc to bounding regions, add selection stats. 2020-10-31 00:05:10 +11:00
Kevin Ring 2f2cdd1074 Use glm funcs, avoid public cutouts field. 2020-10-29 10:25:51 +11: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 2d32708ee8 Documentation for WGS84 and Bing overlay 2020-10-26 19:49:36 +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 8782333ef1 Improvements to CMake build. 2020-10-01 22:46:16 +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 bdd1e1d5de Cleaner content loading. 2020-09-23 22:04:41 +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 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 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 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 2070215b6c Create a glTF from a quantized-mesh-1.0 terrain tile. 2020-08-20 21:46:55 +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 e2d8872707 Basic support for additive refinement. 2020-07-29 15:04:34 +10:00
Kevin Ring 08b4348c60 Move tests into library directories. 2020-07-25 22:56:53 +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