ec950e046d
format
2021-03-25 15:51:02 -04:00
d93a76cd01
add tracing for expensive content loader
2021-03-25 15:50:34 -04:00
6d06a3ddc2
place tracer on upsample terrain function that takes significant time
2021-03-24 17:07:58 -04:00
cfdfb02d03
add tracer for upsample terrain
2021-03-24 16:22:12 -04:00
5d65432c6b
Merge branch 'main' into imagery-debug
2021-03-23 19:04:42 -04:00
5648af65df
remove debug code
2021-03-23 19:03:39 -04:00
16afe2047c
remove debug code
2021-03-23 19:02:43 -04:00
a04ad86f2a
add const to getID()
2021-03-23 18:43:53 -04:00
bfdad704da
Merge pull request #181 from CesiumGS/doc-terrain-note
...
Add a note about SSE for terrain.
2021-03-24 09:23:29 +11:00
4f6ab3413d
Fix formatting.
2021-03-24 09:09:55 +11:00
28c7ad04c8
add some debug method
2021-03-23 15:15:39 -04:00
6f677633e9
Add a note about SSE for terrain.
2021-03-23 10:58:50 +11:00
9413b2f440
Merge branch 'main' into offline-loading
2021-03-22 10:36:13 -04:00
1b24981f4f
copy url when capturing it in the lambda
2021-03-21 23:26:59 -04:00
42f0c2b89a
parse response status code 0 if it is a file uri
2021-03-21 22:24:53 -04:00
d99bb55a3d
Merge pull request #155 from CesiumGS/handle-images-404
...
Handle the case that images are not found
2021-03-20 15:08:06 +11:00
64ded494f4
Fix per-tile credits not being passed through raster loading
2021-03-18 15:34:08 -04:00
1b7ff38db8
format
2021-03-17 15:01:08 -04:00
bf5218d9f2
remove raster cutout
2021-03-17 14:22:40 -04:00
e98b7b7839
Merge pull request #167 from CesiumGS/holes
...
Upsample incomplete implicitly-tiled quads.
2021-03-17 10:25:45 -04:00
e824e89b0a
Formatting
2021-03-17 14:49:27 +01:00
4a72fae7f7
Use correct layer.json version property name.
2021-03-17 22:34:04 +11:00
e1bcbcb37b
Upsample incomplete quads.
2021-03-17 22:01:27 +11:00
caee54e2e2
Merge pull request #164 from CesiumGS/tile-context-race-simpler
...
Fix a race condition with TileContext
2021-03-16 20:11:11 -04:00
92312deb78
Correctly detaches rasters when removing an overlay.
2021-03-16 18:24:51 +11:00
a713a64601
Add URL to error messages
2021-03-15 17:59:08 +01:00
fd1f4f5d13
Fix test failure and formatting.
2021-03-15 22:13:40 +11:00
ed263443f0
Fix external tileset content.
2021-03-15 15:39:00 +11:00
c4e7406e22
Remove context property from TileContentLoadInput.
...
But ExternalTilesetContent is mostly disabled right now.
2021-03-15 14:08:18 +11:00
15e4e56d1c
Don't resolve tile URL unnecessarily early.
2021-03-12 17:20:38 +11:00
94c77dd89e
Merge tag 'post-clang-format' into gltf-writer-clang-format
...
The commit that ran clang-format on the entire codebase and made no other changes.
2021-03-09 16:36:39 -05:00
2678459aea
Merge tag 'pre-clang-format' into gltf-writer-clang-format
...
The last commit before we ran clang-format on the entire codebase
2021-03-09 16:31:49 -05:00
e4d9a1ced9
Merge tag 'post-clang-format' into handle-images-404-merge-own
...
The commit that ran clang-format on the entire codebase and made no other changes.
2021-03-09 19:34:15 +01:00
890e46b930
Merge tag 'pre-clang-format' into handle-images-404-merge-own
...
The last commit before we ran clang-format on the entire codebase
2021-03-09 19:30:34 +01:00
8a2957d32f
Run clang format
2021-03-08 20:39:46 -05:00
ef8bf72710
Fix missing header files
2021-03-08 20:30:50 -05:00
c721f01541
Finally, no more sstream
2021-03-08 14:59:33 +01:00
26b62c68a4
prevent crash when changing imagery
2021-03-07 17:34:14 -05:00
b4564edb00
Handle the case that images are 404
2021-03-07 19:47:20 +01:00
506f76c34b
Use std::byte for image.cesium.pixelData
2021-03-05 10:04:10 -05:00
a582c7c32f
Remove unused exception variable to prevent MSVC from screaming
2021-03-05 09:59:31 -05:00
f1076ea0ee
Rename getNumberOrDefault to getSafeNumberOrDefault
2021-03-05 07:41:17 -05:00
c4f6025420
Add integer support to JsonValue
...
This also fixes a narrowing conversion bug. Previously if
a type that was larger than 2^53 was stored in a JsonValue
it would be silently casted into a double, causing an unexpected
precision loss. This changes JsonValue to use the largest signed,
unsigned, or floating point value available to support both types
of Numbers.
Also updates GSL version because they added a narrowing cast
function and we use that for safe type casting.
2021-03-05 07:41:15 -05:00
589a0098fc
Merge pull request #145 from CesiumGS/install
...
Add ability to CMake install cesium-native
2021-03-05 16:03:29 +11:00
c5e398275b
Exclude extern directory.
...
But still (mostly?) install the right stuff.
2021-03-05 08:09:53 +11:00
f1078aeb4c
Use bytes for raw data
2021-03-04 17:22:38 +01:00
755f16674b
Merge branch 'vs2017' into install
2021-03-03 21:14:36 -05:00
c4da7eefd2
Fix build in VS2017.
2021-03-04 13:08:14 +11:00
3faff010d7
Installing thirdparty deps working on linux
2021-03-03 20:47:31 -05:00
bec2f0ca4c
Don't mark libraries private (for now)
2021-03-04 10:46:56 +11:00
34bbd2aa31
WIP cmake install.
2021-03-04 09:48:09 +11:00
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
8d2e5f3743
Add missing post method.
2021-03-02 18:06:14 +11:00
4d31c3ef62
Merge pull request #139 from CesiumGS/ion-ui-oauth2
...
Add CesiumIonClient library
2021-03-02 17:55:44 +11:00
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
76652baa56
add doc for updateViewOffline and properly determine if tiles are not rendered
2021-03-01 14:43:05 -05:00
c5ee939c2d
format space
2021-03-01 11:13:18 -05:00
86ca793fb5
return empty class for IPrepareRendererResource
2021-03-01 11:09:51 -05:00
8d0c6a35c0
impl new mock interface for request accessor
2021-03-01 10:44:55 -05:00
a32ae4b9c6
Merge branch 'master' into selection-test
2021-03-01 09:53:06 -05:00
f0bc863b1d
Merge branch 'selection-test' of https://github.com/CesiumGS/cesium-native into selection-test
2021-02-26 18:30:57 -05:00
2b93e11f37
address review pr
2021-02-26 18:22:27 -05:00
5ff36f52cc
Merge branch 'master' into offline-update-view
2021-02-26 15:41:04 -05:00
a69628b785
Merge remote-tracking branch 'origin/master' into ion-ui
2021-02-24 12:59:44 +11:00
d6d57eb881
Merge remote-tracking branch 'origin/master' into disk-cache
2021-02-23 23:15:48 +11:00
1644a3b2f6
Don't pass reference to local.
2021-02-23 22:56:40 +11:00
39e03313a8
Do not capture this for lambda
2021-02-22 16:20:03 +01:00
b836d9232d
No move semantics for span, fixed
...
Something's wonky with my IDE.
2021-02-22 15:40:30 +01:00
aeb585220d
No move semantics for span
2021-02-22 15:39:33 +01:00
15e6cd0f30
Signature update to match change from GitHub commit
2021-02-22 15:35:58 +01:00
f0414fb674
Removed const for fields
...
Also, this tab vs. spaces thing...
2021-02-22 15:08:18 +01:00
7e54bafd1d
Use reference to pointer where possible
...
Co-authored-by: Kevin Ring <kevin@kotachrome.com>
2021-02-22 14:49:33 +01:00
313136445b
Make requestAsset return a Future.
2021-02-21 23:13:42 +11:00
fbbe928b68
Merge remote-tracking branch 'origin/master' into disk-cache
2021-02-19 11:54:26 +11:00
741f2c1478
An attempt to clarify and simplify the input
2021-02-18 22:38:35 +01:00
d852e5a2bb
Added error messages for tile content loading
...
Fewer TODOs...
2021-02-18 22:05:09 +01:00
2bf174d6f6
Merge remote-tracking branch 'origin/master' into loader-interface
...
# Conflicts:
# Cesium3DTiles/include/Cesium3DTiles/TileContentFactory.h
2021-02-18 21:56:45 +01:00
2f47dee0e3
Cleanups for loader interface
...
Most members of TileContentLoadInput no longer references.
Minor comment updates.
2021-02-18 21:50:29 +01:00
8153de6f89
add updateViewOffline function to wait for all tiles finishing loading
2021-02-18 10:47:56 -05:00
82a02f5295
Merge branch 'master' into doxygen-cleanups
2021-02-17 16:51:46 +11:00
5c0caa966b
Merge remote-tracking branch 'origin/master' into selection-test
2021-02-17 13:47:44 +11:00
7ce97c2aa2
Update Cesium3DTiles/test/TestCreditSystem.cpp
...
Co-authored-by: Nithin Pranesh <nithinpra7@gmail.com>
2021-02-16 15:37:23 +01:00
b82931d875
Don't crash if TMS server doesn't return a response.
2021-02-16 21:05:23 +11:00
70a353f81d
Basic credit system test
2021-02-16 01:12:37 +01:00
67dce23a30
Doxygen fixes
2021-02-15 17:14:49 +01:00
f8aa3d19df
Only allow raster overlays on terrain (for now).
2021-02-15 21:32:43 +11:00
ce3197df2e
Merge remote-tracking branch 'origin/off-by-one' into ion-ui
2021-02-15 08:54:59 +11:00
7280d65ed4
Fix off-by-one error and likely memory leak.
2021-02-15 08:50:10 +11:00
49c734a970
prevent distance squared from going to negative
2021-02-12 13:29:22 -05:00
e4b8b12a95
fix compiler warning
2021-02-10 19:13:20 -05:00
09e10a3033
remove TODO comment
2021-02-10 19:05:53 -05:00
afe7eb69ff
fix compiler warning
2021-02-10 19:03:14 -05:00
59c45604f1
register content type
2021-02-10 18:18:49 -05:00
4a87a0e8e9
add tests for external tileset
2021-02-10 15:49:14 -05:00
3e29cc684f
add tree anotation for 3D tile
2021-02-09 22:32:47 -05:00
bbca6fa7d8
add simples async system
2021-02-09 22:27:08 -05:00
f139ca92a6
auto generating test data macro
2021-02-09 17:09:57 -05:00
d10bd2a16d
Move JsonHelps to CesiumUtility, at ion "me" service.
2021-02-09 22:50:18 +11:00
d7dca0f66d
add test for ancestor meet sse
2021-02-08 16:45:20 -05:00
40002daaa3
Initial draft of tile content loader interface
2021-02-08 18:58:58 +01:00
7b15dc5b37
add tests for selection algorithm
2021-02-08 10:54:03 -05:00
f7caafa626
Add CesiumIonClient library.
...
Also move Uri to CesiumUtility, and add a `post` method to
`IAssetAccessor`.
2021-02-08 21:59:53 +11:00
0749afaff6
add more mock classes for asset requests
2021-02-06 16:25:06 -05:00
9b810bf02e
Initialize LoadResult fields.
2021-02-05 15:55:17 +11:00
d1940b24b2
Remove debug code.
...
And hopefully fix Linux build problems.
2021-02-05 15:23:41 +11:00
61dfa20b9c
WIP impl mock for external tileset
2021-02-04 16:47:12 -05:00
9aa328ac78
Integrate overlay loading into tile loading process.
2021-02-04 17:06:52 +11:00
3e238cec80
Don't load too many raster overlays simultaneously.
2021-02-04 16:38:09 +11:00
54439677e8
Merge remote-tracking branch 'origin/master' into disk-cache-reporting
2021-02-03 17:35:11 +11:00
22c7883f24
Merge remote-tracking branch 'origin/master' into camera-refactoring
2021-02-02 15:41:05 +01:00
6bfccf27cb
Merge pull request #120 from CesiumGS/ion-tileset-credits
...
Parse and collect Ion tileset credits
2021-02-02 23:32:43 +11:00
59a927d6f4
Merge branch 'master' into disk-cache
2021-02-02 00:11:45 -05:00
f160fce6a8
per-tileset credits now being parsed from json and shown
2021-02-01 23:45:12 -05:00
db7b5226f6
Merge remote-tracking branch 'origin/master' into disk-cache
2021-02-02 15:07:05 +11:00
2255bfc75f
Merge branch 'master' into ion-tileset-credits
2021-02-01 22:23:36 -05:00
c54874e797
WIP fixed missing tileset credits
2021-02-01 22:17:18 -05:00
c3d35cfc39
Merge pull request #106 from CesiumGS/gltf
...
Replace tinygltf
2021-02-02 11:17:19 +11:00
37706adc76
Moved CullingVolume to CesiumGeometry
...
Also removed const of members
2021-02-01 16:12:26 +01:00
139ab082a0
Draft of a function to create a ViewState
2021-01-31 20:07:20 +01:00
6c691358fa
Re-introduced getters for ViewState properties
2021-01-31 19:55:27 +01:00
49a7393a78
Merge pull request #103 from CesiumGS/composite
...
Add very basic support for composite (CMPT) tiles
2021-01-28 16:33:50 -05:00
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
fe6640f54c
Omit suffix for radians
2021-01-28 16:20:11 +01:00
f28ea86648
No underscores for public members
2021-01-28 15:38:46 +01:00
c4cf298104
Removed unused functions from ViewState
2021-01-27 21:22:45 +01:00
ac52b0a361
Renamed Frustum to CullingVolume
2021-01-27 21:05:51 +01:00
d61295c713
Merge remote-tracking branch 'origin/gltf' into cmpt
2021-01-27 16:06:47 +11:00
7b47c7eaf3
Merge remote-tracking branch 'origin/master' into gltf
2021-01-27 15:14:56 +11:00
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
0999ac2dfc
Basic comments for TraversalDetails and FrameState
2021-01-26 20:47:30 +01:00
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
4eff25045a
Fix crash caused by runaway refinement.
2021-01-25 17:41:32 +11:00
06fe04dd16
Preserve precision in upsampled tile rectangles.
2021-01-22 18:49:37 +11:00
dff2d63b2f
Add name to glTF model to aid debugging.
2021-01-21 23:40:47 +11:00
7a2b097525
Support multiple b3dms in a cmpt.
2021-01-21 18:45:09 +11:00
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
133b72c4c5
Merge remote-tracking branch 'origin/composite' into cmpt
2021-01-21 14:33:22 +11:00
c3fd8fbce7
Merge remote-tracking branch 'origin/unknown-content' into composite
2021-01-21 10:36:57 +11:00
918ca02af5
Merge remote-tracking branch 'origin/master' into unknown-content
2021-01-21 10:27:02 +11:00
d75c55e705
Merge remote-tracking branch 'origin/master' into gltf
2021-01-20 20:43:26 +11:00
56feb198df
List of errors and warnings instead of a single string for each.
2021-01-20 19:32:14 +11:00
b8bfe33388
More signed/unsigned warnings.
2021-01-20 17:58:02 +11:00
3fe36a7c7b
Fix GCC build problems.
2021-01-20 17:30:01 +11:00
8fdc7518b9
Fix Clang problems.
2021-01-20 17:25:00 +11:00
5d069f204d
Fix test failures.
2021-01-20 15:03:19 +11:00
614b59db21
Remove GltfAccessor and GltfWriter.
2021-01-20 00:15:57 +11:00
522fc6f84f
Fix typo in url
2021-01-19 23:00:17 +11:00
6460f7ca60
Slightly less ugly structure for error case
2021-01-17 14:25:26 +01:00
52dbaf2690
Merge remote-tracking branch 'origin/master' into gltf
2021-01-17 22:17:40 +11:00
11ea3103b0
Optional properties, thorough initialization.
2021-01-17 00:18:00 +11:00
32cbbc501b
Fix misleading comment.
2021-01-15 22:46:30 +11:00
5dd136b26b
Add very basic support for CMPT tiles.
2021-01-15 22:44:10 +11:00
ddd813d2da
JSON open `{` isn't necessarily the first character.
2021-01-15 16:30:29 +11:00
24382bf20a
More sensible structure.
2021-01-15 16:17:06 +11:00
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
51a33ab63f
Revert "Fix crash when adding a new raster overlay."
...
This reverts commit 7975f95795
2021-01-15 14:47:24 +11:00
7975f95795
Fix crash when adding a new raster overlay.
2021-01-15 14:43:31 +11:00
7ff8c61f1a
An attempt to handle errors when creating tile providers...
2021-01-14 22:05:05 +01:00
2e5d631a38
Added error message for exception
2021-01-14 22:04:35 +01:00
d6754a8683
Added warning for unknown magic/content types
2021-01-14 22:04:11 +01:00
f6e902928c
Added warnings for legacy B3DM
2021-01-14 22:02:01 +01:00
4e210229ed
Removed obsolete TODOs for error handling
2021-01-14 22:01:06 +01:00
a954d38b17
!disableCulling -> enableCulling
2021-01-14 14:59:02 -05:00
5e36308572
Merge branch 'master' into optional-frustum-cull
2021-01-14 10:39:34 -05:00
38c5b02c55
Slight simplification of distance calculation
2021-01-14 09:38:01 -05:00
6d9e83447b
Merge remote-tracking branch 'origin/master' into gltf
2021-01-14 23:46:26 +11:00
1f62c98e4e
Fix two small behavior changes.
2021-01-14 21:34:32 +11:00
82574ac030
More tileset tweaks.
2021-01-14 20:52:50 +11:00
2d880fee71
Clean up a few things.
2021-01-14 18:32:32 +11:00
b39229e02e
Merge remote-tracking branch 'origin/master' into tileset-helper-functions-again
2021-01-14 17:52:34 +11:00
edb8fe209b
Add extras, reactivate support for RTC_CENTER.
2021-01-14 17:44:19 +11:00
4718e483f6
create connection for each transaction. Use shared_ptr for completed request
2021-01-13 21:32:27 -05:00
8b4af30717
culled sse, preload siblings fix, semantics improvement
2021-01-13 15:50:33 -05:00
ca40059b41
WIP optional SSE for culled tiles
2021-01-13 10:57:05 -05:00
ab519062b3
Exposed disableFogCulling in TilesetOptions
2021-01-12 16:17:49 -05:00
6a6d2d94de
Draco loading.
2021-01-12 21:40:35 +11:00
2a2450b486
Exposed the tilesVisitedOutsideFrustum count in ViewUpdateResult
2021-01-11 15:13:51 -05:00
5989fa6473
Fixed disableFrustumCulling default and description
2021-01-11 11:50:36 -05:00
b6eb48dbc9
Merge branch 'master' into disk-cache
2021-01-08 16:53:40 -05:00
32f0c371ea
Raster image loading.
2021-01-08 23:10:27 +11:00
2ec456e6ac
Fix test compiler error.
2021-01-08 14:21:58 +11:00
08d173d573
Use CesiumGltf instead of tinygltf.
2021-01-08 14:09:08 +11:00
96fcdf1eef
Removed TODO comment
2021-01-07 12:29:41 -05:00
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
9b1af2bde6
Merge pull request #97 from CesiumGS/upsample-skirt
...
Create skirt for upsampled tile
2021-01-07 12:17:30 +11:00
073b924a5d
use geodetic normal of the edge vertex to drop the skirt
2021-01-06 19:55:28 -05:00
20fa194553
remove EdgeVertex constructor and use list initialization instead
2021-01-06 12:04:13 -05:00
ab4e346d9a
format space
2021-01-06 11:53:26 -05:00
a29aa6d5ce
use struct instead of std::pair for Edge vertex
2021-01-06 11:50:10 -05:00
4295cf43cd
use reference for EdgeIndices
2021-01-06 11:36:55 -05:00
523b0c05fa
use geodetic normal to drop the skirt
2021-01-06 11:28:32 -05:00
f319b63d45
Merge branch 'upsample-skirt' of https://github.com/CesiumGS/cesium-native into upsample-skirt
2021-01-06 11:10:44 -05:00
56fffe9ca3
use IsNumber() to check for int or double for gltf value
2021-01-06 11:10:37 -05:00
7711f71eb8
use const for IAssetRequest interface
2021-01-06 10:53:00 -05:00
b654781b10
Merge remote-tracking branch 'origin/master' into upsample-skirt
2021-01-05 15:01:58 +11:00
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
ae16a4888f
Separate files for glTF reader PoC.
2021-01-04 17:41:37 +11:00
1428b555ce
add test for upsampled skirts
2021-01-03 17:01:21 -05:00
edcf99fad1
add test for upsampling tile without skirt
2021-01-02 23:04:45 -05:00
c29069f613
Some very broken experiments.
2021-01-02 22:23:04 +11:00
e8eb102663
Merge remote-tracking branch 'origin/master' into gltf
2020-12-29 14:04:18 +11:00
c19d74d1f1
Merge pull request #81 from CesiumGS/tileset-credits
...
Content Attribution
2020-12-27 23:09:17 +11:00
628efb3cfc
Moved HtmlAndLastFrameNumber struct into private section.
2020-12-24 00:41:16 -05:00
909b1397c6
fix implicit conversion again
2020-12-23 18:50:23 -05:00
2e24f04b7a
fix implicit conversion again
2020-12-23 18:40:45 -05:00
3109df262f
fix implicit conversion again
2020-12-23 18:30:22 -05:00
381a7d74ce
fix type implicit conversion and unused function
2020-12-23 17:07:14 -05:00
00e22b68de
explicitly create std::string from raw string for tinygltf::Value
2020-12-23 16:40:11 -05:00
9a3b16f7af
indentations to spaces
2020-12-23 16:11:10 -05:00
c1c1408160
add option to expose private src for other libraries. Add tests for SkirtMeshMetadata
2020-12-23 15:57:08 -05:00
aa81efdaac
base64 encoded Bing logo credit
2020-12-23 15:27:26 -05:00
db292ea44c
Bing credits fixes / improvements + json safe read
2020-12-23 14:13:28 -05:00
86144b1c0f
Tileset suggestions
2020-12-23 12:07:08 -05:00
389ee0be49
CreditSystem include <algorithm>
2020-12-23 12:01:05 -05:00
ad6d1ce045
CreditSystem suggestions
2020-12-23 11:40:10 -05:00
0fb213b85f
Extraneous includes, forward declarations, Credit is now struct
2020-12-23 09:44:53 -05:00
ea803db2be
Made function static, no "this" in worker thread
2020-12-23 15:11:08 +01:00
861f1317d2
Minor Bing JSON reading tweak
2020-12-23 00:55:46 -05:00
fa3ceb0ddd
Fixed potentially unsafe JSON reads for Bing credits.
2020-12-23 00:20:48 -05:00
306886b950
Merge remote-tracking branch 'origin/master' into gltf
2020-12-23 14:55:52 +11:00
dfc5f938e0
add option to CMakeList to expose private header for testing
2020-12-22 18:39:56 -05:00
83249c0654
Removed unused lambda capture
2020-12-22 18:11:57 -05:00
c4ccdbab57
fix function signature
2020-12-22 17:41:00 -05:00
36d93d5221
Moved CreditSystem pointers from RasterOverlay to RasterOverlayTileProvider.
2020-12-22 17:38:51 -05:00
b4b18e3230
remove longitude and latitude offset for upsampled skirt
2020-12-22 17:09:15 -05:00
be25d1222b
move functions that deserialize skirt mesh extras to separate file
2020-12-22 14:39:11 -05:00
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
4644410063
Fix -Werrors in CreditSystem
2020-12-22 13:50:34 -05:00
38431fb237
calculate skirt height for upsampled tile
2020-12-22 13:19:30 -05:00
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
c5104cec06
Removed helper function that is unused after merge
2020-12-22 16:05:54 +01:00
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
4012e8d95b
Some member initializations
...
At least pointers should not remain uninitialized.
2020-12-22 14:59:46 +01:00
8fc5433c8e
Minor helper functions
...
Mainly using the JsonHelpers, and adding a new one
2020-12-22 14:59:15 +01:00
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
d8b586e280
Add some logging, pass by const ref.
2020-12-22 12:57:16 +11:00
7fd397734d
Fix gcc compiler warning.
2020-12-22 12:33:58 +11:00
fcbfc4e176
Merge remote-tracking branch 'origin/master' into skirt
2020-12-22 12:25:22 +11:00
7ef66bb523
Merge branch 'master' into tileset-credits
2020-12-21 20:16:36 -05:00
c8ececa0f6
Use multithreaded allocator with tinygltf/RapidJSON.
2020-12-22 12:04:30 +11:00
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
7bdf6f27ec
fix mismatch type
2020-12-21 13:53:41 -05:00
931ae39c47
add skirt for upsample tile
2020-12-21 13:41:21 -05:00
bc434f81bf
WIP convert to rapidjson
2020-12-21 10:40:00 -05:00
951cc35ef3
Merge branch 'master' into tileset-credits
2020-12-21 08:15:29 -05:00
587be7b287
Remove debug code.
2020-12-21 23:00:09 +11:00
83e4955d1e
Remove some debug code.
2020-12-21 22:34:53 +11:00
61ba624f90
Merge remote-tracking branch 'origin/master' into rapidjson
2020-12-21 22:20:09 +11:00
360204f639
Merge remote-tracking branch 'origin/master' into spdlog-integration
2020-12-21 17:50:28 +11:00
251d2d46f6
Finish replacing nlohmann with RapidJSON.
2020-12-21 17:41:56 +11:00
Bao Tran
Kevin Ring
Nithin Pranesh
Marco Hutter
Samuel Vargas
Shehzan Mohammed
Marco Hutter