Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
b44b6e9
Fix issues #100
HoangGiang93 Oct 13, 2022
ffe6dee
Fix issues #101
HoangGiang93 Oct 13, 2022
a557685
Fix issues #103
HoangGiang93 Oct 13, 2022
f410487
Fix issues #106
HoangGiang93 Oct 13, 2022
a3b2879
Fix name
HoangGiang93 Oct 13, 2022
a735fe2
Fix name
HoangGiang93 Oct 13, 2022
3c2feee
Revert to commit a55768516bbfc2139f62eaff3a703e43b11a6f6d
HoangGiang93 Oct 13, 2022
1a6a800
Fix issues #106
HoangGiang93 Oct 13, 2022
4d76ecb
Revert "Fix issues #106"
HoangGiang93 Oct 13, 2022
7ac69a1
Fix issues #106
HoangGiang93 Oct 13, 2022
a2d1313
Fix issues #106
HoangGiang93 Oct 13, 2022
cce91c6
Add apartment.urdf
HoangGiang93 Oct 13, 2022
8b98edc
Fix rviz_config
HoangGiang93 Oct 13, 2022
d6a08f9
Merge branch 'master' into FixIssues
HoangGiang93 Nov 2, 2022
a200236
Add Unreal map
HoangGiang93 Dec 8, 2022
86e6c74
Add cabinet1
HoangGiang93 Dec 8, 2022
a73923b
Add cabinet2 and catbinet3
HoangGiang93 Dec 9, 2022
68d0cbd
Add cabinet4
HoangGiang93 Dec 9, 2022
9800013
Add dishwasher
HoangGiang93 Dec 9, 2022
7ab5e29
Add cabinet8, 10, 11, island cover, base board
HoangGiang93 Dec 10, 2022
5d5b7bc
Fix xacro
HoangGiang93 Dec 10, 2022
d6260bc
Fix the door
HoangGiang93 Dec 11, 2022
061b4e3
Fix textures
HoangGiang93 Dec 11, 2022
50f32fe
Rename
HoangGiang93 Dec 11, 2022
74113bd
Fix launch file
HoangGiang93 Dec 11, 2022
8aea2ba
Fix some coordinates
HoangGiang93 Dec 12, 2022
c6656e2
Fix texture
HoangGiang93 Dec 12, 2022
a50b337
Fix urdf
HoangGiang93 Dec 12, 2022
4c1e906
Calibrate some coordinates
Dec 13, 2022
413869d
Add map for apartment
HoangGiang93 Jan 10, 2023
0809b2f
Reduce meshes
HoangGiang93 Jan 14, 2023
d9ca5a1
Fix meshes
HoangGiang93 Jan 14, 2023
898a40e
Fix meshes
HoangGiang93 Jan 16, 2023
8fd02bb
Fix meshes
HoangGiang93 Jan 18, 2023
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
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions iai_apartment/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ find_package(xacro REQUIRED)
## See http://ros.org/doc/api/catkin/html/user_guide/setup_dot_py.html
# catkin_python_setup()

xacro_add_xacro_file(urdf/apartment.urdf urdf/iai-apartment.urdf)
xacro_add_xacro_file(urdf/apartment.xacro urdf/apartment.urdf)
# add target to trigger xacro
add_custom_target(xacro ALL DEPENDS
urdf/iai-apartment.urdf)
urdf/apartment.urdf)
install(DIRECTORY xacro
DESTINATION share/${PROJECT_NAME})

Expand Down
12 changes: 4 additions & 8 deletions iai_apartment/launch/apartment_bringup.launch
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
<launch>

<node pkg="tf"
type="static_transform_publisher"
name="iai_apartment_root_link_broadcaster"
args="0 0 0 0 0 0 map iai_apartment/apartment_root 25">
</node>
<node pkg="tf" type="static_transform_publisher" name="iai_apartment_root_link_broadcaster" args="0 0 0 0 0 0 map iai_apartment/apartment_root 25"></node>

<include file="$(find iai_apartment)/launch/upload_apartment.launch" />
<include file="$(find iai_apartment)/launch/apartment_upload.launch" />

