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

Put vehicle model(default.dae, prius.dae) under ros/src/.config/model #150

Merged
merged 1 commit into from
Dec 3, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10,574 changes: 10,574 additions & 0 deletions ros/src/.config/model/default.dae

Large diffs are not rendered by default.

56 changes: 56 additions & 0 deletions ros/src/.config/model/prius.dae

Large diffs are not rendered by default.

76 changes: 29 additions & 47 deletions ros/src/.config/rviz/default.rviz
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Panels:
- /Camera1/Visibility1
- /Lane Waypoint1/Status1
Splitter Ratio: 0.695804
Tree Height: 824
Tree Height: 974
- Class: rviz/Selection
Name: Selection
- Class: rviz/Tool Properties
Expand All @@ -35,7 +35,7 @@ Visualization Manager:
Cell Size: 1
Class: rviz/Grid
Color: 160; 160; 164
Enabled: false
Enabled: true
Line Style:
Line Width: 0.03
Value: Lines
Expand All @@ -48,7 +48,7 @@ Visualization Manager:
Plane: XY
Plane Cell Count: 10
Reference Frame: <Fixed Frame>
Value: false
Value: true
- Class: rviz/TF
Enabled: false
Frame Timeout: 15
Expand Down Expand Up @@ -97,24 +97,11 @@ Visualization Manager:
Marker Topic: /vector_map
Name: Vector Map
Namespaces:
cross walk: true
curb: true
gutter: true
lane: false
pole: true
road edge: true
road sign: true
road surface mark: true
signal: true
stop line: true
streetlight: true
utilitypole: true
white line: true
zebrazone: true
{}
Queue Size: 100
Value: true
- Class: rviz/Image
Enabled: true
Enabled: false
Image Topic: /image_raw
Max Value: 1
Median window: 5
Expand All @@ -123,7 +110,7 @@ Visualization Manager:
Normalize Range: true
Queue Size: 2
Transport Hint: raw
Value: true
Value: false
- Class: rviz/Camera
Enabled: false
Image Rendering: overlay
Expand All @@ -135,19 +122,19 @@ Visualization Manager:
Value: false
Visibility:
Control Pose: true
Current Pose: true
Detection Range: true
Grid: true
Image: true
Lane Waypoint: true
Marker: true
MarkerArray: true
NDT Pose: true
Next Waypoint Mark: true
Object Pose: true
Obstacle: true
PP Trajectory Mark: true
Points Cluster: true
Points Map: true
Points Raw: true
Prius Model: true
Stixel: true
TF: false
Value: true
Expand All @@ -169,7 +156,7 @@ Visualization Manager:
Enabled: true
Invert Rainbow: false
Max Color: 255; 255; 255
Max Intensity: 255
Max Intensity: 173
Min Color: 0; 0; 0
Min Intensity: 0
Name: Points Raw
Expand Down Expand Up @@ -282,10 +269,10 @@ Visualization Manager:
Value: false
- Class: rviz/Marker
Enabled: true
Marker Topic: /prius_model
Name: Prius Model
Marker Topic: /vehicle_model
Name: Vehicle Model
Namespaces:
prius_model: true
vehicle_model: true
Queue Size: 100
Value: true
- Alpha: 1
Expand Down Expand Up @@ -330,9 +317,7 @@ Visualization Manager:
Marker Topic: /lane_waypoint_mark
Name: Lane Waypoint
Namespaces:
path_marker: true
waypoint_marker: true
waypoint_velocity: false
{}
Queue Size: 100
Value: true
Enabled: true
Expand All @@ -358,43 +343,40 @@ Visualization Manager:
Value: true
Views:
Current:
Class: rviz/XYOrbit
Distance: 57.1827
Angle: 0
Class: rviz/TopDownOrtho
Enable Stereo Rendering:
Stereo Eye Separation: 0.06
Stereo Focal Distance: 1
Swap Stereo Eyes: false
Value: false
Focal Point:
X: 9.96348
Y: 10.3399
Z: -0.177824
Name: Current View
Near Clip Distance: 0.01
Pitch: 0.419797
Target Frame: base_link
Value: XYOrbit (rviz)
Yaw: 5.12042
Scale: 10
Target Frame: <Fixed Frame>
Value: TopDownOrtho (rviz)
X: 0
Y: 0
Saved: ~
Window Geometry:
Camera:
collapsed: false
Displays:
collapsed: true
Height: 1056
Hide Left Dock: true
Hide Right Dock: true
collapsed: false
Height: 1176
Hide Left Dock: false
Hide Right Dock: false
Image:
collapsed: false
QMainWindow State: 000000ff00000000fd00000004000000000000010f00000397fc020000000afb0000001200530065006c0065006300740069006f006e00000001e10000009b0000006400fffffffb0000001e0054006f006f006c002000500072006f007000650072007400690065007302000001ed000001df00000185000000a3fb000000120056006900650077007300200054006f006f02000001df000002110000018500000122fb000000200054006f006f006c002000500072006f0070006500720074006900650073003203000002880000011d000002210000017afc00000028000003970000000000fffffffa000000000100000003fb0000000a0049006d0061006700650100000000ffffffff0000000000000000fb0000000c00430061006d0065007200610000000000ffffffff0000006500000065fb000000100044006900730070006c0061007900730000000000000001360000010f00fffffffb0000002000730065006c0065006300740069006f006e00200062007500660066006500720200000138000000aa0000023a00000294fb00000014005700690064006500530074006500720065006f02000000e6000000d2000003ee0000030bfb0000000c004b0069006e0065006300740200000186000001060000030c00000261fb000000120049006d006100670065005f0072006100770000000000ffffffff0000000000000000fb0000000c00430061006d006500720061000000024e000001710000001600ffffff000000010000010f00000397fc0200000003fb0000000a00560069006500770073000000002800000397000000b000fffffffb0000001e0054006f006f006c002000500072006f00700065007200740069006500730100000041000000780000000000000000fb0000001200530065006c0065006300740069006f006e010000025a000000b20000000000000000000000020000073f000000a8fc0100000002fb0000000a0049006d00610067006503000000ec0000009e000002000000019afb0000000a00560069006500770073030000004e00000080000002e100000197000000030000073f0000003dfc0100000002fb0000000800540069006d006501000000000000073f000002f600fffffffb0000000800540069006d006501000000000000045000000000000000000000073f0000039700000004000000040000000800000008fc0000000100000002000000010000000a0054006f006f006c00730100000000ffffffff0000000000000000
QMainWindow State: 000000ff00000000fd00000004000000000000010f0000040ffc020000000afb0000001200530065006c0065006300740069006f006e00000001e10000009b0000006400fffffffb0000001e0054006f006f006c002000500072006f007000650072007400690065007302000001ed000001df00000185000000a3fb000000120056006900650077007300200054006f006f02000001df000002110000018500000122fb000000200054006f006f006c002000500072006f0070006500720074006900650073003203000002880000011d000002210000017afc000000280000040f000000dd00fffffffa000000020100000003fb0000000a0049006d0061006700650000000000ffffffff0000005c00fffffffb0000000c00430061006d0065007200610000000000ffffffff0000006500fffffffb000000100044006900730070006c0061007900730100000000000001360000010f00fffffffb0000002000730065006c0065006300740069006f006e00200062007500660066006500720200000138000000aa0000023a00000294fb00000014005700690064006500530074006500720065006f02000000e6000000d2000003ee0000030bfb0000000c004b0069006e0065006300740200000186000001060000030c00000261fb000000120049006d006100670065005f0072006100770000000000ffffffff0000000000000000fb0000000c00430061006d006500720061000000024e000001710000000000000000000000010000010f0000040ffc0200000003fb0000000a0056006900650077007301000000280000040f000000b000fffffffb0000001e0054006f006f006c002000500072006f00700065007200740069006500730100000041000000780000000000000000fb0000001200530065006c0065006300740069006f006e010000025a000000b20000000000000000000000020000073f000000a8fc0100000002fb0000000a0049006d00610067006503000000ec0000009e000002000000019afb0000000a00560069006500770073030000004e00000080000002e100000197000000030000073f0000003dfc0100000002fb0000000800540069006d006501000000000000073f000002f600fffffffb0000000800540069006d00650100000000000004500000000000000000000005150000040f00000004000000040000000800000008fc0000000100000002000000010000000a0054006f006f006c00730100000000ffffffff0000000000000000
Selection:
collapsed: false
Time:
collapsed: false
Tool Properties:
collapsed: false
Views:
collapsed: true
collapsed: false
Width: 1855
X: 65
Y: 24
X: 55
Y: 169
26 changes: 0 additions & 26 deletions ros/src/util/packages/model_publisher/launch/prius_model.launch

