Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tunnel connection points #720

Merged
merged 104 commits into from
Jan 5, 2021
Merged

Tunnel connection points #720

Changes from all commits
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
72ba2c0
bump to citadel, update comms visualization
iche033 Mar 17, 2020
8525667
Adding breadcrumbs to x1 config 7 & 8
Apr 16, 2020
c4d4001
Added additional breadcrumbs
Apr 16, 2020
24b0991
merged with master
Apr 20, 2020
ec1ea45
Update to citadel
Apr 20, 2020
5f7697a
Prevent breadcrumb topics
Apr 23, 2020
db2aa77
Merge branch 'master' into breadcrumb_models
nkoenig Apr 23, 2020
fe173a8
Added breadcrumb handling to more launch files
Apr 23, 2020
5e01ced
Merge branch 'breadcrumb_models' of github.com:osrf/subt into breadcr…
Apr 23, 2020
8841390
Apply patch
Apr 28, 2020
a1a886b
Adjust spawn location of the breadcrumbs
Apr 28, 2020
be97ede
Update cave_circuit.ign to call the corect spawner method (#409)
azeey Apr 29, 2020
1b29050
Add disable_physics_time param to breadcrumb plugin to auto disable them
iche033 Apr 30, 2020
7baee30
Adding team base
May 1, 2020
240a57d
One team base only
May 1, 2020
8c88f38
Merge branch 'master' into comms_visualization
May 4, 2020
72fd347
Cleanup after move from bitbucket
Apr 14, 2020
69a2799
Cleanup
Apr 14, 2020
33d490d
Remove extra whitespace
Apr 14, 2020
f69b91a
Use https for git
Apr 14, 2020
c8ab8d7
Cave Qual release
Apr 20, 2020
f850c58
Merge branch 'comms_visualization' into comms_visualization_citadel
May 4, 2020
117e61e
Update Citadel and Urban Circuit
azeey Nov 15, 2019
590da9c
Merged
May 4, 2020
3875c6c
Update Citadel and Urban Circuit
iche033 Oct 22, 2019
dc43190
Merge branch 'comms_visualization_citadel' of github.com:osrf/subt in…
May 4, 2020
7b571fc
bump to citadel, update comms visualization
iche033 Mar 17, 2020
010ed04
Merge branch 'comms_visualization' of github.com:osrf/subt into comms…
May 4, 2020
af3b079
Update to citadel
iche033 Oct 22, 2019
d96d0e4
Merge branch 'comms_visualization_citadel' of github.com:osrf/subt in…
May 4, 2020
0ef2c40
bump to citadel, update comms visualization
iche033 Mar 17, 2020
5c6982f
Merge branch 'comms_visualization_citadel' of github.com:osrf/subt in…
May 4, 2020
7df121e
Cleanup after rebase
May 4, 2020
7e6f070
Merge pull request #398 from osrf/breadcrumb_models
nkoenig May 5, 2020
3225249
Updates based on review
May 6, 2020
c94f34e
Missed one pose publisher
May 6, 2020
3f78007
one more RawPose
iche033 May 8, 2020
5ef7adb
Merge pull request #411 from osrf/teambase
nkoenig May 11, 2020
5541b2b
Merge pull request #410 from osrf/breadcrumbs_static
nkoenig May 13, 2020
30e2632
Minor cmake tweaks
May 13, 2020
a1878a6
Merge branch 'comms_visualization_citadel' of github.com:osrf/subt in…
May 13, 2020
78fab22
Merge pull request #404 from osrf/comms_visualization_citadel
nkoenig May 13, 2020
713812c
Change colors for comms visualization.
May 19, 2020
3439cd7
Fix docs
May 19, 2020
26da447
Merge pull request #425 from osrf/visibility_colors
nkoenig May 19, 2020
6f689bc
Azeey/marsupial (#424)
nkoenig May 20, 2020
f27805e
Merged with master
May 20, 2020
e470e98
Add missing changes from PRs #402 and #403
azeey May 20, 2020
651c8ca
Merge branch 'master' into cave_feature_release1
May 20, 2020
a1837a1
Adjust platform height
May 20, 2020
ae9e0d3
Merge branch 'cave_feature_release1' into citadel
May 21, 2020
aa34adb
Fix deprecation
May 21, 2020
320362a
Merge branch 'master' into citadel
May 21, 2020
458bfd9
Merged with master
Jun 4, 2020
8279f49
Fix build
Jun 4, 2020
3236c4e
Update to visibility RF model (#440)
acschang Jun 4, 2020
48e5cf7
Merge branch 'master' into citadel
Jul 2, 2020
85e4832
citadel dockerfiles
Jul 2, 2020
b685ecd
Merge branch 'master' into citadel
Jul 9, 2020
fcc0714
Merged with master
Jul 9, 2020
029f530
Fix dependencies
Jul 9, 2020
fe6258e
Download models
Jul 9, 2020
7be9737
Merged with master
Aug 10, 2020
d5f6b53
Path tracer (#545)
nkoenig Aug 20, 2020
d19fdd4
Break out model download into separate docker image.
Aug 20, 2020
e992762
Cleanup
Aug 20, 2020
c0d0b24
merged from master
Aug 26, 2020
9a815e7
Update docker image name
Aug 27, 2020
f4f58ba
Updating docker
Sep 1, 2020
81bc8b9
Merged with master
Sep 1, 2020
746ec6b
Merge branch 'master' into citadel
Sep 9, 2020
c2c1902
Fixed merge
Sep 15, 2020
9b15caf
Handle log files with no events.yml file, and also handle an error ca…
nkoenig Sep 16, 2020
bb093f2
Path tracer rtf (#596)
nkoenig Sep 16, 2020
afa207d
Path tracer colors (#599)
nkoenig Sep 21, 2020
55e1496
Merge from master (#621)
caguero Sep 23, 2020
3b8c7b3
Missing include
Sep 23, 2020
8d99326
Merged with master
Sep 25, 2020
c02b753
Merged with master
Sep 25, 2020
4169306
Merged with master
nkoenig Oct 8, 2020
8b9d293
Disable truth_controller
nkoenig Oct 8, 2020
7f86c9b
Merge branch 'master' into citadel
Nov 9, 2020
1a07a06
Update to use Ignition Dome
Nov 9, 2020
8c10e11
Merged with master
Dec 1, 2020
1e8efed
Updating dockerfiles
Dec 1, 2020
6d233a3
Updating subt_sim_entry dockerfile
Dec 1, 2020
d6e8d6e
Updating model download
Dec 4, 2020
0627a68
Update dockerfile
Dec 7, 2020
af769f9
Update dockefile
Dec 7, 2020
525984b
Update subt_sim_entry
Dec 9, 2020
5329a15
Merged with master
Dec 9, 2020
201bc74
Merge branch 'citadel' into dome
Dec 9, 2020
51cb515
Merge branch 'master' into citadel
Dec 9, 2020
7d26805
Merge branch 'citadel' into dome
Dec 9, 2020
411f0f4
Merge branch 'master' into breakout_model_docker
Dec 9, 2020
d646310
Update docker
Dec 9, 2020
0760921
Fixing docker images
Dec 9, 2020
9cbce68
Fixing docker
Dec 9, 2020
e267a88
Improve git clone
Dec 10, 2020
5c0b8ea
Add back in ros_ign bridge to cloudsim_sim dockerfile
Dec 10, 2020
6c0f4e8
Tunnel connection points
Dec 10, 2020
bf6e4f7
added subt_tunnel_staging_area
Dec 14, 2020
8d8e9ba
merged with master
Jan 4, 2021
57594ea
Fixed connection points
Jan 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions subt_ign/src/ConnectionHelper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,29 @@
std::map<std::string, std::vector<ignition::math::Vector3d>>
subt::ConnectionHelper::connectionPoints =
{
{"Constrained Tunnel Tile Short", {{0, -10, 0}, {0, 10, 0}}},
{"Constrained Tunnel Tile Tall", {{0, -10, 0}, {0, 10, 0}}},
{"Tunnel Bend Right", {{0, 0, 0}, {17.5, 25, 0}}},
{"Tunnel Corner Left", {{0, 0, 0}, {-10, 10, 0}}},
{"Tunnel Corner Right", {{0, 0, 0}, {10, 10, 0}}},
{"Tunnel Elevation", {{0, 0, 0}, {0, 10, 5}}},
{"Tunnel Intersection", {{0, 0, 0}, {7.5, 7.5, 0}, {-7.5, 7.5, 0}, {0, 15, 0}}},
{"Tunnel Intersection T", {{0, 0, 0}, {7.5, 7.5, 0}, {-7.5, 7.5, 0}}},
{"Tunnel Straight", {{0, 0, 0}, {0, 5, 0}}},
{"subt_tunnel_staging_area", {{10, 0, 0}}},
{"Tunnel Tile 1", {{0.0, 10.0, 0.0}, {10.0, 0.0, 0.0}, {0.0, -10.0, 0.0}, {-10.0, 0.0, 0.0}}},
{"Tunnel Tile 2", {{10, 0, 0}, {0, -10, 0}}},
{"Tunnel Tile 3", {{0.0, 10.0, 0.0}, {10.0, 0.0, 0.0}, {0.0, -10.0, 0.0}, {-10.0, 0.0, 0.0}}},
{"Tunnel Tile 4", {{0.0, 10.0, 0.0}, {10.0, 0.0, 0.0}, {0.0, -10.0, 0.0}, {-10.0, 0.0, 0.0}}},
{"Tunnel Tile 5", {{0, -10, 0}, {0, 10, 0}}},
{"Tunnel Tile 6", {{0, -10, 0}, {0, 10, 5}}},
{"Tunnel Tile 7", {{0, -10, 0}, {0, 10, 5}}},
{"Rough Tunnel Tile 90-degree Turn", {{0, -10, 0}, {10, 0, 0}}},
{"Rough Tunnel Tile Ramp", {{0, -10, 0}, {0, 10, 5}}},
{"Rough Tunnel Tile Straight", {{0, -10, 0}, {0, 10, 0}}},
{"Rough Tunnel Tile Vertical Shaft", {{0, -10, 0}, {0, 10, 5}}},
{"Rough Tunnel Tile 4-way Intersection", {{0, -10, 0}, {0, 10, 0}, {10, 0, 0}, {-10, 0, 0}}},

{"Urban Straight", {{0, 20, 0}, {0, -20, 0}}},
{"Urban Straight Lights", {{0, 20, 0}, {0, -20, 0}}},
{"Urban Bend Right", {{0, -20, 0}, {20, 0, 0}}},
Expand Down