<node name="apartment_state_publisher" pkg="robot_state_publisher" type="robot_state_publisher">
<remap from="robot_description" to="apartment_description" />
Expand All @@ -16,8 +12,8 @@
</node>

<node pkg="joint_state_publisher" type="joint_state_publisher" name="apartment_joint_state_publisher" output="screen">
<remap from="robot_description" to="apartment_description"/>
<param name="rate" value="25"/>
<remap from="robot_description" to="apartment_description" />
<param name="rate" value="25" />
<remap from="/joint_states" to="/apartment_joint_states" />
<rosparam param="source_list">
- /iai_kitchen/cram_joint_states
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<launch>

<arg name="model" default="$(find iai_apartment)/urdf/apartment.urdf" />
<arg name="model" default="$(find iai_apartment)/urdf/apartment_unreal.xacro" />
<param name="apartment_description" command="$(find xacro)/xacro '$(arg model)'" />

</launch>
Binary file added iai_apartment/maps/apartment_unreal_10cm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions iai_apartment/maps/apartment_unreal_10cm.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
image: apartment_unreal_10cm.png
resolution: 0.05
origin: [-0.875, -0.875, 0.0000]
negate: 0
occupied_thresh: 0.65
free_thresh: 0.196
Binary file modified iai_apartment/meshes/collision/armchair.stl
Binary file not shown.
Binary file modified iai_apartment/meshes/collision/sofa.stl
Binary file not shown.
12 changes: 12 additions & 0 deletions iai_apartment/meshes/collision/wardrobe_door_handle.mtl
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Blender MTL File: 'None'
# Material Count: 1

