Skip to content

Commit d9774a4

Browse files
committed
updated parameters
1 parent 68da159 commit d9774a4

File tree

3 files changed

+30
-11
lines changed

3 files changed

+30
-11
lines changed

‎opengl_ros/launch/depth_image_projection.launch‎

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
<?xml version="1.0"?>
22
<launch>
3-
<arg name="depth_width" default="1280"/>
4-
<arg name="depth_height" default="720"/>
5-
<arg name="grid_map_width" default="300"/>
6-
<arg name="grid_map_height" default="300"/>
7-
<arg name="grid_map_resolution" default="0.01"/>
8-
<arg name="grid_map_layer_height" default="0.5"/>
3+
<arg name="bag_prefix" default="/mnt/log/d435"/>
4+
<arg name="depth_width" default="640"/>
5+
<arg name="depth_height" default="360"/>
6+
<arg name="grid_map_width" default="200"/>
7+
<arg name="grid_map_height" default="200"/>
8+
<arg name="grid_map_resolution" default="0.025"/>
9+
<arg name="grid_map_layer_height" default="1.0"/>
910
<arg name="grid_map_accumulation_weight" default="0.004"/> <!-- 0.004 for 1/255 -->
10-
<arg name="frame_rate" default="30"/>
11+
<arg name="frame_rate" default="30"/>
1112

12-
<group ns="d435">
13+
<arg name="d435" default="true"/>
14+
<arg name="record" default="true"/>
15+
16+
<group ns="d435" if="$(arg d435)">
1317
<node pkg="nodelet" type="nodelet" name="realsense2_camera_manager" args="manager" output="screen"/>
1418
<node pkg="nodelet" type="nodelet" name="realsense2_camera" args="load realsense2_camera/RealSenseNodeFactory realsense2_camera_manager">
1519
<param name="enable_pointcloud" type="bool" value="false"/>
@@ -73,4 +77,17 @@
7377
<node pkg="image_view" type="image_view" name="viewer_out">
7478
<remap from="image" to="/occupancy_grid_image"/>
7579
</node>
80+
81+
<node pkg="rosbag" type="record" name="logger" if="$(arg d435)"
82+
args="-o $(arg bag_prefix)
83+
--lz4
84+
-a
85+
-x /(d435|occupancy_grid_image|viewer_depth|viewer_color|viewer_out)/(.*)
86+
/d435/color/camera_info
87+
/d435/color/image_raw
88+
/d435/depth/camera_info
89+
/d435/depth/image_rect_raw
90+
/d435/extrinsics/depth_to_color
91+
/occupancy_grid_image
92+
"/>
7693
</launch>

‎opengl_ros/src/depth_image_projector_nodecore.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,10 @@ void DepthImageProjectorNode::depthCallback(const sensor_msgs::Image::ConstPtr&
112112
projector_->project(output_, color, depth);
113113

114114
//Publish
115-
cv_bridge::CvImage outImage;;
116-
outImage.header = cv_ptr->header;
115+
cv_bridge::CvImage outImage;
116+
outImage.header.seq = cv_ptr->header.seq;
117+
outImage.header.stamp = cv_ptr->header.stamp;
118+
outImage.header.frame_id = "occupancy_grid"; //TODO set from parameter
117119
outImage.encoding = sensor_msgs::image_encodings::RGB8;
118120
outImage.image = output_;
119121
imagePublisher_.publish(outImage.toImageMsg());

‎opengl_ros_lib/shader/fs_depth_image_projection.glsl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ void main(void)
7272
//Apply SVM to extract a target
7373
if (l > threshold_l && svm_coef_a * a + svm_coef_b * b + svm_intercept > 0)
7474
{
75-
fragmentColor = vec3(1.0, 0.0, 0.0) * gridMapAccumulationWeight;
75+
fragmentColor = vec3(1.0, 0.0, 0.0) * gridMapAccumulationWeight * 3; //TODO set from parameter
7676
return;
7777
}
7878

0 commit comments

Comments
 (0)