0feb6258e2
clear tile initializer
2022-06-06 11:28:27 -04:00
31b4e7552d
remove empty files
2022-06-06 11:16:40 -04:00
18743bd15d
update small comments on assert
2022-06-06 10:50:37 -04:00
9b8cf362d9
add raster overlay back to tileset content manager
2022-06-06 10:48:56 -04:00
e0982f5ed1
Fix clang/GCC warnings.
2022-06-06 14:27:26 +10:00
98fd2266e0
Fix bounding volumes.
2022-06-06 14:02:50 +10:00
9239d291ff
Create tile's children when loading content.
2022-06-04 16:41:04 +10:00
62363bc968
resolve missing header
2022-06-03 14:50:46 -04:00
a393049623
format
2022-06-03 13:15:42 -04:00
0a662a7c10
add back RasterOverlayMappedToTile
2022-06-03 13:15:16 -04:00
c5188fdcd2
Terrain partially working, but not creating children correctly yet.
2022-06-03 22:49:29 +10:00
62fb498498
WIP loader for layer.json / quantized-mesh.
2022-06-03 16:42:19 +10:00
c67eca2bc9
add projection for tile content
2022-06-02 12:27:16 -04:00
542dd1be1d
format
2022-06-01 13:40:59 -04:00
90382287c2
return nullopt projection for Cesium ion loader
2022-06-01 11:37:13 -04:00
391cabc218
add projection to tile content
2022-06-01 11:30:21 -04:00
f18ee60c43
Merge pull request #503 from CesiumGS/upsampling-first-overlay
...
Upsample using first overlay with more detail
2022-06-01 04:31:47 +00:00
b728164cb2
Ignore layer.json "bounds" property.
2022-06-01 13:45:24 +10:00
4dcef84b39
Merge branch 'main' into upsampling-first-overlay
2022-05-27 12:42:31 -04:00
8b18f6bef4
removed comments
2022-05-27 12:41:10 -04:00
3cb2ce3db3
fixed tests
2022-05-27 12:34:36 -04:00
2723b41ba7
format
2022-05-26 14:40:57 -04:00
65b83eb421
remove Exp_ prefix in file name
2022-05-26 14:39:47 -04:00
6e9c11e239
privatize some classes
2022-05-26 14:07:05 -04:00
11f0d2c598
order tile initialization
2022-05-26 12:50:42 -04:00
157494d0c7
fix compiler errors
2022-05-26 12:24:17 -04:00
d37395eb12
format
2022-05-26 11:46:21 -04:00
35ffc7971b
pass tile directly to loader
2022-05-26 11:45:58 -04:00
480a654bbc
apply recommended improvement, changes
2022-05-26 09:30:23 -04:00
e65cf93295
Add a comment clarifying something that wasn't obvious to me in review.
2022-05-26 23:12:31 +10:00
f92aeb0a87
Slightly cleaner/more efficient array initialization.
2022-05-26 17:10:58 +10:00
4b1f856471
disallow tileContent to be null
2022-05-25 16:14:24 -04:00
1b0b4e3a54
fix compiler errors
2022-05-25 11:37:29 -04:00
b6237eac50
fix libmorton lib warning
2022-05-25 11:24:01 -04:00
363655531a
fix compiler warning
2022-05-25 10:57:59 -04:00
5aa2e01548
format
2022-05-25 10:35:19 -04:00
843ee4a303
Merge branch 'main' into tile-content-integration
2022-05-25 10:34:15 -04:00
009acf0866
fix compiler error
2022-05-24 16:46:48 -04:00
8c1a44731e
format
2022-05-24 16:00:45 -04:00
da164b78ec
remove implicit info parameters
2022-05-24 15:42:34 -04:00
d121273582
add gltf utilities
2022-05-24 15:30:08 -04:00
7741ea58af
render failed tiles as empty
2022-05-24 14:42:53 -04:00
19580633de
fix batch table upgrader
2022-05-24 12:14:51 -04:00
ddf524eca4
it's purging time!
2022-05-24 11:34:27 -04:00
b5e224e7c0
log errors and warnings when resolving gltf
2022-05-24 11:17:21 -04:00
817e961b01
fix typo
2022-05-24 11:00:16 -04:00
218c5341f5
catch exception when loading tile
2022-05-24 10:55:58 -04:00
a6b89b3759
implicit octree tile should inherit transform from parent tile
2022-05-23 12:42:07 -04:00
eb2939dec5
implicit tile should inherit transform of parent tile
2022-05-23 12:33:13 -04:00
4720ce894a
remove the computeCoverageRectangle function which is now unused
2022-05-23 09:30:29 -04:00
52e2016e39
excluding tiles outside polygons working
2022-05-19 00:13:53 -04:00
060ddd57fd
avoid unnecessary copying of model, just to make an optional [ci skip]
2022-05-18 15:14:54 -04:00
9ecbc9839e
use power of 2 instead of childCount for subtree
2022-05-18 13:07:36 -04:00
962a186fcf
reduce duplicate code when checking availability in subtree
2022-05-18 10:44:02 -04:00
a01998c078
gcc / clang werror fix
2022-05-17 17:59:24 -04:00
7e89563069
option to flip RasterizedPolygonsOverlay/TileExcluder
2022-05-17 17:36:14 -04:00
454e1cf030
change upsample gltf function to return std::optional<Model> if all primitives are clipped
2022-05-17 15:30:04 -04:00
c6d6adbb65
Revert "make sure that the bounds really do get computed when calling create texture coordinates"
...
This reverts commit 2c8f3bf394
2022-05-17 15:01:29 -04:00
657862994f
implement octree loader
2022-05-17 13:15:45 -04:00
2c8f3bf394
make sure that the bounds really do get computed when calling create texture coordinates
2022-05-16 16:48:03 -04:00
d0b0d61cbf
replaced calls to Update with new function, 'isMoreDetailAvailable'
2022-05-16 15:21:43 -04:00
6aef575ea1
make room for implicit octree
2022-05-16 13:43:53 -04:00
c356a77437
fix obb subdivision
2022-05-16 11:28:05 -04:00
3a3f92bfc7
make sure that projection used for bbox calculation and upsample are the same
2022-05-13 19:10:41 -04:00
26d46ad3cf
Revert "subdivide children and upsample children using the first raster tile"
...
This reverts commit 037f2c806d
2022-05-13 16:28:47 -04:00
b54ba30ae2
log errors for implicit loader
2022-05-12 17:39:22 -04:00
037f2c806d
subdivide children and upsample children using the first raster tile
...
with more detail available
2022-05-12 17:12:50 -04:00
22f67901fd
fix nullptr crash when out of occlusion proxies
2022-05-12 16:50:36 -04:00
c8f2d95b3d
remove unnecessary move
2022-05-12 16:40:14 -04:00
e84367e4a0
move setParent to be private
2022-05-12 16:31:16 -04:00
30f5d676e9
fix broken test
2022-05-12 15:30:21 -04:00
0313b600e7
reparent children when moving tile
2022-05-12 13:47:03 -04:00
cf1d6653ee
add the corresponding rectangle when adding the new projection
2022-05-12 13:27:00 -04:00
38f0e9ac2d
fix level offset
2022-05-12 11:30:04 -04:00
0ec1340320
fix test for gcc / clang
2022-05-12 04:12:42 -04:00
149a90c8cc
use unsigned for pool size
2022-05-12 03:47:07 -04:00
60e55c4304
use union of child BVs for culling, general cleanup of culling code
2022-05-12 03:10:42 -04:00
970b2da7b9
add tile url to gltf extra
2022-05-11 17:11:00 -04:00
5064c0ba49
fix region subdivision
2022-05-11 16:40:15 -04:00
ec94c57875
fix external subtree buffer. Add available subtree to tile's children
2022-05-11 15:30:40 -04:00
3065cb3088
format
2022-05-11 14:34:57 -04:00
c16082fdcb
make implicit tileset works with old version
2022-05-11 14:34:29 -04:00
f85258bad5
make sure parent region is never dereferenced when nullpointer
2022-05-10 17:53:03 -04:00
26d8bfaae9
bug fix for subtree availability
2022-05-10 17:46:39 -04:00
22382ca92a
address pull request comments
2022-05-10 17:32:06 -04:00
70d94bbfa4
move code to generate texture coordinates in upsample parent
2022-05-10 17:19:52 -04:00
a6bdd913ef
add subtree initializer to tile
2022-05-10 12:58:52 -04:00
ea4e815010
subdiv OBB
2022-05-09 20:10:42 -04:00
58af362564
pass in the already computed parent bounds, which was crucial for generating correct uvs
2022-05-09 17:28:27 -04:00
f9558f86f4
stop ignoring occlusion info after 5 frames (previously we considered it stale)
2022-05-09 17:27:52 -04:00
ab2f549bb1
subdivide region and S2
2022-05-09 15:05:53 -04:00
d2d9a94ff3
populate subtree back to tile
2022-05-09 13:48:47 -04:00
4489f5b900
upsample parent tile based on a selected overlay index
2022-05-09 13:32:48 -04:00
e1880746ce
get texture coordinate index of implicit context projection
2022-05-09 12:30:27 -04:00
11b06edc9a
generate implicit context projection uvs on the parent tile
2022-05-09 12:08:09 -04:00
63a953246b
prepare to populate the subtree to tile
2022-05-09 11:31:32 -04:00
0bedeb8bdf
explicit empty content
2022-05-06 18:53:31 -04:00
9b67f87184
check if tile is empty
2022-05-06 17:11:27 -04:00
ed8fe48a2d
change order of parameters
2022-05-06 15:06:21 -04:00
22cb311200
request tile content
2022-05-06 15:02:49 -04:00
051f3b166a
instead of culling, don't refine
2022-05-05 15:01:26 -04:00
98f5ff446a
fix unused variable
2022-05-05 14:29:14 -04:00
6c57b000c7
implement the remaining methods for SubtreeAvailability
2022-05-05 14:22:43 -04:00
88eee57e0f
parse subtree availability
2022-05-05 11:23:38 -04:00
04d9e675c3
Merge branch 'main' into occlusion-experiments
2022-05-04 17:52:13 -04:00
4454ce9db5
small changes
2022-05-04 17:51:03 -04:00
c3fc81f48c
add subtree availability and parse both subtree json and binary format
2022-05-04 15:30:49 -04:00
beee13175c
add comment to solve the case where morton index is overflow. Add libmorton
2022-05-03 13:45:45 -04:00
b04e9c6b35
remove entt from submodule
2022-05-03 10:42:59 -04:00
46722d4b6e
Don't kick external tileset children.
2022-05-03 14:55:38 +10:00
fe14094ba3
replace maximum levels with available levels
2022-05-02 15:43:09 -04:00
ccb98f6f0c
parse implicit quadtree
2022-05-02 13:58:07 -04:00
e58ec5b234
Remove pointless line of code.
2022-05-02 10:15:21 +10:00
0a4321af56
Merge branch 'main' into batch-table-hierarchy
2022-05-02 10:11:22 +10:00
82bd7b92c3
Merge pull request #485 from CesiumGS/layered-terrain2
...
Support for multiple layers of quantized-mesh terrain
2022-05-02 10:10:42 +10:00
8fc3b9ab10
Fix race condition in external tileset loading.
2022-04-30 11:10:31 +10:00
51caf12e11
apply code improvements
2022-04-29 19:41:03 -04:00
ea4f0fa6ce
check implicit ext is obj
2022-04-29 10:26:06 -04:00
140a195077
Slightly clearer context variable.
2022-04-29 21:04:57 +10:00
fb850f6069
availabilityLevels uint32_t to match level. Other cleanup.
2022-04-29 20:43:07 +10:00
29efa3a633
Fix clang warnings.
2022-04-29 20:25:36 +10:00
04e02aadab
More cleanup.
2022-04-29 18:53:51 +10:00
440bf1f5f0
Cleanup.
2022-04-29 14:23:09 +10:00
382b4ff105
Simplify tracking of tiles loaded/loading for availability.
2022-04-29 13:47:48 +10:00
ad4e7c89fb
use tileset json loader directly as parent loader
2022-04-28 19:45:23 -04:00
e5025eb135
make room for implicit quadtree
2022-04-28 15:40:14 -04:00
c0f87687f7
add missing headers
2022-04-28 13:07:26 -04:00
afb3b75dd5
don't unload external tiles
2022-04-28 12:43:13 -04:00
138d57968c
remove entt subdirectory
2022-04-28 12:34:21 -04:00
0e19cfae31
refine API
2022-04-28 11:42:52 -04:00
94d025aca2
call loadAvailability in main thread
2022-04-28 11:09:58 -04:00
bf7691fe12
fix if statement
2022-04-28 11:09:21 -04:00
daa373d76c
Fix VS2017 compile error.
2022-04-28 10:26:45 +10:00
e29d19c7e7
Add another test.
2022-04-28 10:10:45 +10:00
6f84bb3a52
Fix clang compile errors.
2022-04-28 09:46:11 +10:00
08d098f985
Add tests, fix a bug.
2022-04-28 09:20:46 +10:00
88e49b4d99
fix for not chaining future together
2022-04-27 17:24:36 -04:00
18255b33fc
remove extraneous call from debugging
2022-04-27 17:01:48 -04:00
52b0ace612
simplify and run format
2022-04-27 16:28:27 -04:00
0b3692f694
implement future caching
2022-04-27 16:23:48 -04:00
e3fecf01bb
dont set the state to done until the availabilty is loaded
2022-04-27 15:36:21 -04:00
9edb1e04e0
notify tile done loading after getting availability
2022-04-27 13:59:06 -04:00
8eeab63eee
load availability before setting tile state to done
2022-04-27 12:30:43 -04:00
277b7e2b61
format
2022-04-27 11:26:04 -04:00
8ebc3c4479
throttle tile loading and don't unload external tile
2022-04-27 11:25:31 -04:00
eb983f103f
Add a test.
2022-04-27 22:59:17 +10:00
8d8a44105c
Fix another clang error.
2022-04-27 22:25:43 +10:00
cd71c1fc1b
Warn about unsupported parentCounts.
2022-04-27 22:23:16 +10:00
52fb42e49c
Warn about binary properties, CHANGES.md, formatting.
2022-04-27 22:12:23 +10:00
c177f94087
Add some doc, bit of cleanup.
2022-04-27 21:09:37 +10:00
befe724e25
Fix clang warnings.
2022-04-27 18:44:50 +10:00
56d00dce9b
Move BatchTableHierarchyPropertyValues to a separate file.
2022-04-27 18:30:02 +10:00
18b586c8f7
Improve batch table hierarchy performance.
2022-04-27 18:11:20 +10:00
e006e7a4a7
fix issue where project crashed if url was not able to load
2022-04-26 16:55:53 -04:00
35cc54e1da
only create implicit children if tile hasn't been unloaded
2022-04-26 17:51:15 -04:00
b51ae1e5e4
Merge branch 'main' into layered-terrain2
2022-04-26 17:48:50 -04:00
e320c2831b
pass request headers to tileset content manager
2022-04-26 16:48:48 -04:00
7fbf7fdedf
more explicit Load result state
2022-04-26 15:48:54 -04:00
280f21a915
set tile to be unconditionally refined when external
2022-04-26 15:19:17 -04:00
71b1952e28
Add support for 3DTILES_batch_table_hierarchy.
...
It's working, but very slow at the moment.
2022-04-26 23:35:52 +10:00
b91d865b60
mark tile to be failed if received no response
2022-04-25 19:20:31 -04:00
da24aff0c9
remove user data storage
2022-04-25 17:35:36 -04:00
d76a20bb53
fix linux error
2022-04-25 17:19:33 -04:00
ea38470a15
delete unneeded code
2022-04-25 17:15:09 -04:00
19dea016ad
fix linux error
2022-04-25 17:00:55 -04:00
8ff948b241
fix linux errors
2022-04-25 16:12:01 -04:00
5789fe4143
fix linux compile errors
2022-04-25 15:49:56 -04:00
f46b773210
improve comments
2022-04-25 01:48:51 -04:00
b57b0cbeba
fix include styles
2022-04-25 01:26:04 -04:00
652e761a81
change layer json functions to return futures
2022-04-25 01:16:32 -04:00
d5e856eb22
moving from context to implicit context
2022-04-22 16:24:19 -04:00
a8098266b8
move create quantized mesh children back to create implicit children if needed
2022-04-22 15:30:33 -04:00
ca830cab1a
begin integrate cesium ion and tileset json loader
2022-04-22 15:30:05 -04:00
490a1a9c9f
make recursive call create implicit children if needed
2022-04-22 14:58:44 -04:00
f96184dade
renaming
2022-04-22 14:40:23 -04:00
828459c892
delete availabilty load record after it has been processed
2022-04-22 14:25:21 -04:00
38b2213846
format
2022-04-22 11:54:27 -04:00
ffb4907f49
resolve external url and post process gltf is now in tileset content manager
2022-04-22 11:49:26 -04:00
1fb0e0f0ea
create tileset content manager and let it handle tile state instead
2022-04-21 17:24:32 -04:00
408556f6ca
Moved request availability tile to Tileset
2022-04-21 17:13:08 -04:00
f4bedee0d7
Revert "only skip upsampling if the tile is actually loading an availabilty tile"
...
This reverts commit b9a630f9ae
2022-04-21 15:26:51 -04:00
b9a630f9ae
only skip upsampling if the tile is actually loading an availabilty tile
2022-04-21 15:16:09 -04:00
5878bcab57
ad callbacks to inform request headers already change
2022-04-20 19:49:25 -04:00
ffe00c24f5
add ion tileset loader
2022-04-20 19:12:44 -04:00
48793400e3
fix pure virtual methods in interface, other small fixes
2022-04-20 18:26:02 -04:00
8d76d3194f
Update Tile from Content before calling prepare.
2022-04-20 15:04:55 +10:00
70d6f3d1b5
add calls to rendererProxy::reset when tile assignment changes
2022-04-19 12:56:26 -04:00
d8de4cde58
add TileOcclusionRendererProxy interface as well as pool for it
2022-04-18 20:26:25 -04:00
8e1f5601c5
let tileset loader to create render resources
2022-04-18 16:05:27 -04:00
7e21527351
add cache of shared futures to avoid duplicate requests for same availability tile
2022-04-18 14:02:28 -04:00
34ed1a4d81
impl other TilesetJsonLoader method
2022-04-18 13:24:31 -04:00
22cae133ec
handle load error
2022-04-18 12:38:01 -04:00
749d50d459
last pointer renaming
2022-04-18 11:44:10 -04:00
f6a45cc0a3
Ignore error of unconditional refine tiles.
2022-04-18 09:38:41 +10:00
f843b345ab
Typo, formatting.
2022-04-17 22:31:38 +10:00
0997d42783
Cleanup, update CHANGES.md.
2022-04-17 17:35:30 +10:00
0ba4011244
Remove unnecessary code.
2022-04-16 23:30:48 +10:00
41541ea518
Formatting.
2022-04-16 23:21:29 +10:00
4bf873bfaf
Improve Forbid Holes, overlays on tiles w/o geometry.
2022-04-16 23:19:01 +10:00
8dd87366a3
format
2022-04-15 17:04:14 -04:00
1b4f7a7ad8
create custom user storage using ecs
2022-04-15 16:47:55 -04:00
2228ce40c3
impl load content for tileset json
2022-04-15 12:04:40 -04:00
a6e8520ead
Don't ping-pong load tiles in forbidHoles mode.
...
Also fix a fairly rare crash after making contentless external tileset
roots unrenderable.
2022-04-16 00:50:40 +10:00
94602161cb
Fix check for content.
2022-04-15 23:37:42 +10:00
b00ced7b0f
Treat external tileset roots without content as non-renderable.
...
In order to avoid holes.
2022-04-15 22:16:44 +10:00
8910f1bbe7
fix one more pointer name
2022-04-14 17:31:06 -04:00
f672761697
simplify for loop
2022-04-14 14:24:29 -04:00
57bf7ded80
prefix pointer names with 'p'
2022-04-14 14:22:43 -04:00
d8c41b94c5
change availabilityLevels to signed int
2022-04-14 14:11:13 -04:00
24adab534d
move invisible functions into the anonymous namespace
2022-04-14 14:05:38 -04:00
6a397234d4
use lowercase for first word in function names
2022-04-14 14:01:43 -04:00
e226614436
replace auto with specifics
2022-04-14 13:59:06 -04:00
08f2aa7f14
avoid potential crash wheen future returns and tileset is gone
2022-04-14 13:36:52 -04:00
9c68b7a55d
avoid capturing reference to logger
2022-04-14 13:22:19 -04:00
25e5963acb
rename HandleQuantizedMesh to createQuantizedMeshChildren
2022-04-14 13:21:04 -04:00
14ea32a8aa
Merge branch 'main' into layered-terrain2
2022-04-14 13:14:56 -04:00
ad2ee9cfcc
Get ion token correctly for TMS.
2022-04-14 20:41:42 +10:00
509108f13d
remove unused lambda capture to fix macos error
2022-04-13 18:45:58 -04:00
132bb7cee2
change constant to unsigned int
2022-04-13 18:43:42 -04:00
cc6d910a4e
load normal tileset.json
2022-04-13 17:59:08 -04:00
867526b5a3
change everything to uint32_t
2022-04-13 17:55:22 -04:00
19bacd08ec
fix another linux error
2022-04-13 17:53:16 -04:00
5627a1ddfd
fix linux compile error
2022-04-13 17:38:39 -04:00
55be1b7454
Merge branch 'main' into layered-terrain2
2022-04-13 17:15:42 -04:00
c683ccc658
get credits from layer json and store in tile context
2022-04-13 17:14:55 -04:00
a394f5a92e
minor cleanup
2022-04-13 16:49:18 -04:00
a63c4b5423
run format and also refactor quantized mesh a little better
2022-04-13 14:22:32 -04:00
88e0f2818e
renaming for clarityt
2022-04-13 13:12:57 -04:00
0f3eefee8a
pass in quad tree id to handle layered terrain...also pContext and ImplicitContext
2022-04-13 13:01:05 -04:00
d5ace4e301
continue searching for availability regardless, other children may need to be searched
2022-04-13 12:42:33 -04:00
13ef6de40e
simplify TilesetContentLoader
2022-04-12 20:03:40 -04:00
a926eecf2f
provide state machine skeleton for TilesetContentLoader
2022-04-12 17:55:07 -04:00
5f8c0d67da
refactored quantized mesh to just extract availability information
2022-04-12 17:40:44 -04:00
af6ca658fc
remove Tile from doLoadTileContent interface
2022-04-12 15:03:42 -04:00
f5949fa996
define interface for TilesetContentLoader
2022-04-12 14:41:09 -04:00
9f862dd186
add load-counter to let tile-update function know tile is still updating availability
2022-04-12 14:04:09 -04:00
0128fe2d50
remove calling .all on futures, future is already executed thanks to asset acessor
2022-04-12 10:04:40 -04:00
b34c8d0def
renamed tiles loaded to availability tiles loaded
2022-04-12 09:54:27 -04:00
4f82bb99ad
bring back 'get availability tile'
2022-04-12 09:44:35 -04:00
89f9a837b2
generate smooth normal
2022-04-11 20:30:50 -04:00
614c264d08
add TileRenderContentLoader
2022-04-11 20:19:59 -04:00
67a9465b2f
debugging
2022-04-11 17:40:00 -04:00
8ba7fe6e12
after identifying possible ancestor, load its availability, then try again
2022-04-11 14:40:18 -04:00
d1bf53e250
search for a promising ancestor with possible availability information
2022-04-11 13:41:18 -04:00
ea66cc8db6
revert; separate implicit 3d tiles and layered terrain
2022-04-11 12:58:02 -04:00
d39e6e9977
use quantized mesh-load, set unknown bool flag
2022-04-11 11:10:55 -04:00
0268d14b2f
Merge remote-tracking branch 'origin/main' into raster-crash
2022-04-11 16:57:58 +10:00
09df792242
remove 'unknown' flag
2022-04-10 20:42:36 -04:00
b8cbcd6a59
remove root context
2022-04-10 20:37:11 -04:00
185df138f5
convert possible ranges to availabilities
2022-04-08 23:31:19 -04:00
dbb32c90fc
make function to just parse the rectangle availability
2022-04-08 22:02:32 -04:00
88f74dda89
implement the execute multiple futures in parallel
2022-04-08 19:07:48 -04:00
6ab7134c7c
if parent id is available yet hasnt loaded...
2022-04-08 12:56:22 -04:00
7a7fa504ab
log the tile ids that have been loaded
2022-04-08 16:31:56 -04:00
15c72356e8
fix headers
2022-04-07 16:18:10 -04:00
c01cc4827c
format
2022-04-07 15:13:00 -04:00
a2e569c5c5
add experimental gltf converters
2022-04-07 15:12:13 -04:00
37a346c086
WIP layered terrain support
2022-04-06 16:04:24 -04:00
edaf900fe0
save raster overlay
2022-04-06 13:33:07 -04:00
6ea1582f8d
add skeleton for tile content loader
2022-04-06 12:51:46 -04:00
94d12ae4e1
select next available tile context for child tiles
2022-04-05 12:37:47 -04:00
0517831f6b
making underlying context a tilecontext, not implicit tile context
2022-04-04 17:50:09 -04:00
5ef794ad8c
make chain of implicit tiling contexts instead of tile contexts
2022-04-01 18:15:25 -04:00
94b0a4313d
parse availability from layer.json
2022-04-01 17:14:24 -04:00
197d1e5f15
add underlying context to context, parse parent layer recursively
2022-04-01 15:42:26 -04:00
d4f5de6817
Use in64_t instead of uint32_t for Cesium ion asset IDs.
2022-03-31 22:13:33 +11:00
1ce789a15e
Escape URL parameters, other cleanup.
2022-03-31 14:10:18 +11:00
7eb663ff52
Merge remote-tracking branch 'origin/main' into wms
2022-03-31 12:01:49 +11:00
f1a7cf0131
fix more clang-format issue
2022-03-30 12:07:57 +10:00
05d4fbf6c5
fix travis-ci errors
...
- clang format
- -Wsign-compare
2022-03-30 11:45:29 +10:00
fd9f3b6ea5
resolve code-review
...
- set default values in WebMapServiceRasterOverlayOptions;
- fix query parameter "format" to MIME type "image/png";
- remove validations on WMS service name and layer names;
- use iterators for std map;
- use fmt::format;
2022-03-30 10:16:22 +10:00
75e9ae83d3
Use std::any instead of void* for renderer options.
2022-03-29 14:48:21 +11:00
4624f4cd0e
add comments
2022-03-25 22:43:21 -04:00
75a3777dce
fix compile error for cesium-native-tests
2022-03-25 19:49:39 -04:00
1a2f305c0a
added custom render options to raster overlay options
2022-03-25 14:57:45 -04:00
1db41f3c0f
Merge pull request #467 from CesiumGS/compute-byte-size
...
Fix how Tile::computeByteSize handles external images
2022-03-25 18:14:10 +11:00
3c3b33f521
add WMS raster overlay
2022-03-25 15:18:28 +10:00
32ad91bbd4
fix how Tile::computeByteSize handles external images
2022-03-24 14:07:09 -04:00
236f015bb3
Merge remote-tracking branch 'origin/main' into finish-onscreen-credits
2022-03-24 09:47:22 +11:00
49575266c6
add bing credit to tile credits
2022-03-22 19:29:15 -04:00
5e4d5d716d
change to semicolon, trim leading and trailing whitespace from credit
2022-03-22 13:13:04 -04:00
587e308b6d
remove optional from credits
2022-03-22 13:12:27 -04:00
bf4e771b8a
Merge pull request #463 from CesiumGS/is-metadata-array
...
Various improvements related to EXT_feature_metadata
2022-03-22 15:51:32 +11:00
878b348339
(re)use TileContentLoadResult instead of Tile to store credits
2022-03-21 20:23:15 -04:00
a7aa6bcb4a
separate gltf copyright with commas into multiple copyrights
2022-03-21 20:20:48 -04:00
a7c3286624
making tiles inherit tileset credits
2022-03-21 12:48:54 -04:00
5dd289f6af
remove isIon, use smaller bing logo
2022-03-21 10:01:08 -04:00
1a724974c3
simplify buffer view copying, this is easier and just as effective for everything except vertex attributes
2022-03-20 23:21:14 -04:00
eaee0c2c53
gcc fixes
2022-03-18 16:44:33 -04:00
ca9476e649
better feature table upsampling, less unnecessary memory in buffers
2022-03-18 14:03:46 -04:00
e523c72eb2
implement upsampling feature tables
2022-03-18 10:37:10 -04:00
2667278050
check if child's content is done loading, and if so transition it
2022-03-17 18:15:53 -04:00
3ef3a86ea0
fix compile error
2022-03-15 18:24:05 -04:00
83c3a1d8d1
Merge branch 'sort-credits-by-frequency' into show-onscreen-credits
2022-03-15 18:18:03 -04:00
519009d663
Merge branch 'main' into sort-credits-by-frequency
2022-03-15 18:13:48 -04:00
f68e734de1
add test to ensure that credit sorting is working
2022-03-15 18:12:49 -04:00
7b692e592e
make sort function output same results for equal elements
2022-03-15 18:12:13 -04:00
8580f6cb5d
replace the hash-map of counts with struct member
2022-03-15 18:11:11 -04:00
d4e15c5e3f
make _credits protected instead of public
2022-03-15 14:29:19 -04:00
a7de8de789
add method to find whether credit is the ion logo
2022-03-14 15:37:38 -04:00
2830b04b07
add ion credits to raster tiles
2022-03-14 12:46:02 -04:00
34ea13a917
Merge branch 'main' into show-onscreen-credits
2022-03-10 15:21:20 -05:00
e2086e98a0
Merge remote-tracking branch 'origin/main' into pass-gltf-copyright
2022-03-10 18:48:25 +11:00
32edab0511
Merge remote-tracking branch 'origin/main' into scope-guard
2022-03-10 18:30:50 +11:00
b4db593d11
remove unused variables in caching struct
2022-03-09 15:44:19 -05:00
6c220652b6
apply ion endpoint caching for ion raster overlay
2022-03-09 15:32:20 -05:00
6ce0003d8f
Merge branch 'main' into cache-ion-endpoints
2022-03-09 12:13:06 -05:00
6f178b1420
Merge branch 'sort-credits-by-frequency' into show-onscreen-credits
2022-03-08 19:03:53 -05:00
678b2c3ef3
Merge branch 'pass-gltf-copyright' into sort-credits-by-frequency
2022-03-08 18:53:49 -05:00
6dc88b6222
Merge branch 'main' into pass-gltf-copyright
2022-03-08 18:53:22 -05:00
e373c38242
remove unnecessary const
2022-03-08 16:57:57 -05:00
250d789726
Merge branch 'sort-credits-by-frequency' into show-onscreen-credits
2022-03-08 16:43:08 -05:00
11137b11ba
final commit
2022-03-08 15:54:21 -05:00
2bda4fc7ec
drop equal sign from sort function
2022-03-08 15:36:07 -05:00
0a0266f3d7
comment out potentially bad sort function...
2022-03-08 15:16:34 -05:00
b94502a5cb
test when all credits have same frequency counts
2022-03-08 15:00:38 -05:00
35be6db6a2
complete copy paste of passing test
2022-03-08 14:48:10 -05:00
40ca78b410
add noexcept to method.. make slight change to make identical to passing test
2022-03-08 14:31:10 -05:00
63aa9f4195
add frequency test; comment out more code
2022-03-08 14:14:54 -05:00
3df67dbf3c
do not sort if num elements is 1 or 0
2022-03-08 13:58:46 -05:00
3b66f5b08c
remove final require
2022-03-08 13:43:11 -05:00
d5590ccbc8
remove final require
2022-03-08 13:40:15 -05:00
a84935c123
remove all but one requires
2022-03-08 13:29:07 -05:00
ee81839bf3
removing potential wrong REQUIRES
2022-03-08 12:58:21 -05:00
10f9563459
another test without requres...
2022-03-08 12:42:12 -05:00
71412e10ec
Revert "remove const & from returning vector, most likely causing the exception"
...
This reverts commit 027cfc211c
2022-03-08 12:28:39 -05:00
027cfc211c
remove const & from returning vector, most likely causing the exception
2022-03-08 12:12:21 -05:00
ee81837ca7
debug travis test
2022-03-08 12:01:18 -05:00
de0884755a
added < operator to sort the credits
2022-03-08 11:45:00 -05:00
4f49666a0f
debugging travis test
2022-03-08 11:17:12 -05:00
6e1ea5628e
fix another test
2022-03-08 11:01:49 -05:00
67c3758c53
add option for per-gltf copyright content to be on-screen
2022-03-08 10:42:43 -05:00
314623b3e7
Merge branch 'sort-credits-by-frequency' into show-onscreen-credits
2022-03-08 10:21:45 -05:00
85eabcfd54
final fix for testing credit system
2022-03-08 10:21:15 -05:00
314559e1ae
Merge branch 'sort-credits-by-frequency' into show-onscreen-credits
2022-03-07 21:09:41 -05:00
8364bc8c5a
check if expected == actual using std::permutation
2022-03-07 21:09:28 -05:00
d69eecd998
Merge branch 'sort-credits-by-frequency' into show-onscreen-credits
2022-03-07 20:40:16 -05:00
2b55bcacda
sorted credits for some reason reverses the order, updated tests
2022-03-07 20:39:11 -05:00
04f54f01ff
Merge branch 'pass-gltf-copyright' into sort-credits-by-frequency
2022-03-07 19:48:25 -05:00
19a20e7c60
run format
2022-03-07 19:48:16 -05:00
a11090ae58
add option to show on-screen credits
2022-03-07 19:47:36 -05:00
214f0ae260
update from branch 1, i.e. pass-gltf-copyright
2022-03-07 19:22:27 -05:00
c23da9273d
undo the thread-safe create credit as unnecessary
2022-03-07 19:14:47 -05:00
66f01f3bb3
Merge pull request #453 from CesiumGS/implicit-transform
...
Pass tile transforms to implicit tiles
2022-03-01 16:44:49 +11:00
b4ee6160dd
apply coding suggestions
2022-02-28 18:06:25 -05:00
2f168cb8c1
pass on root transform to all implicit children
2022-02-28 17:27:23 -05:00
5fa103ccba
pass root transform onto root implicit tile
2022-02-28 16:57:29 -05:00
7be958bdf2
keep track of frequency of credits using an unordered map; sort credits when asked for them
2022-02-28 15:37:35 -05:00
faa92496f4
Merge pull request #431 from CesiumGS/ue5
...
Tweaks to cesium-native to improve compatibility with Unreal Engine 5
2022-02-28 15:29:36 -05:00
7c9e21e81d
put mutex lock line in the create credit function
2022-02-28 15:24:36 -05:00
69438a6306
resolve conflict for CHANGES.md
2022-02-28 13:38:28 -05:00
d9a209bedc
run format
2022-02-28 13:20:13 -05:00
3c8404d2ee
run format
2022-02-28 13:18:06 -05:00
5de9f136ed
add comment for credit variable
2022-02-28 13:03:31 -05:00
3ea9c210e7
add gltf credits for visible tiles to the frame
2022-02-28 13:02:59 -05:00
f020f122b0
add scope guard utility
2022-02-28 13:01:20 -05:00
0815aa6c5e
create credit in the process new tile content function
2022-02-28 12:39:31 -05:00
336ecadbba
add mutex to credit system to make adding credits thread safe
2022-02-28 12:28:15 -05:00
6755bfa7c9
add per-gltf credit to the tile content load result struct
2022-02-28 12:12:18 -05:00
a027f423a4
fix test for serializing/parsing skirt metadata
2022-02-24 16:44:26 -05:00
29681408ec
exclude skirt vertices from computedBounds when generating texture coordinates
2022-02-24 16:43:22 -05:00
a423416ff5
fix copy paste errors
2022-02-24 16:11:06 -05:00
b43265efd4
iterate through non-skirt verts only in gltf computeBounds
2022-02-24 15:31:49 -05:00
712971ca7d
add skirt vertex information, possibly incorrect, will test
2022-02-24 15:24:56 -05:00
8fc260b339
adding vertex information to the skirt mesh metadata struct
2022-02-24 15:19:56 -05:00
7efd09db05
Merge remote-tracking branch 'origin/main' into ue5
2022-02-24 10:48:11 +11:00
e570d6c6db
Merge branch 'main' into expose-ion-endpoint
2022-02-23 09:32:48 -05:00
809ce84dac
fix format
2022-02-22 13:07:24 -05:00
11c2d7fd63
split update tile context with new token into two in order to also update cache with new token
2022-02-22 12:59:19 -05:00
9a24a90cc5
rewrite ion caching using structs that match the Ion Asset Endpoint JSON
2022-02-22 12:13:05 -05:00
847e0009ce
Merge branch 'main' into ktx2-nithin
2022-02-18 14:33:07 -05:00
4f92b7dc4f
const parameter, fixed boolean logic
2022-02-18 11:08:22 -05:00
240532907a
cache only the data is needed to create the tileset from ion response
2022-02-17 16:20:16 -05:00
c2c35257bc
formatting, removed typo
2022-02-17 15:07:28 -05:00
94540fc1e8
Revert "cache ion endpoints to reduce number of bing sessions"
...
This reverts commit a146fd2ae6
2022-02-17 12:39:22 -05:00
3883f25271
exposed ion server as a parameter
2022-02-17 09:58:19 -05:00
fc415a73fa
added file extension -> loader registration
2022-02-15 13:28:57 -05:00
4aa714c005
add proper (?) file extension parsing for gltfs/glbs and quantized mesh (.terrain)
2022-02-15 10:42:58 -05:00
a146fd2ae6
cache ion endpoints to reduce number of bing sessions
2022-02-14 12:45:43 -05:00
1bd26d1e1b
add some tracing
2022-02-10 15:46:16 -05:00
5079c2965b
Load tiles with missing geometric error
2022-02-10 13:32:22 -05:00
4a8aabbf1d
Merge branch 'main' into fix-parse-json-batch-table
2022-02-07 12:31:16 -05:00
f97d9b99f4
apply &= to rest of the types as well
2022-02-07 12:30:56 -05:00
55a96b33bd
Doc tweak.
2022-02-07 22:09:08 +11:00
f7c0c21208
added api for clients to report supported compressed formats
...
added logic to autoselect ideal compressed format based on the reported supported formats
2022-02-03 21:40:31 -05:00
1dbddfb6d0
don't parse json array of double/float if even one element isnt a double/float.
2022-02-02 12:32:50 -05:00
39c7208b14
update comments
2022-02-01 15:30:38 -05:00
de09ca8017
Merge branch 'main' into cesium-rtc-support
2022-02-01 14:41:01 -05:00
1a08065023
fix khr_texture_basisu extension generation
2022-02-01 14:35:47 -05:00
a38383313b
add cesium rtc extension if RTC CENTER is found in b3dm
2022-02-01 14:07:51 -05:00
1f0801f70f
look for rtc center in the cesium rtc extension
2022-02-01 13:42:22 -05:00
e0b6344933
Merge branch 'main' into ktx2-nithin
2022-02-01 12:19:55 -05:00
e81e11b06a
possible fix for vs2017 build
2022-01-31 12:49:27 -05:00
3426825d1d
move code edit to the main branch
2022-01-31 11:37:36 -05:00
0e7830d373
Formatting.
2022-01-25 20:39:19 +11:00
1a100de53e
More renaming for consistency.
2022-01-25 19:36:10 +11:00
c08662fc23
Merge remote-tracking branch 'origin/load-error-reporting' into ue5
2022-01-25 12:16:52 +11:00
a5e3f11846
Impl->CesiumImpl, TWO_PI->TwoPi.
2022-01-25 11:55:43 +11:00
e431237c95
Merge branch 'main' into load-error-reporting
2022-01-24 11:18:46 -05:00
c07417e0ef
Merge branch 'main' into asset-accessor-verb
2022-01-24 10:02:52 -05:00
6bd38478a2
Merge branch 'main' into separate-loading
2022-01-24 09:09:40 -05:00
4b30c9495d
Merge branch 'main' into misc-generator
2022-01-21 14:06:44 +11:00
4c56014fdc
Merge remote-tracking branch 'origin/asset-accessor-verb' into load-error-reporting
2022-01-20 11:18:25 +11:00
f498c631de
startRequest -> reqest.
2022-01-20 11:08:23 +11:00
518b7cbaf0
Rename IAssetAccessor methods, allow use of any verb.
2022-01-20 11:00:29 +11:00
0eb94de378
Error reporting during overlay tile provider creation.
2022-01-20 10:40:01 +11:00
d5201e59ce
Merge remote-tracking branch 'origin/main' into separate-loading
2022-01-19 18:51:07 +11:00
3050c309c3
notify tile done loading when ion response can't be parsed
2022-01-17 22:58:19 -05:00
b2efab0e77
Merge remote-tracking branch 'origin/main' into load-error-reporting
2022-01-18 14:53:13 +11:00
6674eee9fd
fix namespace of GltfReader references
2022-01-13 15:10:08 -05:00
9a7d37dbe1
Move c++20 incompatible code out of header into cpp
2021-12-27 15:11:25 -05:00
f14c6709e1
Misc generator improvements
2021-12-27 13:31:29 -05:00
7f1eb06e24
Fix GCC/clang error.
2021-12-24 14:51:04 +11:00
e5fdb67788
Error reporting for raster overlays.
2021-12-24 14:29:48 +11:00
e428d72050
Report tileset.json load errors, don't claim to report others.
2021-12-24 10:40:19 +11:00
bed8837461
Fix tests.
2021-12-20 10:17:22 +11:00
53b828a9ca
Merge remote-tracking branch 'origin/main' into ktx2-nithin
2021-12-19 17:23:39 -05:00
1f222285b5
Don't avoid loading just because the token is not set.
...
We want to raise an error in this situation.
2021-12-16 13:32:27 +11:00
11eae10d2c
Rename requestAsset->get, post->startRequest (and supoprt any verb)
2021-12-14 22:30:04 +11:00
060ce11030
Select tile level based on the tiling scheme rectangle, not coverage.
2021-12-10 23:41:18 +11:00
e2b269221a
Don't try to load tilesets with no hope of working.
2021-12-10 18:45:21 +11:00
588dec7542
Raise Cesium ion errors to an outside callback.
2021-12-08 15:40:01 +11:00
fce159b427
Remove unnecessary extra lambda.
2021-12-06 18:11:11 +11:00
a39aee07a7
Remove extraneous semicolons.
2021-12-06 17:37:59 +11:00
caf05d6e3c
Header cleanup.
2021-12-06 17:36:50 +11:00
1876a17818
Fix clang warning.
2021-12-06 16:00:13 +11:00
a20d5f1daf
Use CesiumUtility namespace.
2021-12-06 15:56:48 +11:00
a47ec6c36d
Merge remote-tracking branch 'origin/main' into separate-loading
2021-12-06 15:43:25 +11:00
773ecf5cb6
Fix clang warning.
2021-12-06 14:31:00 +11:00
ab0d79a2c9
Move subtree loading out of Tileset.cpp.
2021-12-06 13:11:22 +11:00
5c19574166
Hide the implementation details of our implementation details.
2021-12-03 23:28:29 +11:00
b292342a4d
Move loading operations out of Tileset.cpp.
2021-12-03 23:12:33 +11:00
2cdcb92e20
Namespace cleanup
2021-12-02 18:34:22 -05:00
5cd3d3db09
Merge branch 'main' into debug-overlay
2021-11-29 11:11:05 -05:00
67e73c6a3d
Merge pull request #398 from CesiumGS/mac-test-failures
...
Fix macOS test failures.
2021-11-29 11:03:44 -05:00
55c12d0861
add support for transcoding to more formats
2021-11-27 17:53:27 -05:00
5f424295f1
running into strange deletion problem
2021-11-24 19:45:21 -05:00
c3916567b6
Fix clang warning.
2021-11-23 23:10:57 +11:00
c77eba0fd9
Eliminate errors with empty primitives.
2021-11-23 22:16:27 +11:00
abda4f02e0
Merge remote-tracking branch 'origin/main' into bad-upsample-tex-coords
2021-11-23 21:41:30 +11:00
9311d04bd0
Clean up includes.
2021-11-23 21:12:06 +11:00
096701fa17
More cleanup.
2021-11-23 21:09:45 +11:00
fe7b82bdd6
Merge remote-tracking branch 'origin/main' into implicit-s2
2021-11-23 20:34:50 +11:00
2d5538ab5a
Fix clang warnings.
2021-11-23 17:10:22 +11:00
2f0c6cc5ad
Use better impl for computeBoundingRegion, too.
2021-11-23 16:48:17 +11:00
3707b402bd
Much more accurate subdivision for raster overlays.
2021-11-23 16:38:44 +11:00
787dfec106
Add GlobeRectangle::expandToIncludePosition, improve stability.
2021-11-22 23:20:45 +11:00
a3da758200
Partial fix for broken upsampling with raster overlays.
2021-11-19 22:34:44 +11:00
2456b81d64
Formatting.
2021-11-18 22:31:19 +11:00
c43bfcb3a7
Small tweaks from review.
2021-11-18 22:05:59 +11:00
7456f06e59
Fix macOS test failures.
2021-11-17 23:20:21 -05:00
4587f49618
Merge branch 'implicit-tiling' into implicit-s2
2021-11-17 11:25:18 -05:00
dddf9c1cee
clarify logic in addTileToLoadQueue
2021-11-17 11:22:44 -05:00
1ec0fbe625
fix nullptr context crash, recombine loadContent and continueLoading
2021-11-17 09:43:43 -05:00
b68d3bfdf4
fix bug from merge
2021-11-17 02:40:52 -05:00
59f15a35c8
Merge branch 'implicit-tiling' into implicit-s2
2021-11-17 01:57:02 -05:00
a8582e0989
QuadtreeAvailability and OctreeAvailability classes don't need tiling scheme
2021-11-17 01:54:47 -05:00
a7765dfbc0
Merge branch 'implicit-tiling' into implicit-s2
2021-11-17 01:41:39 -05:00
1ac74f4504
Only load available content, add clear pre/post conditions for loadContent
...
I think the Tile loading state space is slightly clearer now for cases where
content is unavailable, including in implicit tilesets.
2021-11-17 01:26:04 -05:00
18c55e732d
use const references for ImplicitTraversalInfo
2021-11-16 20:43:04 -05:00
cb5ca8b8c5
remove needless move semantics on ImplicitTraversalInfo
2021-11-16 14:59:45 -05:00
592cd2ae96
re-add accidentally deleted comment
2021-11-16 14:33:02 -05:00
7d7e0d7503
don't create subtree node until loading begins
2021-11-16 12:18:59 -05:00
2251b5e7f1
format
2021-11-16 07:56:11 -05:00
968285d5cb
Update Cesium3DTilesSelection/include/Cesium3DTilesSelection/TileContentLoadResult.h
...
Co-authored-by: Kevin Ring <kevin@kotachrome.com>
2021-11-16 07:36:00 -05:00
58a8745203
Update Cesium3DTilesSelection/include/Cesium3DTilesSelection/TileContext.h
...
Co-authored-by: Kevin Ring <kevin@kotachrome.com>
2021-11-16 07:35:37 -05:00
40eb126f89
Update Cesium3DTilesSelection/include/Cesium3DTilesSelection/TileContentLoadResult.h
...
Co-authored-by: Kevin Ring <kevin@kotachrome.com>
2021-11-16 07:35:23 -05:00
e5e5b08964
Update Cesium3DTilesSelection/include/Cesium3DTilesSelection/ImplicitTraversal.h
...
Co-authored-by: Kevin Ring <kevin@kotachrome.com>
2021-11-16 07:35:10 -05:00
65eab0cd53
Update Cesium3DTilesSelection/include/Cesium3DTilesSelection/ImplicitTraversal.h
...
Co-authored-by: Kevin Ring <kevin@kotachrome.com>
2021-11-16 07:35:05 -05:00
78fa9285ca
Update Cesium3DTilesSelection/include/Cesium3DTilesSelection/ImplicitTraversal.h
...
Co-authored-by: Kevin Ring <kevin@kotachrome.com>
2021-11-16 07:34:58 -05:00
e5ab167a25
Update Cesium3DTilesSelection/include/Cesium3DTilesSelection/ImplicitTraversal.h
...
Co-authored-by: Kevin Ring <kevin@kotachrome.com>
2021-11-16 07:34:50 -05:00
6892d1732e
fix comment
2021-11-16 00:07:58 -05:00
17de12244f
Add DebugColorizeTilesRasterOverlay.
2021-11-16 16:04:28 +11:00
b5f73c77af
Only attempt to create implicit children when ContentLoaded AND subtree is loaded
...
Waits to push a tile to Done if it's waiting on a subtree load
2021-11-15 23:25:42 -05:00
c9ae1b7abb
better fix for premature refinement of dummy implicit root
2021-11-15 22:35:02 -05:00
266ac9c1c9
implicit dummy root should not have implicit context + premature refinement fix
2021-11-15 21:43:44 -05:00
e8ec218780
add error catch to loadSubtree and add max subtree loads to TilesetOptions
2021-11-15 16:30:30 -05:00
5cc2be937d
Fix subtree vs content loading race condition
...
Also avoids creating fake upsampled children before subtree is loaded, so we
know there are no _actual_ children.
2021-11-15 15:10:22 -05:00
6c8fba498c
format
2021-11-13 20:32:03 -05:00
368d52ad5c
attempt to fix merge issues, still broken
2021-11-13 19:48:38 -05:00
ee5b04041e
Merge branch 'main' into implicit-tiling
2021-11-13 12:51:16 -05:00
a4b6822ffe
specialize estimateGlobeRectangle for S2CellBoundingVolume
2021-11-12 15:34:53 -05:00
5868f553b3
Merge branch 'main' into overlays-on-3dtiles
2021-11-12 15:21:01 -05:00
de1b237a25
Target C++11 for s2geometry.
...
Apparently it doesn't build when targeting C++17 with Visual Studio.
2021-11-12 20:30:25 +11:00
5111f277a9
Merge branch 'implicit-tiling' into implicit-s2
2021-11-11 20:59:51 -05:00
e54e087674
Merge branch 'external-buffers-images2' into implicit-tiling
2021-11-11 20:43:28 -05:00
8029489dbd
Merge branch 'main' into external-buffers-images2
2021-11-11 20:31:23 -05:00
de378a04a0
format
2021-11-11 18:58:09 -05:00
44801c74f2
Fix possible use-after-free.
2021-11-11 18:47:44 -05:00
4b6f706453
add some logging for failed external buffer loads
2021-11-11 18:47:44 -05:00
52f70e2d80
remove unused variable
2021-11-11 18:47:44 -05:00
f7f7faed80
fix b3dm tests
2021-11-11 18:43:55 -05:00
576dce4514
format
2021-11-11 18:42:08 -05:00
990c432c77
WIP external textures/buffers
2021-11-11 16:47:09 -05:00
3aff3bd80d
Fix compiler errors.
2021-11-10 13:36:04 +11:00
29778d6648
Merge remote-tracking branch 'origin/main' into overlays-on-3dtiles
2021-11-10 13:29:30 +11:00
56d354e65b
Don't try to load the template URI as real content.
2021-11-09 18:30:22 +11:00
f22a9c0f18
missed merge conflict
2021-11-08 21:56:07 -05:00
d53a63b2fa
Merge remote-tracking branch 'origin/main' into s2
2021-11-09 13:36:30 +11:00
58a2941f3d
Merge branch 'external-buffers-images' into implicit-s2
2021-11-08 20:45:15 -05:00
Bao Tran
Kevin Ring
Joseph Kaile
Nithin Pranesh
Tom L
xuelongmu
Sean Lilley