newmtl M_Metal_Dark.001
Ns 250.000000
Ka 1.000000 1.000000 1.000000
Kd 0.000000 0.000000 0.000000
Ks 0.000000 0.000000 0.000000
Ke 0.000000 0.000000 0.000000
Ni 1.450000
d 1.000000
illum 1
132 changes: 132 additions & 0 deletions iai_apartment/meshes/collision/wardrobe_door_handle.obj
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
# Blender v3.1.2 OBJ File: ''
# www.blender.org
mtllib wardrobe_door_handle.mtl
o SM_Kleiderschrank_TürLinks
v -0.006357 0.051710 0.007541
v -0.006357 -0.054304 0.007541
v -0.006357 0.051710 -0.007541
v -0.006357 -0.054304 -0.007541
v 0.027199 0.051710 0.007541
v 0.027199 0.051710 -0.007541
v 0.027199 -0.054304 0.007541
v 0.027199 -0.054304 -0.007541
v -0.020843 0.051710 -0.007541
v -0.020843 0.066297 0.007541
v -0.020843 0.066297 -0.007541
v -0.020843 0.051710 0.007541
v -0.020843 -0.054304 -0.007541
v -0.020843 -0.054304 0.007541
v -0.020843 -0.063703 -0.007541
v -0.020843 -0.063703 0.007541
v -0.006357 -0.063703 -0.007541
v -0.006357 -0.063703 0.007541
v 0.027199 -0.063703 0.007541
v 0.027199 -0.063703 -0.007541
v -0.006357 0.066297 -0.007541
v -0.006357 0.066297 0.007541
v 0.027199 0.066297 0.007541
v 0.027199 0.066297 -0.007541
vt 0.561523 0.740479
vt 0.437988 0.740479
vt 0.561523 0.726074
vt 0.437988 0.726074
vt -0.108948 0.726074
vt -0.061035 0.740479
vt -0.108948 0.740479
vt -0.061035 0.726074
vt 1.108398 0.740479
vt 1.060547 0.740479
vt 1.108398 0.726074
vt 1.060547 0.726074
vt 0.437988 0.726074
vt 0.427734 0.740479
vt 0.427734 0.726074
vt 0.437988 0.740479
vt 0.561523 0.726074
vt 0.561523 0.740479
vt 0.571777 0.726074
vt 0.571777 0.740479
vt -0.120056 0.740479
vt -0.120056 0.726074
vt -0.108948 0.726074
vt -0.108948 0.740479
vt -0.061035 0.740479
vt -0.061035 0.726074
vt 1.108398 0.726074
vt 1.119141 0.726074
vt 1.119141 0.740479
vt 1.108398 0.740479
vt 1.060547 0.740479
vt 1.060547 0.726074
vt 0.571777 1.061035
vt 0.571777 1.108948
vt 0.561523 1.061035
vt 0.561523 1.108948
vt 0.571777 1.120056
vt 0.561523 1.120056
vt 0.437988 1.120056
vt 0.437988 1.108948
vt 0.427734 1.120056
vt 0.427734 1.108948
vt 0.427734 1.061035
vt 0.437988 1.061035
vt 0.571777 1.108948
vt 0.561523 1.061035
vt 0.571777 1.061035
vt 0.561523 1.108948
vt 0.561523 1.120056
vt 0.571777 1.120056
vt 0.437988 1.120056
vt 0.437988 1.108948
vt 0.427734 1.120056
vt 0.427734 1.108948
vt 0.427734 1.061035
vt 0.437988 1.061035
vn 1.0000 0.0000 0.0000
vn 0.0000 -1.0000 0.0000
vn 0.0000 1.0000 0.0000
vn -1.0000 0.0000 0.0000
vn 0.0000 0.0000 1.0000
vn 0.0000 0.0000 -1.0000
usemtl M_Metal_Dark.001
s off
f 1/1/1 2/2/1 3/3/1
f 3/3/1 2/2/1 4/4/1
f 3/5/2 5/6/2 1/7/2
f 5/6/2 3/5/2 6/8/2
f 2/9/3 7/10/3 4/11/3
f 8/12/3 4/11/3 7/10/3
f 9/13/4 10/14/4 11/15/4
f 10/14/4 9/13/4 12/16/4
f 9/13/4 13/17/4 12/16/4
f 12/16/4 13/17/4 14/18/4
f 14/18/4 13/17/4 15/19/4
f 14/18/4 15/19/4 16/20/4
f 16/21/2 15/22/2 17/23/2
f 18/24/2 16/21/2 17/23/2
f 17/23/2 19/25/2 18/24/2
f 19/25/2 17/23/2 20/26/2
f 21/27/3 11/28/3 10/29/3
f 21/27/3 10/29/3 22/30/3
f 22/30/3 23/31/3 21/27/3
f 24/32/3 21/27/3 23/31/3
f 23/33/5 22/34/5 5/35/5
f 1/36/5 5/35/5 22/34/5
f 10/37/5 12/38/5 22/34/5
f 22/34/5 12/38/5 1/36/5
f 14/39/5 1/36/5 12/38/5
f 1/36/5 14/39/5 2/40/5
f 2/40/5 14/39/5 16/41/5
f 2/40/5 16/41/5 18/42/5
f 18/42/5 19/43/5 2/40/5
f 7/44/5 2/40/5 19/43/5
f 17/45/6 8/46/6 20/47/6
f 8/46/6 17/45/6 4/48/6
f 13/49/6 17/45/6 15/50/6
f 13/49/6 4/48/6 17/45/6
f 9/51/6 4/48/6 13/49/6
f 3/52/6 4/48/6 9/51/6
f 11/53/6 3/52/6 9/51/6
f 21/54/6 3/52/6 11/53/6
f 24/55/6 3/52/6 21/54/6
f 3/52/6 24/55/6 6/56/6
Binary file not shown.
22 changes: 22 additions & 0 deletions iai_apartment/meshes/collision/wardrobe_door_left.mtl
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Blender MTL File: 'None'
# Material Count: 2

newmtl M_Metal_Chrome.001
Ns 250.000000
Ka 1.000000 1.000000 1.000000
Kd 0.215861 0.215861 0.215861
Ks 0.000000 0.000000 0.000000
Ke 0.000000 0.000000 0.000000
Ni 1.450000
d 1.000000
illum 1

newmtl M_Wood_Furniture.003
Ns 250.000000
Ka 1.000000 1.000000 1.000000
Kd 0.215861 0.215861 0.215861
Ks 0.000000 0.000000 0.000000
Ke 0.000000 0.000000 0.000000
Ni 1.450000
d 1.000000
illum 1
Loading