This file was deleted.

26 changes: 26 additions & 0 deletions ros/src/util/packages/model_publisher/launch/vehicle_model.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<!-- -->
<launch>

<arg name="base_frame" default="/base_link"/>
<arg name="topic_name" default="vehicle_model"/>
<arg name="model_path" default="package://model_publisher/../../../.config/model/default.dae"/>
<arg name="offset_x" default="1.17"/> <!-- meter -->
<arg name="offset_y" default="0.0"/>
<arg name="offset_z" default="0.0"/>
<arg name="offset_roll" default="0.0"/> <!-- degree -->
<arg name="offset_pitch" default="0.0"/> <!-- degree -->
<arg name="offset_yaw" default="0.0"/> <!-- degree -->

<node pkg="model_publisher" type="model_publisher" name="model_publisher">
<param name="base_frame" value="$(arg base_frame)"/>
<param name="topic_name" value="$(arg topic_name)"/>
<param name="model_path" value="$(arg model_path)"/>
<param name="offset_x" value="$(arg offset_x)"/>
<param name="offset_y" value="$(arg offset_y)"/>
<param name="offset_z" value="$(arg offset_z)"/>
<param name="offset_roll" value="$(arg offset_roll)"/>
<param name="offset_pitch" value="$(arg offset_pitch)"/>
<param name="offset_yaw" value="$(arg offset_yaw)"/>
</node>

</launch>
Loading