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

Add windows #116

Open
wants to merge 42 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
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
a00e5f2
Add apartment_unreal_with_window4
HoangGiang93 Jan 13, 2023
3ee1891
Reduce meshes
HoangGiang93 Jan 14, 2023
4849b64
Fix meshes
HoangGiang93 Jan 14, 2023
316e3a8
Fix meshes
HoangGiang93 Jan 16, 2023
5f9c86e
Fix position
HoangGiang93 Jan 16, 2023
dd22833
Add left window
HoangGiang93 Jan 17, 2023
adfca00
Fix window meshes
HoangGiang93 Jan 17, 2023
a7712c6
Fix meshes
HoangGiang93 Jan 18, 2023
7a559d6
Add refills_lab_unreal_10cm
HoangGiang93 Feb 14, 2023
e88d8c8
Make window handle fixed joint, put axis in middle
artnie Mar 30, 2023
03ca40f
Add window_handle.stl just to have that too
artnie Mar 30, 2023
3e6c3a5
Merge pull request #115 from artnie/AddWindows
HoangGiang93 Mar 31, 2023
a0881a9
Add cabinet1_shelf1 and cabinet1_shelf2
HoangGiang93 Apr 11, 2023
4e47b3d
Update apartment
HoangGiang93 Apr 27, 2023
495c6fc
Add cabinet1_shelves again
HoangGiang93 Apr 27, 2023
aa4f7de
Fix window handle
HoangGiang93 Apr 27, 2023
323f01d
Fix orientation
HoangGiang93 Jul 4, 2023
7e5b504
Fix orientation
HoangGiang93 Jul 4, 2023
ee5bbb3
Add rotation joint for window4_handle
HoangGiang93 Jul 4, 2023
1df608c
Fix handle orientation
HoangGiang93 Jul 5, 2023
b694477
Fix typo
HoangGiang93 Jul 5, 2023
7bc295e
Fix urdf
HoangGiang93 Jul 5, 2023
d710573
Remove shelf collision offset
artnie Jul 6, 2023
56850ba
Split wall
HoangGiang93 Jul 27, 2023
5b84e46
Move dishwasher tray to avoid collision
HoangGiang93 Jul 27, 2023
eb0c5a4
Compress images
HoangGiang93 Aug 4, 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
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion iai_apartment/launch/apartment_bringup.launch
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<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 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_with_window4.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.
109 changes: 109 additions & 0 deletions iai_apartment/meshes/handles/window_handle.obj
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
# Blender 3.5.0
# www.blender.org
mtllib window_handle.mtl
o handle_horizontal_fix.003
v 0.007853 0.007682 0.049743
v 0.007482 -0.007854 0.049743
v 0.007853 -0.007854 0.049743
v -0.007312 0.007684 0.049743
v -0.007683 0.007684 0.049743
v 0.007853 -0.007854 -0.050743
v -0.007683 -0.007851 -0.050743
v 0.007853 0.007682 -0.050743
v -0.007683 0.007682 -0.050743
v -0.007683 -0.007851 0.049743
vn -0.0000 -0.0000 1.0000
vn -0.0002 -1.0000 -0.0000
vn -0.0000 1.0000 -0.0000
vn -0.0000 -0.0000 -1.0000
vn 1.0000 -0.0000 -0.0000
vn 0.0001 1.0000 -0.0000
vn -1.0000 -0.0000 -0.0000
vn -0.0000 -1.0000 -0.0000
s 0
f 1//1 2//1 3//1
f 4//1 5//1 2//1
f 6//2 2//2 7//2
f 5//3 4//3 8//3
f 6//4 7//4 8//4
f 6//5 8//5 1//5
f 4//1 2//1 1//1
f 8//6 4//6 1//6
f 7//7 5//7 9//7
f 5//3 8//3 9//3
f 8//4 7//4 9//4
f 2//1 5//1 10//1
f 7//2 2//2 10//2
f 5//7 7//7 10//7
f 2//8 6//8 3//8
f 6//5 1//5 3//5
o handle_horizontal_fix.004
v -0.007417 -0.007853 0.049276
v 0.015118 0.007683 0.049276
v 0.015118 -0.007853 0.049276
v -0.007417 0.007683 0.065185
v -0.007417 0.007683 0.049276
v -0.007417 -0.007853 0.065185
v 0.044083 0.007683 0.065185
v 0.044083 -0.007853 0.049647
v 0.044083 -0.007853 0.065185
v 0.044083 0.007683 0.049647
vn -0.0000 -0.0000 -1.0000
vn -1.0000 -0.0000 -0.0000
vn -0.0000 1.0000 -0.0000
vn -0.0000 -0.0000 1.0000
vn -0.0000 -1.0000 -0.0000
vn 1.0000 -0.0000 -0.0000
vn 0.0128 -0.0000 -0.9999
s 0
f 11//9 12//9 13//9
f 14//10 15//10 16//10
f 15//11 14//11 17//11
f 14//12 16//12 17//12
f 16//10 15//10 11//10
f 18//13 16//13 11//13
f 16//13 18//13 19//13
f 18//14 17//14 19//14
f 17//12 16//12 19//12
f 17//14 18//14 20//14
f 15//11 17//11 20//11
f 11//9 15//9 12//9
f 20//15 18//15 12//15
f 15//11 20//11 12//11
f 18//13 11//13 13//13
f 12//15 18//15 13//15
o handle_horizontal_fix.005
v 0.066999 -0.007853 -0.050147
v 0.025050 0.007683 -0.049776
v 0.025050 -0.007853 -0.049776
v -0.007586 0.007683 -0.049776
v -0.007586 0.007683 -0.065685
v -0.007586 -0.007853 -0.049776
v -0.007586 -0.007853 -0.065685
v 0.066999 0.007683 -0.065685
v 0.066999 0.007683 -0.050147
v 0.066999 -0.007853 -0.065685
vn 0.0088 -0.0000 1.0000
vn -1.0000 -0.0000 -0.0000
vn -0.0000 -1.0000 -0.0000
vn -0.0000 -0.0000 -1.0000
vn -0.0000 1.0000 -0.0000
vn 1.0000 -0.0000 -0.0000
vn -0.0000 -0.0000 1.0000
s 0
f 21//16 22//16 23//16
f 24//17 25//17 26//17
f 21//18 26//18 27//18
f 26//17 25//17 27//17
f 27//19 25//19 28//19
f 25//20 24//20 28//20
f 21//21 28//21 29//21
f 28//20 24//20 29//20
f 21//18 27//18 30//18
f 27//19 28//19 30//19
f 28//21 21//21 30//21
f 24//22 26//22 22//22
f 21//16 29//16 22//16
f 29//20 24//20 22//20
f 26//18 21//18 23//18
f 22//22 26//22 23//22
Binary file added iai_apartment/meshes/handles/window_handle.stl
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added iai_apartment/meshes/unreal/M_Blue_M_Blue_D.jpg
Binary file added iai_apartment/meshes/unreal/M_Icons_M_Icons_D.jpg
Binary file added iai_apartment/meshes/unreal/M_Red_M_Red_D.jpg
115 changes: 115 additions & 0 deletions iai_apartment/meshes/unreal/SM_Couchtisch.dae

Large diffs are not rendered by default.

13 changes: 13 additions & 0 deletions iai_apartment/meshes/unreal/SM_Couchtisch.mtl
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Blender 3.4.0 MTL File: 'None'
# www.blender.org

newmtl /Game/Materials_Laborraum/M_Wood_Furniture_M_Wood_Furniture
Ns 0.000000
Ka 1.000000 1.000000 1.000000
Ke 0.000000 0.000000 0.000000
Ni 1.450000
d 1.000000
illum 1
map_Kd Game/Materials_Laborraum/M_Wood_Furniture_M_Wood_Furniture_D.jpg
map_Ks Game/Materials_Laborraum/M_Wood_Furniture_M_Wood_Furniture_S.jpg
map_Bump -bm 1.000000 Game/Materials_Laborraum/M_Wood_Furniture_M_Wood_Furniture_N.jpg
Loading