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.

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

chore: sync beta branch beta/v0.28.0 with tier4/main #1307

Merged
merged 128 commits into from
May 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
128 commits
Select commit Hold shift + click to select a range
859776d
feat(intersection): resurrect debug ego-object ttc visualizer (#6829)
soblin Apr 17, 2024
8319209
docs(perception_online_evaluator): update metrics explanation (#6819)
kosuke55 Apr 17, 2024
51b5f83
feat(logger_level_configure): make it possible to change level of con…
satoshi-ota Apr 17, 2024
774e688
feat(crosswalk): restricts to enter the IGNORE status (#6834)
yuki-takagi-66 Apr 18, 2024
a336fa8
feat(obstacle_cruise): ignore right beside objects (#6754)
yuki-takagi-66 Apr 18, 2024
52c8df5
feat(behavior_path_planner_common): add safety target object located …
kyoichi-sugahara Apr 18, 2024
fac57c9
revert: "feat(logger_level_configure): make it possible to change lev…
satoshi-ota Apr 18, 2024
3adffc3
perf(pointcloud_preprocessor): prevent excessive log and speed up a b…
KYabuuchi Apr 18, 2024
b34e520
chore: added sensing members to sensing related packages (#6751)
knzo25 Apr 19, 2024
e11b1f4
refactor(lane_change): make return previous output a common function …
zulfaqar-azmi-t4 Apr 19, 2024
e5b3f60
feat(dynamic_avoidance): avoid pedestrians (#6553)
yuki-takagi-66 Apr 19, 2024
c93648c
chore: update CODEOWNERS (#6603)
awf-autoware-bot[bot] Apr 19, 2024
7b28702
build(deps): bump actions/checkout from 3 to 4 (#4890)
dependabot[bot] Apr 19, 2024
fb5b20f
chore: update CODEOWNERS (#6856)
awf-autoware-bot[bot] Apr 20, 2024
6a78774
feat(probabilistic_occupancy_grid_map): enable to create partial occu…
YoshiRi Apr 22, 2024
8adf18e
perf(behavior_path_planner): improve getReferencePath to support very…
maxime-clem Apr 22, 2024
4917b54
feat: remake diagnostic graph packages (#6715)
isamu-takagi Apr 22, 2024
1da2091
docs(tier4_logging_level_configure_rviz_plugin): update document (#6720)
zulfaqar-azmi-t4 Apr 22, 2024
75885a5
refactor(lane_change): refactor min and max lane change length (#6845)
zulfaqar-azmi-t4 Apr 22, 2024
c09bc59
refactor(bpp, avoidance): remove unnecessary verbose flag (#6822)
satoshi-ota Apr 22, 2024
00db87d
feat(perception_online_evaluator): add use_perception_online_evaluato…
kosuke55 Apr 22, 2024
5a25d84
feat(pointcloud_preprocessor): add pickup based voxel grid filter (#6…
yukkysaito Apr 22, 2024
5b1b776
feat(tier4_screen_capture_panel): add new service to capture screen s…
satoshi-ota Apr 23, 2024
702b183
feat(bpp-interface): add empty path validation (#6868)
satoshi-ota Apr 23, 2024
5a6cde9
refactor(bpp): simplify extended predicted object initialization (#6858)
zulfaqar-azmi-t4 Apr 23, 2024
8881d23
chore(roi_pointcloud_fusion): add maximum cluster size param (#6860)
badai-nguyen Apr 24, 2024
6459816
feat(perception_evaluator): counts objects within detection range (#…
kosuke55 Apr 24, 2024
1b6b942
perf(behavior_path_planner_common): simplify turn signal loop to supp…
maxime-clem Apr 24, 2024
29cd854
refactor(lane_change): fix logger (#6873)
zulfaqar-azmi-t4 Apr 24, 2024
f9de26d
fix(image_projection_based_fusion): add intensity field for roi_point…
badai-nguyen Apr 24, 2024
f297d06
revert: feat(global_parameter_loader): add gtest to global parameter …
h-ohta Apr 24, 2024
41bee43
feat(learned_model): create package (#6395)
atomyks Apr 24, 2024
a6c6912
feat(perception_online_evaluator): imporve yaw rate metrics consideri…
kosuke55 Apr 24, 2024
d5cef0d
feat(freespace_planning_algorithms): add Astar search by python (#6398)
TakumIto Apr 25, 2024
77e8a8b
fix(tier4_perception_launch): change traffic light recognition pipeli…
mebasoglu Apr 25, 2024
a2c4de5
feat(system diags): rename diag of ndt scan matcher (#6889)
YamatoAndo Apr 25, 2024
80eca5e
feat(autonomous_emergency_braking): filter and crop aeb pointcloud (#…
danielsanchezaran Apr 26, 2024
553ac9a
fix(route_handler): add logger (#6888)
zulfaqar-azmi-t4 Apr 26, 2024
1872e9b
refactor(sensing/livox_tag_filter): rework parameters (#6743)
oguzkaganozt Apr 26, 2024
2809a67
feat(ndt_scan_matcher): remake diag (#5076)
YamatoAndo Apr 26, 2024
46905ee
refactor(centerpoint, pointpainting): rearrange parameters for ML mod…
badai-nguyen Apr 26, 2024
44c6169
fix(lidar_centerpoint): add param file for centerpoint_tiny (#6901)
badai-nguyen Apr 26, 2024
7f368a2
fix(avoidance): fix bug in the logic to check object moving distance …
satoshi-ota Apr 29, 2024
6116001
fix(ekf_localizer): updated ekf gate_dist params (#6871)
SakodaShintaro Apr 30, 2024
f059d1b
chore(autoware_auto_perception_rviz_plugin): improve distant object v…
TakaHoribe Apr 30, 2024
766b1b1
fix(avoidance): fix logic to check if it is parked vehicle (#6731)
satoshi-ota Apr 30, 2024
b630838
fix(avoidance): don't avoid merging/deviating vehicle whose overhang …
satoshi-ota Apr 30, 2024
00d8222
fix(bpp): change wrong function parameter's type for safety check (#6…
zulfaqar-azmi-t4 Apr 30, 2024
8fe1685
feat(autoware_overlay_rviz_plugin): get the current traffic light (#6…
maxime-clem Apr 30, 2024
162f331
fix(avoidance): add missing parameter declaration (#6908)
satoshi-ota May 1, 2024
62d26be
fix(trajectory_follower_node): fix config file of plot juggler (#6910)
tkimura4 May 1, 2024
38ab80e
chore(component_state_monitor): relax pose_estimator_pose timeout (#6…
shmpwk May 1, 2024
7f9a322
docs(tier4_simulated_clock_rviz_plugin): update how to use (#6914)
zulfaqar-azmi-t4 May 1, 2024
52f4b3e
refactor(avoidance): rebuild object info list (#6913)
satoshi-ota May 2, 2024
23f99a7
feat(mission_planner): publish initial and goal poses to logs (#6918)
zulfaqar-azmi-t4 May 2, 2024
4740914
feat(pull_request_templates): improve the pull request template to en…
Owen-Liuyuxuan May 3, 2024
b307b3d
chore(radar_track_msgs_converter): change radar tracks subscription q…
YoshiRi May 4, 2024
aab29f7
feat(probabilistic_occupancy_grid_map): add downsample filter option …
YoshiRi May 6, 2024
76de4dd
fix(behavior_path_planner_common): fix warning of containerOutOfBound…
veqcc May 6, 2024
ebe360d
fix: do not use c++20 char8_t keyword (#3629)
ralwing May 6, 2024
28d384e
fix(control_performance_analysis): fix bug of ignoredReturnValue (#6921)
veqcc May 6, 2024
4200be3
fix(perception_online_evaluator): fix bug of constStatement (#6922)
veqcc May 7, 2024
ccbe319
refactor(bpp): path shifter clang tidy and logging level configuratio…
zulfaqar-azmi-t4 May 7, 2024
1fecd17
fix(occupancy_grid_map_outlier_filter): add intensity field (#6797)
badai-nguyen May 7, 2024
dc62238
feat(crosswalk)!: change ego min assumed speed (#6904)
yuki-takagi-66 May 7, 2024
985b735
perf(lane_change): rework object filter (#6847)
zulfaqar-azmi-t4 May 7, 2024
32359da
fix(lane_change): return safe is object list is empty (#6931)
zulfaqar-azmi-t4 May 7, 2024
a06d4af
fix(diagnostic_graph_aggregator): fix a bug where unit links were inc…
isamu-takagi May 7, 2024
fbbb2f3
feat(autonomous_emergency_braking): add obstacle velocity estimation …
danielsanchezaran May 7, 2024
edc7878
feat(start_planner): add centerline crossing check (#6900)
danielsanchezaran May 7, 2024
21bbbd2
fix(ground_segmentation): fix warning of identicalConditionAfterEarly…
veqcc May 8, 2024
18813bf
fix(voxel_grid_downsample_filter): add intensity field (#6849)
badai-nguyen May 8, 2024
43adbd5
feat(freespace_planner): only plan if ego is stopped (#6062)
VRichardJP May 8, 2024
2c9a936
feat(image projection based fusion): unrecify 3d point for image proj…
yukkysaito May 8, 2024
db38f04
perf(route_handler): simplify queries on the road and shoulder lanele…
maxime-clem May 8, 2024
da9df0c
refactor(lane_change): move getCurrentTurnSignalInfo to scene file (#…
zulfaqar-azmi-t4 May 8, 2024
b6d7477
refactor(avoidance): organize alias (#6947)
satoshi-ota May 8, 2024
6d00269
fix(tvm_utility): fix warning of negativeContainerIndex (#6924)
veqcc May 8, 2024
6ba26e5
perf(yabloc): fix performance warning of iterateByValue (#6929)
veqcc May 8, 2024
e517f09
feat: add low_intensity_cluster_filter (#6850)
badai-nguyen May 8, 2024
39cccb6
feat(vehicle_cmd_gate): support for real time update params for v cmd…
danielsanchezaran May 9, 2024
8c7adc3
fix(traffic_light_classifier): fix warning of uninitvar (#6925)
veqcc May 9, 2024
b5b7f95
feat(build_depends): add glog-vendor (#6952)
TakaHoribe May 9, 2024
f30268c
feat(goal_planner): align z-height of road_shoulder (#6854)
soblin May 9, 2024
baeeab5
feat(autoware_pose_covariance_modifier): add new node to early fuse g…
meliketanrikulu May 9, 2024
788b2e3
chore(glog): add initialization check (#6792)
TakaHoribe May 9, 2024
dd19bb8
feat(image projection based fusion): revert #6902 (unrecify 3d point …
yukkysaito May 9, 2024
2f46b25
chore: update sensing/perception maintainer (#6950)
YoshiRi May 9, 2024
473f238
fix(system_monitor): fix warning of containerOutOfBounds (#6927)
veqcc May 9, 2024
569d56c
fix(bpp): keep publishing rtc cooperate status (#6953)
satoshi-ota May 9, 2024
729eec0
fix(ground_segmentation): add intensity field (#6791)
badai-nguyen May 9, 2024
010965b
fix(freespace_planner): fix motion_velocity_smoother error while park…
ahmeddesokyebrahim May 9, 2024
d5aa5d6
feat(map_based_prediction): use different time horizon (#6877)
soblin May 10, 2024
c7c826d
fix(map_based_prediction): improve pedestrian path generation efficie…
technolojin May 10, 2024
35d39e7
feat(goal_planner): fix non-thread-safe access in goal_planner (rever…
soblin May 10, 2024
04faf5e
feat(autonomous_emergency_braking): add param update support for AEB …
danielsanchezaran May 10, 2024
32186de
fix(autonomous_emergency_braking): add missing erase to velocity hist…
danielsanchezaran May 10, 2024
9378b4f
fix(componet_state_monitor): remove ndt node alive monitoring (#6957)
YamatoAndo May 10, 2024
299b050
feat(path_sampler): make the trajectory smoother, add params, fix cra…
maxime-clem May 10, 2024
885c0af
fix(map_based_prediction): revert use different time horizon (#6877) …
YoshiRi May 10, 2024
bca574a
feat(control_evaluator): implement a control evaluator (#6959)
danielsanchezaran May 10, 2024
e218218
feat: update rviz2 overlay (#6883)
KhalilSelyan May 10, 2024
c24ad46
perf(side_shift): fix unupdated prev path that caused heavy interpola…
maxime-clem May 10, 2024
8176c63
refactor(mission_planner): remove redundant `is_reroute` check (#6980)
veqcc May 11, 2024
fd6306d
fix(autoware_overlay_rviz_plugin): fix subs and cleanup (#6978)
xmfcx May 11, 2024
bffbcce
fix(accel_brake_calibrator): fix to set service name and exception fa…
h-ohta May 13, 2024
fd89ca2
test: behavior path obstacle avoidance (#6972)
go-sakayori May 13, 2024
bd46dc3
feat(rtc_interface)!: add new field to rtc cooperate status (#6933)
satoshi-ota May 13, 2024
f3cd528
fix(behavior_velocity_run_out_module): initialize `accel_reason_` (#6…
veqcc May 13, 2024
86804e1
feat: add autoware_remaining_distance_time_calculator and overlay (#6…
ahmeddesokyebrahim May 13, 2024
7302cd7
fix(accel_brake_map_calibrator): fix accel_brake_map_calibrator not t…
tkimura4 May 13, 2024
2f2438e
feat(mrm_emergency_stop_operator): add support for real time param re…
danielsanchezaran May 13, 2024
aff5370
feat(map_based_prediction): incorporate crosswalk user history (#6905)
dkoldaev May 13, 2024
d9b3df7
feat(out_of_lane): add option to ignore overlaps in lane changes (#6991)
maxime-clem May 13, 2024
b6bd750
feat(tier4_perception_launch): downsample perception input pointcloud…
YoshiRi May 13, 2024
a3c1ed3
feat(tier4_perception_launch): fix typo error (#6999)
YoshiRi May 14, 2024
a714f94
refactor(behavior_velocity_occlusion_spot_module): reduce cppcheck wa…
veqcc May 14, 2024
ac5190b
fix(ndt_scan_matcher): improved tpe (#6990)
SakodaShintaro May 14, 2024
0e6f175
refactor(behavior_velocity_occlusion_spot_module): remove unnecessary…
veqcc May 14, 2024
590518f
chore(tools): move system and evaluation tools to autoware_tools repo…
satoshi-ota May 14, 2024
f012a75
chore: added maintainer (#7003)
go-sakayori May 14, 2024
a5fdb8d
chore: update CODEOWNERS (#6866)
awf-autoware-bot[bot] May 14, 2024
f30c035
feat(smart_mpc_trajectory_follower): add smart_mpc_trajectory_followe…
masayukiaino May 14, 2024
2ae1716
perf(behavior_path_dynamic_avoidance_module): use const reference (#6…
veqcc May 14, 2024
a4bb177
refactor(turn_signal_decider): straddle bound method (#7006)
danielsanchezaran May 14, 2024
ea009b8
feat(goal_planner): reject candidate path whose start pose direction …
soblin May 14, 2024
e6f7a01
Merge remote-tracking branch 'origin/beta/v0.28.0' into sync-upstream
TakaHoribe May 15, 2024
6bb900d
Merge pull request #1298 from tier4/sync-upstream
tier4-autoware-public-bot[bot] May 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 5 additions & 2 deletions .cspell.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"ignorePaths": ["perception/bytetrack/lib/**"],
"ignorePaths": [
"perception/bytetrack/lib/**",
"planning/behavior_velocity_intersection_module/scripts/**"
],
"ignoreRegExpList": [],
"words": ["dltype", "tvmgen"]
"words": ["dltype", "tvmgen", "fromarray"]
}
45 changes: 26 additions & 19 deletions .github/CODEOWNERS

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE/small-change.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ Not applicable.

Not applicable.

## Interface changes

<!-- Describe any changed interfaces, such as topics, services, or parameters, including debugging interfaces -->

## Pre-review checklist for the PR author

The PR author **must** check the checkboxes below when creating the PR.
Expand Down
13 changes: 13 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE/standard-change.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,19 @@

<!-- Describe any changed interfaces, such as topics, services, or parameters. -->

### ROS Topic Changes

<!-- | Topic Name | Type | Direction | Update Description | -->
<!-- | ---------------- | ------------------- | --------- | ------------------------------------------------------------- | -->
<!-- | `/example_topic` | `std_msgs/String` | Subscribe | Description of what the topic is used for in the system | -->
<!-- | `/another_topic` | `sensor_msgs/Image` | Publish | Also explain if it is added / modified / deleted with the PR | -->

### ROS Parameter Changes

<!-- | Parameter Name | Default Value | Update Description | -->
<!-- | -------------------- | ------------- | --------------------------------------------------- | -->
<!-- | `example_parameters` | `1.0` | Describe the parameter and also explain the updates | -->

## Effects on system behavior

<!-- Describe how this PR affects the system behavior. -->
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test-arm64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
build-depends-repos: build_depends.repos
steps:
- name: Check out repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Show disk space before the tasks
run: df -h
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test-differential-arm64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
build-depends-repos: build_depends.repos
steps:
- name: Check out repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-and-test-differential.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
build-depends-repos: build_depends.repos
steps:
- name: Check out repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
container: ghcr.io/autowarefoundation/autoware-openadk:latest-prebuilt-cuda
steps:
- name: Check out repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
build-depends-repos: build_depends.repos
steps:
- name: Check out repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Show disk space before the tasks
run: df -h
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-build-depends.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
build-depends-repos: build_depends.repos
steps:
- name: Check out repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Remove exec_depend
uses: autowarefoundation/autoware-github-actions/remove-exec-depend@v1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/clang-tidy-pr-comments-manually.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Download analysis results
run: |
Expand All @@ -36,7 +36,7 @@ jobs:

- name: Check out PR head
if: ${{ steps.check-fixes-yaml-existence.outputs.exists == 'true' }}
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ${{ steps.set-variables.outputs.pr-head-repo }}
ref: ${{ steps.set-variables.outputs.pr-head-ref }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/clang-tidy-pr-comments.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Download analysis results
run: |
Expand All @@ -37,7 +37,7 @@ jobs:

- name: Check out PR head
if: ${{ steps.check-fixes-yaml-existence.outputs.exists == 'true' }}
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ${{ steps.set-variables.outputs.pr-head-repo }}
ref: ${{ steps.set-variables.outputs.pr-head-ref }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/delete-closed-pr-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/json-schema-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
outputs:
run-check: ${{ steps.paths_filter.outputs.json_or_yaml }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: dorny/paths-filter@v3
id: paths_filter
with:
Expand All @@ -25,7 +25,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Run json-schema-check
uses: autowarefoundation/autoware-github-actions/json-schema-check@v1
Expand Down
4 changes: 4 additions & 0 deletions build_depends.repos
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,7 @@ repositories:
type: git
url: https://github.com/MORAI-Autonomous/MORAI-ROS2_morai_msgs.git
version: main
universe/external/glog: # TODO: to use isGoogleInitialized() API in v0.6.0. Remove when the rosdep glog version is updated to v0.6.0 (already updated in Ubuntu 24.04)
type: git
url: https://github.com/tier4/glog.git
version: v0.6.0_t4-ros
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ namespace types
// We don't currently require code to comply to MISRA, but we should try to where it is
// easily possible.
using bool8_t = bool;
#if __cplusplus < 201811L || !__cpp_char8_t
using char8_t = char;
#endif
using uchar8_t = unsigned char;
// If we ever compile on a platform where this is not true, float32_t and float64_t definitions
// need to be adjusted.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ struct ObjectPropertyValues
float alpha{0.999F};
};

// Control object marker visualization
enum class ObjectFillType { Skeleton, Fill };

// Map defining colors according to value of label field in ObjectClassification msg
const std::map<
autoware_auto_perception_msgs::msg::ObjectClassification::_label_type, ObjectPropertyValues>
Expand Down Expand Up @@ -87,7 +90,8 @@ get_shape_marker_ptr(
const autoware_auto_perception_msgs::msg::Shape & shape_msg,
const geometry_msgs::msg::Point & centroid, const geometry_msgs::msg::Quaternion & orientation,
const std_msgs::msg::ColorRGBA & color_rgba, const double & line_width,
const bool & is_orientation_available = true);
const bool & is_orientation_available = true,
const ObjectFillType fill_type = ObjectFillType::Skeleton);

AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN_PUBLIC visualization_msgs::msg::Marker::SharedPtr
get_2d_shape_marker_ptr(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,12 @@ class AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN_PUBLIC ObjectPolygonDisplayBase
m_confidence_interval_property->addOption("95%", 2);
m_confidence_interval_property->addOption("99%", 3);

m_object_fill_type_property = new rviz_common::properties::EnumProperty(
"Object Fill Type", "skeleton", "Change object fill type in visualization", this);
m_object_fill_type_property->addOption(
"skeleton", static_cast<int>(detail::ObjectFillType::Skeleton));
m_object_fill_type_property->addOption("Fill", static_cast<int>(detail::ObjectFillType::Fill));

// iterate over default values to create and initialize the properties.
for (const auto & map_property_it : detail::kDefaultObjectPropertyValues) {
const auto & class_property_values = map_property_it.second;
Expand Down Expand Up @@ -189,9 +195,13 @@ class AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN_PUBLIC ObjectPolygonDisplayBase
const bool & is_orientation_available) const
{
const std_msgs::msg::ColorRGBA color_rgba = get_color_rgba(labels);
const auto fill_type =
static_cast<detail::ObjectFillType>(m_object_fill_type_property->getOptionInt());

if (m_display_type_property->getOptionInt() == 0) {
return detail::get_shape_marker_ptr(
shape_msg, centroid, orientation, color_rgba, line_width, is_orientation_available);
shape_msg, centroid, orientation, color_rgba, line_width, is_orientation_available,
fill_type);
} else if (m_display_type_property->getOptionInt() == 1) {
return detail::get_2d_shape_marker_ptr(
shape_msg, centroid, orientation, color_rgba, line_width, is_orientation_available);
Expand Down Expand Up @@ -526,6 +536,8 @@ class AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN_PUBLIC ObjectPolygonDisplayBase
rviz_common::properties::EnumProperty * m_simple_visualize_mode_property;
// Property to set confidence interval of state estimations
rviz_common::properties::EnumProperty * m_confidence_interval_property;
// Property to set visualization type
rviz_common::properties::EnumProperty * m_object_fill_type_property;
// Property to enable/disable label visualization
rviz_common::properties::BoolProperty m_display_label_property;
// Property to enable/disable uuid visualization
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -495,23 +495,37 @@ visualization_msgs::msg::Marker::SharedPtr get_shape_marker_ptr(
const autoware_auto_perception_msgs::msg::Shape & shape_msg,
const geometry_msgs::msg::Point & centroid, const geometry_msgs::msg::Quaternion & orientation,
const std_msgs::msg::ColorRGBA & color_rgba, const double & line_width,
const bool & is_orientation_available)
const bool & is_orientation_available, const ObjectFillType fill_type)
{
auto marker_ptr = std::make_shared<Marker>();
marker_ptr->ns = std::string("shape");
marker_ptr->color = color_rgba;
marker_ptr->scale.x = line_width;

using autoware_auto_perception_msgs::msg::Shape;
if (shape_msg.type == Shape::BOUNDING_BOX) {
marker_ptr->type = visualization_msgs::msg::Marker::LINE_LIST;
calc_bounding_box_line_list(shape_msg, marker_ptr->points);
if (fill_type == ObjectFillType::Skeleton) {
marker_ptr->type = visualization_msgs::msg::Marker::LINE_LIST;
calc_bounding_box_line_list(shape_msg, marker_ptr->points);
} else if (fill_type == ObjectFillType::Fill) {
marker_ptr->type = visualization_msgs::msg::Marker::CUBE;
marker_ptr->scale = shape_msg.dimensions;
marker_ptr->color.a = 0.75f;
}
if (is_orientation_available) {
calc_bounding_box_direction_line_list(shape_msg, marker_ptr->points);
} else {
calc_bounding_box_orientation_line_list(shape_msg, marker_ptr->points);
}
} else if (shape_msg.type == Shape::CYLINDER) {
marker_ptr->type = visualization_msgs::msg::Marker::LINE_LIST;
calc_cylinder_line_list(shape_msg, marker_ptr->points);
if (fill_type == ObjectFillType::Skeleton) {
marker_ptr->type = visualization_msgs::msg::Marker::LINE_LIST;
calc_cylinder_line_list(shape_msg, marker_ptr->points);
} else if (fill_type == ObjectFillType::Fill) {
marker_ptr->type = visualization_msgs::msg::Marker::CYLINDER;
marker_ptr->scale = shape_msg.dimensions;
marker_ptr->color.a = 0.75f;
}
} else if (shape_msg.type == Shape::POLYGON) {
marker_ptr->type = visualization_msgs::msg::Marker::LINE_LIST;
calc_polygon_line_list(shape_msg, marker_ptr->points);
Expand All @@ -523,8 +537,6 @@ visualization_msgs::msg::Marker::SharedPtr get_shape_marker_ptr(
marker_ptr->action = visualization_msgs::msg::Marker::MODIFY;
marker_ptr->pose = to_pose(centroid, orientation);
marker_ptr->lifetime = rclcpp::Duration::from_seconds(0.15);
marker_ptr->scale.x = line_width;
marker_ptr->color = color_rgba;

return marker_ptr;
}
Expand Down
Loading
Loading