Repository navigation
ariadne live: the document names its city (cvcpkg data), the demos read the host's load - #153
Merged
Merged
Conversation
…load docs/live.ari names the Austin city in a data: block (libcvc's Ariadne data, transfix/libcvc#998): the scene-austin-south-small package on cvcpkg.org, downloaded once (later runs read the cache), unpacked into the state tree and decoded. Its city node draws the terrain, the package's aerial image draped over it, and the buildings. - _host: load_document (the store may reach the registry; --bundle / GRL_SNAM_SCENE_BUNDLE point data.city at a local bundle instead, nothing downloaded), document_city (the loaded world as a City; the installed bundle stands in when the package cannot load), city_file (a package file a path-based reader needs: the Humvee), DemoHost.city. - demos._common: City (sample, bounds, occupancy) and open_city: the host's city when it has one, else the installed bundle drawn into the lab as before (loaded once for every occupancy grid); world_occupancy, shared with bundle_occupancy. - austin_freedrive / austin_learned / austin_patrol take their terrain sampler, bounds, occupancy and SDF from open_city, so under the live port no bundle file is read twice. - live: --bundle; headless is refused before the document loads (no download for nothing); the planner never loads the city; the Humvee comes from the city's package when it carries one.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The live ports now get their city from the document.
docs/live.arinames the Austin city in adata:block, the host loads it once, and the demos read that same load instead of reading the bundle from disk. This is phase D2 of libcvc'sdocs/roadmap/ARIADNE_DATA_ROADMAP.md.How the city loads
citynode draws the terrain, with the package's aerial image draped over it, and the buildings.DemoHost.city: its terrain sampler, bounds, occupancy grids and SDF. So the bundle is read once, and never as files.The changes
grl_snam.ariadne._hostload_documentlets the data store reach the registry (CVCPKG_URL's origin, else https://cvcpkg.org). With--bundle DIRorGRL_SNAM_SCENE_BUNDLE, it pointsdata.cityat that local bundle instead, and nothing is downloaded.document_cityturns what loaded into aCity. When the package cannot load (offline, no cache), the installed bundle stands in.city_filegives a path-based reader one file of the package; the Humvee uses it.DemoHost.cityis new.grl_snam.demos._commonCityhassample,boundsandoccupancy.open_city(host, lab)returns the host's city when it has one.world_occupancyis shared withbundle_occupancy.austin_freedrive/austin_learned/austin_patroltake their sampler, bounds, occupancy and SDF fromopen_city. Under VolRover3 and--standalonethey behave as before.live--bundleoption.austin-plannernever loads the city.Needs
transfix/libcvc#998 (Ariadne data) and transfix/libcvc#985 (the Python host). Until a pycvc release carries both, the port tests keep skipping in CI as they do now.
DemoHost.cityreturns None and the demos load the installed bundle as before.data:block and itscitynode are then ignored, with a warning.Tested
Run on Windows against a local libcvc build with #998 and #985 merged together (head 9c7cf70a, local only).
tests/test_ariadne_ports.py12 passed, 2 skipped (no installed bundle on this box, and the GL-only checks).imageiomissing from this box's Python, and pass once it is installed;live austin-freedrive --offscreen --frames 300 --png ..., with only the weights on disk (GRL_SNAM_CHECKPOINT) and no scene bundle.scene-austin-southpackage is sharper, at 117 MB downloaded once.