Skip to content

Commit 1684493

Browse files
#554 Enhancement of world package
1 parent a1c3c32 commit 1684493

File tree

7 files changed

+6
-5
lines changed

7 files changed

+6
-5
lines changed

atom_worlds/launch/calibration_studio.launch

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<launch>
33

44
<!-- Gazebo -->
5-
<arg name="world_name" default="$(find atom_worlds)/worlds/larcc.world" />
5+
<arg name="world_name" default="$(find atom_worlds)/worlds/calibration_studio.world" />
66
<arg name="paused" default="false" doc="Starts gazebo in paused mode" />
77
<arg name="gui" default="False" doc="Starts gazebo gui" />
88

@@ -11,7 +11,7 @@
1111
<rosparam file="$(find atom_worlds)/config/camera.yaml" />
1212

1313
<!-- Start interactive pattern -->
14-
<arg name="interactive_pattern" default="false" doc="Start autonomous pattern node" />
14+
<arg name="interactive_pattern" default="false" doc="Start interactive pattern node" />
1515

1616
<!-- Rviz -->
1717
<arg name="launch_rviz" default="true" doc="Whether to launch RViz or not" />

atom_worlds/pattern/interactive_pattern/interactive_pattern

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# stdlib
44
import sys
55
import argparse
6+
import time
67

78
# 3rd-party
89
import rospkg
@@ -42,7 +43,7 @@ def makeBox( msg, pose):
4243
pose=pose,
4344
scale=Vector3(x=1.0, y=1.0, z=1.0),
4445
color=ColorRGBA(r=1, g=1, b=1, a=1))
45-
marker.mesh_resource = 'package://ur_e_description/meshes/charuco_800x600/charuco_800x600.dae'
46+
marker.mesh_resource = 'package://atom_worlds/pattern/models/charuco_800x600/charuco_800x600.dae'
4647
marker.mesh_use_embedded_materials = True
4748
return marker
4849

atom_worlds/worlds/larcc.world atom_worlds/worlds/calibration_studio.world

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<range>1000</range>
5858
<constant>0.9</constant>
5959
<linear>0.01</linear>
60-
<quadratic>0.001</quadratic>
60+
<quadraic>0.001</quadraic>
6161
</attenuation>
6262
<direction>-0.5 0.1 -0.9</direction>
6363
<spot>
@@ -132,7 +132,7 @@
132132
</camera>
133133
</gui>
134134
<state world_name='default'>
135-
<sim_time>830 318000000</sim_time>
135+
<sim_time>0</sim_time>
136136
<real_time>214 175274448</real_time>
137137
<wall_time>1651740140 988331282</wall_time>
138138
<iterations>190110</iterations>

0 commit comments

Comments
 (0)