Skip to content

Commit 9079797

Browse files
wep21yukkysaito
andauthored
Feature/porting camera lidar fusion (autowarefoundation#316)
* Feature/camera lidar fusion (autowarefoundation#248) * change camera lidar fusion node * change default mode of object recognition * change spilit range parameter from 10 to 30 (autowarefoundation#272) Co-authored-by: Yukihiro Saito <[email protected]>
1 parent e83814c commit 9079797

File tree

3 files changed

+7
-55
lines changed

3 files changed

+7
-55
lines changed

autoware_launch/launch/autoware.launch.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<!-- Perception -->
4848
<include file="$(find-pkg-share perception_launch)/launch/perception.launch.xml">
4949
<!-- options for mode: camera_lidar_fusion, lidar, camera -->
50-
<arg name="mode" value="lidar" />
50+
<arg name="mode" value="camera_lidar_fusion" />
5151
</include>
5252

5353
<!-- Planning -->

autoware_launch/launch/logging_simulator.launch.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<group>
7676
<include file="$(find-pkg-share perception_launch)/launch/perception.launch.xml" if="$(var perception)">
7777
<!-- options for mode: camera_lidar_fusion, lidar, camera -->
78-
<arg name="mode" value="lidar" />
78+
<arg name="mode" value="camera_lidar_fusion" />
7979
</include>
8080
</group>
8181

perception_launch/launch/object_recognition/detection/camera_lidar_fusion_based_detection.launch.xml

+5-53
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0"?>
2-
32
<launch>
43
<arg name="image_raw0" default="/image_raw"/>
54
<arg name="camera_info0" default="/camera_info"/>
@@ -77,67 +76,20 @@
7776
<arg name="input/object" value="camera_lidar_fusion/objects"/>
7877
<arg name="output/long_range_object" value="camera_lidar_fusion/long_range_objects"/>
7978
<arg name="output/short_range_object" value="camera_lidar_fusion/short_range_objects"/>
80-
<arg name="split_range" value="10.0"/>
79+
<arg name="split_range" value="30.0"/>
8180
</include>
8281
</group>
8382

8483
<group>
85-
<push-ros-namespace namespace="apollo"/>
86-
<include file="$(find-pkg-share lidar_apollo_instance_segmentation)/launch/lidar_apollo_instance_segmentation.launch.xml">
87-
<arg name="output/objects" value="lidar/clusters"/>
88-
</include>
89-
<include file="$(find-pkg-share shape_estimation)/launch/shape_estimation.launch.xml">
90-
<arg name="use_map_current" value="$(var use_vector_map)"/>
91-
<arg name="input/objects" value="lidar/clusters" />
92-
<arg name="output/objects" value="lidar/objects" />
93-
<arg name="orientation_reliable" value="true"/>
94-
</include>
95-
<include file="$(find-pkg-share object_range_splitter)/launch/object_range_splitter.launch.xml">
96-
<arg name="input/object" value="lidar/objects"/>
97-
<arg name="output/long_range_object" value="lidar/long_range_objects"/>
98-
<arg name="output/short_range_object" value="lidar/short_range_objects"/>
99-
<arg name="split_range" value="15.0"/>
100-
</include>
101-
<include file="$(find-pkg-share roi_cluster_fusion)/launch/roi_cluster_fusion.launch.xml">
102-
<arg name="input/camera_info0" value="$(var camera_info0)"/>
103-
<arg name="input/rois0" value="/perception/object_recognition/detection/rois0"/>
104-
<arg name="input/camera_info1" value="$(var camera_info1)"/>
105-
<arg name="input/rois1" value="/perception/object_recognition/detection/rois1"/>
106-
<arg name="input/camera_info2" value="$(var camera_info2)"/>
107-
<arg name="input/rois2" value="/perception/object_recognition/detection/rois2"/>
108-
<arg name="input/camera_info3" value="$(var camera_info3)"/>
109-
<arg name="input/rois3" value="/perception/object_recognition/detection/rois3"/>
110-
<arg name="input/camera_info4" value="$(var camera_info4)"/>
111-
<arg name="input/rois4" value="/perception/object_recognition/detection/rois4"/>
112-
<arg name="input/camera_info5" value="$(var camera_info5)"/>
113-
<arg name="input/rois5" value="/perception/object_recognition/detection/rois5"/>
114-
<arg name="input/camera_info6" value="$(var camera_info6)"/>
115-
<arg name="input/rois6" value="/perception/object_recognition/detection/rois6"/>
116-
<arg name="input/camera_info7" value="$(var camera_info7)"/>
117-
<arg name="input/rois7" value="/perception/object_recognition/detection/rois7"/>
118-
<arg name="input/rois_number" value="$(var image_number)"/>
119-
<arg name="input/clusters" value="lidar/short_range_objects"/>
120-
<arg name="output" value="camera_lidar_fusion/short_range_objects"/>
121-
<arg name="input/image0" value="$(var image_raw0)"/>
122-
<arg name="input/image1" value="$(var image_raw1)"/>
123-
<arg name="input/image2" value="$(var image_raw2)"/>
124-
<arg name="input/image3" value="$(var image_raw3)"/>
125-
<arg name="input/image4" value="$(var image_raw4)"/>
126-
<arg name="input/image5" value="$(var image_raw5)"/>
127-
<arg name="input/image6" value="$(var image_raw6)"/>
128-
<arg name="input/image7" value="$(var image_raw7)"/>
129-
</include>
130-
<include file="$(find-pkg-share object_merger)/launch/object_association_merger.launch.xml">
131-
<arg name="input/object0" value="camera_lidar_fusion/short_range_objects"/>
132-
<arg name="input/object1" value="lidar/long_range_objects"/>
133-
<arg name="output/object" value="camera_lidar_fusion/objects"/>
84+
<push-ros-namespace namespace="centerpoint"/>
85+
<include file="$(find-pkg-share lidar_centerpoint)/launch/lidar_centerpoint.launch.xml">
86+
<arg name="output/objects" value="objects" />
13487
</include>
13588
</group>
13689

13790
<include file="$(find-pkg-share object_merger)/launch/object_association_merger.launch.xml">
138-
<arg name="input/object0" value="apollo/camera_lidar_fusion/objects"/>
91+
<arg name="input/object0" value="centerpoint/objects"/>
13992
<arg name="input/object1" value="euclidean/camera_lidar_fusion/short_range_objects"/>
14093
<arg name="output/object" value="objects"/>
14194
</include>
142-
14395
</launch>

0 commit comments

Comments
 (0)